From: Peter Bernard West Date: Mon, 19 Aug 2002 16:26:55 +0000 (+0000) Subject: Changed ordering of property names to reflect processing order X-Git-Tag: Alt-Design_pre_Properties_split~151 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cdd457cae4f316c2f59373132de05b7b2b708383;p=xmlgraphics-fop.git Changed ordering of property names to reflect processing order git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195103 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/org/apache/fop/fo/PropNames.java b/src/org/apache/fop/fo/PropNames.java index 26597c670..ed6849368 100644 --- a/src/org/apache/fop/fo/PropNames.java +++ b/src/org/apache/fop/fo/PropNames.java @@ -22,6 +22,10 @@ public class PropNames { private static final String revision = "$Revision$"; /* + * List of property constants in property processing order - + * FONT, FONT_SIZE first + * Shorthands must precede any of their expansion elements. + * Compounds must precede any of their components. * The list of property constants can be regenerated in XEmacs by setting * the region on the list of constants. (C-Space at the beginning, * move to last line, C-x C-x to exchange mark and point.) Then run @@ -38,223 +42,239 @@ public class PropNames { public static final int NO_PROPERTY = 0, - ABSOLUTE_POSITION = 1, - ACTIVE_STATE = 2, - ALIGNMENT_ADJUST = 3, - ALIGNMENT_BASELINE = 4, - AUTO_RESTORE = 5, - AZIMUTH = 6, - BACKGROUND = 7, - BACKGROUND_ATTACHMENT = 8, - BACKGROUND_COLOR = 9, - BACKGROUND_IMAGE = 10, - BACKGROUND_POSITION = 11, - BACKGROUND_POSITION_HORIZONTAL = 12, - BACKGROUND_POSITION_VERTICAL = 13, - BACKGROUND_REPEAT = 14, - BASELINE_SHIFT = 15, - BLANK_OR_NOT_BLANK = 16, - BLOCK_PROGRESSION_DIMENSION = 17, - BLOCK_PROGRESSION_DIMENSION_MINIMUM = 18, - BLOCK_PROGRESSION_DIMENSION_OPTIMUM = 19, - BLOCK_PROGRESSION_DIMENSION_MAXIMUM = 20, - BORDER = 21, - BORDER_AFTER_COLOR = 22, - BORDER_AFTER_PRECEDENCE = 23, - BORDER_AFTER_STYLE = 24, - BORDER_AFTER_WIDTH = 25, - BORDER_AFTER_WIDTH_LENGTH = 26, - BORDER_AFTER_WIDTH_CONDITIONALITY = 27, - BORDER_BEFORE_COLOR = 28, - BORDER_BEFORE_PRECEDENCE = 29, - BORDER_BEFORE_STYLE = 30, - BORDER_BEFORE_WIDTH = 31, - BORDER_BEFORE_WIDTH_LENGTH = 32, - BORDER_BEFORE_WIDTH_CONDITIONALITY = 33, - BORDER_BOTTOM = 34, - BORDER_BOTTOM_COLOR = 35, - BORDER_BOTTOM_STYLE = 36, - BORDER_BOTTOM_WIDTH = 37, - BORDER_COLLAPSE = 38, - BORDER_COLOR = 39, - BORDER_END_COLOR = 40, - BORDER_END_PRECEDENCE = 41, - BORDER_END_STYLE = 42, - BORDER_END_WIDTH = 43, - BORDER_END_WIDTH_LENGTH = 44, - BORDER_END_WIDTH_CONDITIONALITY = 45, - BORDER_LEFT = 46, - BORDER_LEFT_COLOR = 47, - BORDER_LEFT_STYLE = 48, - BORDER_LEFT_WIDTH = 49, - BORDER_RIGHT = 50, - BORDER_RIGHT_COLOR = 51, - BORDER_RIGHT_STYLE = 52, - BORDER_RIGHT_WIDTH = 53, - BORDER_SEPARATION = 54, - BORDER_SEPARATION_BLOCK_PROGRESSION_DIRECTION = 55, - BORDER_SEPARATION_INLINE_PROGRESSION_DIRECTION = 56, - BORDER_SPACING = 57, - BORDER_START_COLOR = 58, - BORDER_START_PRECEDENCE = 59, - BORDER_START_STYLE = 60, - BORDER_START_WIDTH = 61, - BORDER_START_WIDTH_LENGTH = 62, - BORDER_START_WIDTH_CONDITIONALITY = 63, - BORDER_STYLE = 64, - BORDER_TOP = 65, - BORDER_TOP_COLOR = 66, - BORDER_TOP_STYLE = 67, - BORDER_TOP_WIDTH = 68, - BORDER_WIDTH = 69, - BOTTOM = 70, - BREAK_AFTER = 71, - BREAK_BEFORE = 72, - CAPTION_SIDE = 73, - CASE_NAME = 74, - CASE_TITLE = 75, - CHARACTER = 76, - CLEAR = 77, - CLIP = 78, - COLOR = 79, - COLOR_PROFILE_NAME = 80, - COLUMN_COUNT = 81, - COLUMN_GAP = 82, - COLUMN_NUMBER = 83, - COLUMN_WIDTH = 84, - CONTENT_HEIGHT = 85, - CONTENT_TYPE = 86, - CONTENT_WIDTH = 87, - COUNTRY = 88, - CUE = 89, - CUE_AFTER = 90, - CUE_BEFORE = 91, - DESTINATION_PLACEMENT_OFFSET = 92, - DIRECTION = 93, - DISPLAY_ALIGN = 94, - DOMINANT_BASELINE = 95, - ELEVATION = 96, - EMPTY_CELLS = 97, - END_INDENT = 98, - ENDS_ROW = 99, - EXTENT = 100, - EXTERNAL_DESTINATION = 101, - FLOAT = 102, - FLOW_NAME = 103, - FONT = 104, - FONT_FAMILY = 105, - FONT_SELECTION_STRATEGY = 106, - FONT_SIZE = 107, - FONT_SIZE_ADJUST = 108, - FONT_STRETCH = 109, - FONT_STYLE = 110, - FONT_VARIANT = 111, - FONT_WEIGHT = 112, - FORCE_PAGE_COUNT = 113, - FORMAT = 114, - GLYPH_ORIENTATION_HORIZONTAL = 115, - GLYPH_ORIENTATION_VERTICAL = 116, - GROUPING_SEPARATOR = 117, - GROUPING_SIZE = 118, - HEIGHT = 119, - HYPHENATE = 120, - HYPHENATION_CHARACTER = 121, - HYPHENATION_KEEP = 122, - HYPHENATION_LADDER_COUNT = 123, - HYPHENATION_PUSH_CHARACTER_COUNT = 124, - HYPHENATION_REMAIN_CHARACTER_COUNT = 125, - ID = 126, - INDICATE_DESTINATION = 127, - INITIAL_PAGE_NUMBER = 128, - INLINE_PROGRESSION_DIMENSION = 129, - INLINE_PROGRESSION_DIMENSION_MINIMUM = 130, - INLINE_PROGRESSION_DIMENSION_OPTIMUM = 131, - INLINE_PROGRESSION_DIMENSION_MAXIMUM = 132, - INTERNAL_DESTINATION = 133, - INTRUSION_DISPLACE = 134, - KEEP_TOGETHER = 135, - KEEP_TOGETHER_WITHIN_LINE = 136, - KEEP_TOGETHER_WITHIN_PAGE = 137, - KEEP_TOGETHER_WITHIN_COLUMN = 138, - KEEP_WITH_NEXT = 139, - KEEP_WITH_NEXT_WITHIN_LINE = 140, - KEEP_WITH_NEXT_WITHIN_PAGE = 141, - KEEP_WITH_NEXT_WITHIN_COLUMN = 142, - KEEP_WITH_PREVIOUS = 143, - KEEP_WITH_PREVIOUS_WITHIN_LINE = 144, - KEEP_WITH_PREVIOUS_WITHIN_PAGE = 145, - KEEP_WITH_PREVIOUS_WITHIN_COLUMN = 146, - LANGUAGE = 147, - LAST_LINE_END_INDENT = 148, - LEADER_ALIGNMENT = 149, - LEADER_LENGTH = 150, - LEADER_LENGTH_MINIMUM = 151, - LEADER_LENGTH_OPTIMUM = 152, - LEADER_LENGTH_MAXIMUM = 153, - LEADER_PATTERN = 154, - LEADER_PATTERN_WIDTH = 155, - LEFT = 156, - LETTER_SPACING = 157, - LETTER_VALUE = 158, - LINEFEED_TREATMENT = 159, - LINE_HEIGHT = 160, - LINE_HEIGHT_MINIMUM = 161, - LINE_HEIGHT_OPTIMUM = 162, - LINE_HEIGHT_MAXIMUM = 163, - LINE_HEIGHT_CONDITIONALITY = 164, - LINE_HEIGHT_PRECEDENCE = 165, - LINE_HEIGHT_SHIFT_ADJUSTMENT = 166, - LINE_STACKING_STRATEGY = 167, - MARGIN = 168, - MARGIN_BOTTOM = 169, - MARGIN_LEFT = 170, - MARGIN_RIGHT = 171, - MARGIN_TOP = 172, - MARKER_CLASS_NAME = 173, - MASTER_NAME = 174, - MASTER_REFERENCE = 175, - MAX_HEIGHT = 176, - MAXIMUM_REPEATS = 177, - MAX_WIDTH = 178, - MEDIA_USAGE = 179, - MIN_HEIGHT = 180, - MIN_WIDTH = 181, - NUMBER_COLUMNS_REPEATED = 182, - NUMBER_COLUMNS_SPANNED = 183, - NUMBER_ROWS_SPANNED = 184, - ODD_OR_EVEN = 185, - ORPHANS = 186, - OVERFLOW = 187, - PADDING = 188, - PADDING_AFTER = 189, - PADDING_AFTER_LENGTH = 190, - PADDING_AFTER_CONDITIONALITY = 191, - PADDING_BEFORE = 192, - PADDING_BEFORE_LENGTH = 193, - PADDING_BEFORE_CONDITIONALITY = 194, - PADDING_BOTTOM = 195, - PADDING_END = 196, - PADDING_END_LENGTH = 197, - PADDING_END_CONDITIONALITY = 198, - PADDING_LEFT = 199, - PADDING_RIGHT = 200, - PADDING_START = 201, - PADDING_START_LENGTH = 202, - PADDING_START_CONDITIONALITY = 203, - PADDING_TOP = 204, - PAGE_BREAK_AFTER = 205, - PAGE_BREAK_BEFORE = 206, - PAGE_BREAK_INSIDE = 207, - PAGE_HEIGHT = 208, - PAGE_POSITION = 209, - PAGE_WIDTH = 210, - PAUSE = 211, - PAUSE_AFTER = 212, - PAUSE_BEFORE = 213, - PITCH = 214, - PITCH_RANGE = 215, - PLAY_DURING = 216, - POSITION = 217, + // Properties setting font-size first + // Shorthand first + FONT = 1, + FONT_SIZE = 2, + // All other shorthands + BACKGROUND = 3, + BACKGROUND_POSITION = 4, + BORDER = 5, + BORDER_COLOR = 6, + BORDER_STYLE = 7, + BORDER_WIDTH = 8, + BORDER_BOTTOM = 9, + BORDER_LEFT = 10, + BORDER_RIGHT = 11, + BORDER_TOP = 12, + BORDER_SPACING = 13, + CUE = 14, + MARGIN = 15, + PADDING = 16, + PAGE_BREAK_AFTER = 17, + PAGE_BREAK_BEFORE = 18, + PAGE_BREAK_INSIDE = 19, + PAUSE = 20, + POSITION = 21, + SIZE = 22, + VERTICAL_ALIGN = 23, + WHITE_SPACE = 24, + XML_LANG = 25, + // Non-shorthand properties + // Within these, compounds precede their components + // and corresponding relative properties + // precede corresponding absolute properties + ABSOLUTE_POSITION = 26, + ACTIVE_STATE = 27, + ALIGNMENT_ADJUST = 28, + ALIGNMENT_BASELINE = 29, + AUTO_RESTORE = 30, + AZIMUTH = 31, + BACKGROUND_ATTACHMENT = 32, + BACKGROUND_COLOR = 33, + BACKGROUND_IMAGE = 34, + BACKGROUND_POSITION_HORIZONTAL = 35, + BACKGROUND_POSITION_VERTICAL = 36, + BACKGROUND_REPEAT = 37, + BASELINE_SHIFT = 38, + BLANK_OR_NOT_BLANK = 39, + BLOCK_PROGRESSION_DIMENSION = 40, + BLOCK_PROGRESSION_DIMENSION_MINIMUM = 41, + BLOCK_PROGRESSION_DIMENSION_OPTIMUM = 42, + BLOCK_PROGRESSION_DIMENSION_MAXIMUM = 43, + + // Border corresponding properties + BORDER_AFTER_COLOR = 44, + BORDER_AFTER_PRECEDENCE = 45, + BORDER_AFTER_STYLE = 46, + BORDER_AFTER_WIDTH = 47, + BORDER_AFTER_WIDTH_LENGTH = 48, + BORDER_AFTER_WIDTH_CONDITIONALITY = 49, + BORDER_BEFORE_COLOR = 50, + BORDER_BEFORE_PRECEDENCE = 51, + BORDER_BEFORE_STYLE = 52, + BORDER_BEFORE_WIDTH = 53, + BORDER_BEFORE_WIDTH_LENGTH = 54, + BORDER_BEFORE_WIDTH_CONDITIONALITY = 55, + BORDER_END_COLOR = 56, + BORDER_END_PRECEDENCE = 57, + BORDER_END_STYLE = 58, + BORDER_END_WIDTH = 59, + BORDER_END_WIDTH_LENGTH = 60, + BORDER_END_WIDTH_CONDITIONALITY = 61, + BORDER_START_COLOR = 62, + BORDER_START_PRECEDENCE = 63, + BORDER_START_STYLE = 64, + BORDER_START_WIDTH = 65, + BORDER_START_WIDTH_LENGTH = 66, + BORDER_START_WIDTH_CONDITIONALITY = 67, + + BORDER_BOTTOM_COLOR = 68, + BORDER_BOTTOM_STYLE = 69, + BORDER_BOTTOM_WIDTH = 70, + BORDER_LEFT_COLOR = 71, + BORDER_LEFT_STYLE = 72, + BORDER_LEFT_WIDTH = 73, + BORDER_RIGHT_COLOR = 74, + BORDER_RIGHT_STYLE = 75, + BORDER_RIGHT_WIDTH = 76, + BORDER_TOP_COLOR = 77, + BORDER_TOP_STYLE = 78, + BORDER_TOP_WIDTH = 79, + + BORDER_COLLAPSE = 80, + BORDER_SEPARATION = 81, + BORDER_SEPARATION_BLOCK_PROGRESSION_DIRECTION = 82, + BORDER_SEPARATION_INLINE_PROGRESSION_DIRECTION = 83, + BOTTOM = 84, + BREAK_AFTER = 85, + BREAK_BEFORE = 86, + CAPTION_SIDE = 87, + CASE_NAME = 88, + CASE_TITLE = 89, + CHARACTER = 90, + CLEAR = 91, + CLIP = 92, + COLOR = 93, + COLOR_PROFILE_NAME = 94, + COLUMN_COUNT = 95, + COLUMN_GAP = 96, + COLUMN_NUMBER = 97, + COLUMN_WIDTH = 98, + CONTENT_HEIGHT = 99, + CONTENT_TYPE = 100, + CONTENT_WIDTH = 101, + COUNTRY = 102, + CUE_AFTER = 103, + CUE_BEFORE = 104, + DESTINATION_PLACEMENT_OFFSET = 105, + DIRECTION = 106, + DISPLAY_ALIGN = 107, + DOMINANT_BASELINE = 108, + ELEVATION = 109, + EMPTY_CELLS = 110, + END_INDENT = 111, + ENDS_ROW = 112, + EXTENT = 113, + EXTERNAL_DESTINATION = 114, + FLOAT = 115, + FLOW_NAME = 116, + FONT_FAMILY = 117, + FONT_SELECTION_STRATEGY = 118, + FONT_SIZE_ADJUST = 119, + FONT_STRETCH = 120, + FONT_STYLE = 121, + FONT_VARIANT = 122, + FONT_WEIGHT = 123, + FORCE_PAGE_COUNT = 124, + FORMAT = 125, + GLYPH_ORIENTATION_HORIZONTAL = 126, + GLYPH_ORIENTATION_VERTICAL = 127, + GROUPING_SEPARATOR = 128, + GROUPING_SIZE = 129, + HEIGHT = 130, + HYPHENATE = 131, + HYPHENATION_CHARACTER = 132, + HYPHENATION_KEEP = 133, + HYPHENATION_LADDER_COUNT = 134, + HYPHENATION_PUSH_CHARACTER_COUNT = 135, + HYPHENATION_REMAIN_CHARACTER_COUNT = 136, + ID = 137, + INDICATE_DESTINATION = 138, + INITIAL_PAGE_NUMBER = 139, + INLINE_PROGRESSION_DIMENSION = 140, + INLINE_PROGRESSION_DIMENSION_MINIMUM = 141, + INLINE_PROGRESSION_DIMENSION_OPTIMUM = 142, + INLINE_PROGRESSION_DIMENSION_MAXIMUM = 143, + INTERNAL_DESTINATION = 144, + INTRUSION_DISPLACE = 145, + KEEP_TOGETHER = 146, + KEEP_TOGETHER_WITHIN_LINE = 147, + KEEP_TOGETHER_WITHIN_PAGE = 148, + KEEP_TOGETHER_WITHIN_COLUMN = 149, + KEEP_WITH_NEXT = 150, + KEEP_WITH_NEXT_WITHIN_LINE = 151, + KEEP_WITH_NEXT_WITHIN_PAGE = 152, + KEEP_WITH_NEXT_WITHIN_COLUMN = 153, + KEEP_WITH_PREVIOUS = 154, + KEEP_WITH_PREVIOUS_WITHIN_LINE = 155, + KEEP_WITH_PREVIOUS_WITHIN_PAGE = 156, + KEEP_WITH_PREVIOUS_WITHIN_COLUMN = 157, + LANGUAGE = 158, + LAST_LINE_END_INDENT = 159, + LEADER_ALIGNMENT = 160, + LEADER_LENGTH = 161, + LEADER_LENGTH_MINIMUM = 162, + LEADER_LENGTH_OPTIMUM = 163, + LEADER_LENGTH_MAXIMUM = 164, + LEADER_PATTERN = 165, + LEADER_PATTERN_WIDTH = 166, + LEFT = 167, + LETTER_SPACING = 168, + LETTER_VALUE = 169, + LINEFEED_TREATMENT = 170, + LINE_HEIGHT = 171, + LINE_HEIGHT_MINIMUM = 172, + LINE_HEIGHT_OPTIMUM = 173, + LINE_HEIGHT_MAXIMUM = 174, + LINE_HEIGHT_CONDITIONALITY = 175, + LINE_HEIGHT_PRECEDENCE = 176, + LINE_HEIGHT_SHIFT_ADJUSTMENT = 177, + LINE_STACKING_STRATEGY = 178, + + MARKER_CLASS_NAME = 179, + MASTER_NAME = 180, + MASTER_REFERENCE = 181, + MAX_HEIGHT = 182, + MAXIMUM_REPEATS = 183, + MAX_WIDTH = 184, + MEDIA_USAGE = 185, + MIN_HEIGHT = 186, + MIN_WIDTH = 187, + NUMBER_COLUMNS_REPEATED = 188, + NUMBER_COLUMNS_SPANNED = 189, + NUMBER_ROWS_SPANNED = 190, + ODD_OR_EVEN = 191, + ORPHANS = 192, + OVERFLOW = 193, + + // Padding corresponding properties + PADDING_AFTER = 194, + PADDING_AFTER_LENGTH = 195, + PADDING_AFTER_CONDITIONALITY = 196, + PADDING_BEFORE = 197, + PADDING_BEFORE_LENGTH = 198, + PADDING_BEFORE_CONDITIONALITY = 199, + PADDING_END = 200, + PADDING_END_LENGTH = 201, + PADDING_END_CONDITIONALITY = 202, + PADDING_START = 203, + PADDING_START_LENGTH = 204, + PADDING_START_CONDITIONALITY = 205, + + PADDING_BOTTOM = 206, + PADDING_LEFT = 207, + PADDING_RIGHT = 208, + PADDING_TOP = 209, + + PAGE_HEIGHT = 210, + PAGE_POSITION = 211, + PAGE_WIDTH = 212, + PAUSE_AFTER = 213, + PAUSE_BEFORE = 214, + PITCH = 215, + PITCH_RANGE = 216, + PLAY_DURING = 217, PRECEDENCE = 218, PROVISIONAL_DISTANCE_BETWEEN_STARTS = 219, PROVISIONAL_LABEL_SEPARATION = 220, @@ -277,75 +297,79 @@ public class PropNames { SCORE_SPACES = 237, SCRIPT = 238, SHOW_DESTINATION = 239, - SIZE = 240, - SOURCE_DOCUMENT = 241, - SPACE_AFTER = 242, - SPACE_AFTER_MINIMUM = 243, - SPACE_AFTER_OPTIMUM = 244, - SPACE_AFTER_MAXIMUM = 245, - SPACE_AFTER_CONDITIONALITY = 246, - SPACE_AFTER_PRECEDENCE = 247, - SPACE_BEFORE = 248, - SPACE_BEFORE_MINIMUM = 249, - SPACE_BEFORE_OPTIMUM = 250, - SPACE_BEFORE_MAXIMUM = 251, - SPACE_BEFORE_CONDITIONALITY = 252, - SPACE_BEFORE_PRECEDENCE = 253, - SPACE_END = 254, - SPACE_END_MINIMUM = 255, - SPACE_END_OPTIMUM = 256, - SPACE_END_MAXIMUM = 257, - SPACE_END_CONDITIONALITY = 258, - SPACE_END_PRECEDENCE = 259, - SPACE_START = 260, - SPACE_START_MINIMUM = 261, - SPACE_START_OPTIMUM = 262, - SPACE_START_MAXIMUM = 263, - SPACE_START_CONDITIONALITY = 264, - SPACE_START_PRECEDENCE = 265, - SPAN = 266, - SPEAK = 267, - SPEAK_HEADER = 268, - SPEAK_NUMERAL = 269, - SPEAK_PUNCTUATION = 270, - SPEECH_RATE = 271, - SRC = 272, - START_INDENT = 273, - STARTING_STATE = 274, - STARTS_ROW = 275, - STRESS = 276, - SUPPRESS_AT_LINE_BREAK = 277, - SWITCH_TO = 278, - TABLE_LAYOUT = 279, - TABLE_OMIT_FOOTER_AT_BREAK = 280, - TABLE_OMIT_HEADER_AT_BREAK = 281, - TARGET_PRESENTATION_CONTEXT = 282, - TARGET_PROCESSING_CONTEXT = 283, - TARGET_STYLESHEET = 284, - TEXT_ALIGN = 285, - TEXT_ALIGN_LAST = 286, - TEXT_ALTITUDE = 287, - TEXT_DECORATION = 288, - TEXT_DEPTH = 289, - TEXT_INDENT = 290, - TEXT_SHADOW = 291, - TEXT_TRANSFORM = 292, - TOP = 293, - TREAT_AS_WORD_SPACE = 294, - UNICODE_BIDI = 295, - VERTICAL_ALIGN = 296, - VISIBILITY = 297, - VOICE_FAMILY = 298, - VOLUME = 299, - WHITE_SPACE = 300, - WHITE_SPACE_COLLAPSE = 301, - WHITE_SPACE_TREATMENT = 302, - WIDOWS = 303, - WIDTH = 304, - WORD_SPACING = 305, - WRAP_OPTION = 306, - WRITING_MODE = 307, - XML_LANG = 308, + SOURCE_DOCUMENT = 240, + + // Space/margin corresponding properties + SPACE_AFTER = 241, + SPACE_AFTER_MINIMUM = 242, + SPACE_AFTER_OPTIMUM = 243, + SPACE_AFTER_MAXIMUM = 244, + SPACE_AFTER_CONDITIONALITY = 245, + SPACE_AFTER_PRECEDENCE = 246, + SPACE_BEFORE = 247, + SPACE_BEFORE_MINIMUM = 248, + SPACE_BEFORE_OPTIMUM = 249, + SPACE_BEFORE_MAXIMUM = 250, + SPACE_BEFORE_CONDITIONALITY = 251, + SPACE_BEFORE_PRECEDENCE = 252, + SPACE_END = 253, + SPACE_END_MINIMUM = 254, + SPACE_END_OPTIMUM = 255, + SPACE_END_MAXIMUM = 256, + SPACE_END_CONDITIONALITY = 257, + SPACE_END_PRECEDENCE = 258, + SPACE_START = 259, + SPACE_START_MINIMUM = 260, + SPACE_START_OPTIMUM = 261, + SPACE_START_MAXIMUM = 262, + SPACE_START_CONDITIONALITY = 263, + SPACE_START_PRECEDENCE = 264, + + MARGIN_BOTTOM = 265, + MARGIN_LEFT = 266, + MARGIN_RIGHT = 267, + MARGIN_TOP = 268, + + SPAN = 269, + SPEAK = 270, + SPEAK_HEADER = 271, + SPEAK_NUMERAL = 272, + SPEAK_PUNCTUATION = 273, + SPEECH_RATE = 274, + SRC = 275, + START_INDENT = 276, + STARTING_STATE = 277, + STARTS_ROW = 278, + STRESS = 279, + SUPPRESS_AT_LINE_BREAK = 280, + SWITCH_TO = 281, + TABLE_LAYOUT = 282, + TABLE_OMIT_FOOTER_AT_BREAK = 283, + TABLE_OMIT_HEADER_AT_BREAK = 284, + TARGET_PRESENTATION_CONTEXT = 285, + TARGET_PROCESSING_CONTEXT = 286, + TARGET_STYLESHEET = 287, + TEXT_ALIGN = 288, + TEXT_ALIGN_LAST = 289, + TEXT_ALTITUDE = 290, + TEXT_DECORATION = 291, + TEXT_DEPTH = 292, + TEXT_INDENT = 293, + TEXT_SHADOW = 294, + TEXT_TRANSFORM = 295, + TOP = 296, + TREAT_AS_WORD_SPACE = 297, + UNICODE_BIDI = 298, + VISIBILITY = 299, + VOICE_FAMILY = 300, + VOLUME = 301, + WHITE_SPACE_COLLAPSE = 302, + WHITE_SPACE_TREATMENT = 303, + WIDOWS = 304, + WIDTH = 305, + WORD_SPACING = 306, + WRAP_OPTION = 307, + WRITING_MODE = 308, Z_INDEX = 309, LAST_PROPERTY_INDEX = Z_INDEX; @@ -361,17 +385,42 @@ public class PropNames { private static final String[] propertyNames = { "no-property", + "font", + "font-size", + + "background", + "background-position", + "border", + "border-color", + "border-style", + "border-width", + "border-bottom", + "border-left", + "border-right", + "border-top", + "border-spacing", + "cue", + "margin", + "padding", + "page-break-after", + "page-break-before", + "page-break-inside", + "pause", + "position", + "size", + "vertical-align", + "white-space", + "xml:lang", + "absolute-position", "active-state", "alignment-adjust", "alignment-baseline", "auto-restore", "azimuth", - "background", "background-attachment", "background-color", "background-image", - "background-position", "background-position-horizontal", "background-position-vertical", "background-repeat", @@ -381,7 +430,7 @@ public class PropNames { "block-progression-dimension.minimum", "block-progression-dimension.optimum", "block-progression-dimension.maximum", - "border", + "border-after-color", "border-after-precedence", "border-after-style", @@ -394,42 +443,36 @@ public class PropNames { "border-before-width", "border-before-width.length", "border-before-width.conditionality", - "border-bottom", - "border-bottom-color", - "border-bottom-style", - "border-bottom-width", - "border-collapse", - "border-color", "border-end-color", "border-end-precedence", "border-end-style", "border-end-width", "border-end-width.length", "border-end-width.conditionality", - "border-left", - "border-left-color", - "border-left-style", - "border-left-width", - "border-right", - "border-right-color", - "border-right-style", - "border-right-width", - "border-separation", - "border-separation.block-progression-direction", - "border-separation.inline-progression-direction", - "border-spacing", "border-start-color", "border-start-precedence", "border-start-style", "border-start-width", "border-start-width.length", "border-start-width.conditionality", - "border-style", - "border-top", + + "border-bottom-color", + "border-bottom-style", + "border-bottom-width", + "border-left-color", + "border-left-style", + "border-left-width", + "border-right-color", + "border-right-style", + "border-right-width", "border-top-color", "border-top-style", "border-top-width", - "border-width", + + "border-collapse", + "border-separation", + "border-separation.block-progression-direction", + "border-separation.inline-progression-direction", "bottom", "break-after", "break-before", @@ -449,7 +492,6 @@ public class PropNames { "content-type", "content-width", "country", - "cue", "cue-after", "cue-before", "destination-placement-offset", @@ -464,10 +506,8 @@ public class PropNames { "external-destination", "float", "flow-name", - "font", "font-family", "font-selection-strategy", - "font-size", "font-size-adjust", "font-stretch", "font-style", @@ -528,11 +568,7 @@ public class PropNames { "line-height.precedence", "line-height-shift-adjustment", "line-stacking-strategy", - "margin", - "margin-bottom", - "margin-left", - "margin-right", - "margin-top", + "marker-class-name", "master-name", "master-reference", @@ -548,36 +584,33 @@ public class PropNames { "odd-or-even", "orphans", "overflow", - "padding", + "padding-after", "padding-after.length", "padding-after.conditionality", "padding-before", "padding-before.length", "padding-before.conditionality", - "padding-bottom", "padding-end", "padding-end.length", "padding-end.conditionality", - "padding-left", - "padding-right", "padding-start", "padding-start.length", "padding-start.conditionality", + + "padding-bottom", + "padding-left", + "padding-right", "padding-top", - "page-break-after", - "page-break-before", - "page-break-inside", + "page-height", "page-position", "page-width", - "pause", "pause-after", "pause-before", "pitch", "pitch-range", "play-during", - "position", "precedence", "provisional-distance-between-starts", "provisional-label-separation", @@ -600,8 +633,8 @@ public class PropNames { "score-spaces", "script", "show-destination", - "size", "source-document", + "space-after", "space-after.minimum", "space-after.optimum", @@ -626,6 +659,12 @@ public class PropNames { "space-start.maximum", "space-start.conditionality", "space-start.precedence", + + "margin-bottom", + "margin-left", + "margin-right", + "margin-top", + "span", "speak", "speak-header", @@ -656,11 +695,9 @@ public class PropNames { "top", "treat-as-word-space", "unicode-bidi", - "vertical-align", "visibility", "voice-family", "volume", - "white-space", "white-space-collapse", "white-space-treatment", "widows", @@ -668,7 +705,6 @@ public class PropNames { "word-spacing", "wrap-option", "writing-mode", - "xml:lang", "z-index" };