X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowFlags.h;h=953d7f92ee62bf742b21f2b692b6c0618673aee6;hb=26ba2a65838731ce639a09539f617cb0f0be3b22;hp=f94f0c62d5d562e4598de83578df1854d850e6ad;hpb=963a0aa466a98b0c11b0dd30034f7fbf6f78ee62;p=lyx.git diff --git a/src/RowFlags.h b/src/RowFlags.h index f94f0c62d5..953d7f92ee 100644 --- a/src/RowFlags.h +++ b/src/RowFlags.h @@ -16,10 +16,9 @@ namespace lyx { -/* The list of possible flags, that can be combined. - * Some flags that should logically be here (e.g., - * CanBreakBefore), do not exist. This is because the need has not - * been identitfied yet. +/* The list of possible flags, that can be combined. Some flags that + * should logically be here (e.g., AlwaysBreakBefore), do not exist. + * This is because the need has not been identitfied yet. * * Priorities when before/after disagree: * AlwaysBreak* > NoBreak* > Break* or CanBreak*. @@ -30,24 +29,30 @@ enum RowFlags { Inline = 0, // break row before this element if the row is not empty BreakBefore = 1 << 0, + // break row whenever needed before this element + CanBreakBefore = 1 << 1, // Avoid breaking row before this element - NoBreakBefore = 1 << 1, + NoBreakBefore = 1 << 2, + // flush the row before this element (useful with BreakBefore) + FlushBefore = 1 << 3, // force new (maybe empty) row after this element - AlwaysBreakAfter = 1 << 2, + AlwaysBreakAfter = 1 << 4, // break row after this element if there are more elements - BreakAfter = 1 << 3, + BreakAfter = 1 << 5, // break row whenever needed after this element - CanBreakAfter = 1 << 4, + CanBreakAfter = 1 << 6, // Avoid breaking row after this element - NoBreakAfter = 1 << 5, + NoBreakAfter = 1 << 7, // The contents of the row may be broken in two (e.g. string) - CanBreakInside = 1 << 6, + CanBreakInside = 1 << 8, + // Flush the row that ends with this element + Flush = 1 << 9, // specify an alignment (left, right) for a display element // (default is center) - AlignLeft = 1 << 7, - AlignRight = 1 << 8, + AlignLeft = 1 << 10, + AlignRight = 1 << 11, // A display element breaks row at both ends - Display = BreakBefore | BreakAfter, + Display = FlushBefore | BreakBefore | BreakAfter, // Flags that concern breaking after element AfterFlags = AlwaysBreakAfter | BreakAfter | CanBreakAfter | NoBreakAfter };