writerfilter/source/ooxml/model.xml | 1814 ++++++++++++++++-------------------- 1 file changed, 854 insertions(+), 960 deletions(-)
New commits: commit 19ccb678d28dffea57c5d7c3ea623412f7fed236 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Sun Aug 10 11:10:35 2014 +0200 Remove unused group elements Change-Id: I6ea77279a002179f2dd30bc835bb810c91ee51c4 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 225628b..6fbec28 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -151,7 +151,6 @@ </element> </define> <define name="CT_OfficeStyleSheet"> - <group> <element name="themeElements"> <ref name="CT_BaseStyles"/> </element> @@ -167,7 +166,6 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="name"> <data type="string"/> </attribute> @@ -486,7 +484,6 @@ </choice> </define> <define name="CT_Shape3D"> - <group> <element name="bevelT"> <ref name="CT_Bevel"/> </element> @@ -502,7 +499,6 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="z"> <ref name="ST_Coordinate"/> </attribute> @@ -809,7 +805,6 @@ </choice> </define> <define name="CT_ColorScheme"> - <group> <element name="dk1"> <ref name="CT_Color"/> </element> @@ -849,7 +844,6 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="name"> <data type="string"> </data> @@ -905,7 +899,6 @@ </element> </define> <define name="CT_FontScheme"> - <group> <element name="majorFont"> <ref name="CT_FontCollection"/> </element> @@ -915,7 +908,6 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="name"> <data type="string"/> </attribute> @@ -937,7 +929,6 @@ <ref name="EG_FillProperties"/> </define> <define name="CT_StyleMatrix"> - <group> <element name="fillStyleLst"> <ref name="CT_FillStyleList"/> </element> @@ -950,7 +941,6 @@ <element name="bgFillStyleLst"> <ref name="CT_BackgroundFillStyleList"/> </element> - </group> <attribute name="name"> <data type="string"/> </attribute> @@ -1166,7 +1156,6 @@ </choice> </define> <define name="CT_TextCharacterProperties"> - <group> <element name="ln"> <ref name="CT_LineProperties"/> </element> @@ -1198,7 +1187,6 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="kumimoji"> <data type="boolean"/> </attribute> @@ -1347,14 +1335,12 @@ </attribute> </define> <define name="CT_ColorChangeEffect"> - <group> <element name="clrFrom"> <ref name="CT_Color"/> </element> <element name="clrTo"> <ref name="CT_Color"/> </element> - </group> <attribute name="useA"> <data type="boolean"/> </attribute> @@ -1642,7 +1628,6 @@ </element> </define> <define name="CT_GradientFillProperties"> - <group> <element name="gsLst"> <ref name="CT_GradientStopList"/> </element> @@ -1650,7 +1635,6 @@ <element name="tileRect"> <ref name="CT_RelativeRect"/> </element> - </group> <attribute name="flip"> <ref name="ST_TileFlipMode"/> </attribute> @@ -1708,7 +1692,6 @@ </choice> </define> <define name="CT_Blip"> - <group> <choice> <element name="alphaBiLevel"> <ref name="CT_AlphaBiLevelEffect"/> @@ -1765,14 +1748,12 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <ref name="AG_Blob"/> <attribute name="cstate"> <ref name="ST_BlipCompression"/> </attribute> </define> <define name="CT_BlipFillProperties"> - <group> <element name="blip"> <ref name="CT_Blip"/> </element> @@ -1780,7 +1761,6 @@ <ref name="CT_RelativeRect"/> </element> <ref name="EG_FillModeProperties"/> - </group> <attribute name="dpi"> <data type="unsignedInt"/> </attribute> @@ -1901,14 +1881,12 @@ </choice> </define> <define name="CT_PatternFillProperties"> - <group> <element name="fgClr"> <ref name="CT_Color"/> </element> <element name="bgClr"> <ref name="CT_Color"/> </element> - </group> <attribute name="prst"> <ref name="ST_PresetPatternVal"/> </attribute> @@ -2509,7 +2487,6 @@ </choice> </define> <define name="CT_LineProperties"> - <group> <ref name="EG_LineFillProperties"/> <ref name="EG_LineDashProperties"/> <ref name="EG_LineJoinProperties"/> @@ -2522,7 +2499,6 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="w"> <ref name="ST_LineWidth"/> </attribute> @@ -2614,7 +2590,6 @@ <include href="dml-shapeEffects.rng"/> <include href="dml-shapeLineProperties.rng"/> <define name="CT_ShapeProperties"> - <group> <element name="xfrm"> <ref name="CT_Transform2D"/> </element> @@ -2633,13 +2608,11 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="bwMode"> <ref name="ST_BlackWhiteMode"/> </attribute> </define> <define name="CT_GroupShapeProperties"> - <group> <element name="xfrm"> <ref name="CT_GroupTransform2D"/> </element> @@ -2651,7 +2624,6 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="bwMode"> <ref name="ST_BlackWhiteMode"/> </attribute> @@ -3320,14 +3292,12 @@ </element> </define> <define name="CT_Transform2D"> - <group> <element name="off"> <ref name="CT_Point2D"/> </element> <element name="ext"> <ref name="CT_PositiveSize2D"/> </element> - </group> <attribute name="rot"> <ref name="ST_Angle"/> </attribute> @@ -3339,7 +3309,6 @@ </attribute> </define> <define name="CT_GroupTransform2D"> - <group> <element name="off"> <ref name="CT_Point2D"/> </element> @@ -3352,7 +3321,6 @@ <element name="chExt"> <ref name="CT_PositiveSize2D"/> </element> - </group> <attribute name="rot"> <ref name="ST_Angle"/> </attribute> @@ -3504,14 +3472,12 @@ </attribute> </define> <define name="CT_Hyperlink"> - <group> <element name="snd"> <ref name="CT_EmbeddedWAVAudioFile"/> </element> <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="r:id"/> <attribute name="invalidUrl"> <data type="string"/> @@ -3948,7 +3914,6 @@ </attribute> </define> <define name="CT_NonVisualDrawingProps"> - <group> <element name="a:hlinkClick"> <ref name="BUILT_IN_ANY_TYPE"/> </element> @@ -3958,7 +3923,6 @@ <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="id"> <ref name="ST_DrawingElementId"/> </attribute> @@ -3976,14 +3940,12 @@ </attribute> </define> <define name="CT_NonVisualDrawingShapeProps"> - <group> <element name="spLocks"> <ref name="CT_ShapeLocking"/> </element> <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="txBox"> <data type="boolean"/> </attribute> @@ -4003,14 +3965,12 @@ </element> </define> <define name="CT_NonVisualPictureProperties"> - <group> <element name="picLocks"> <ref name="CT_PictureLocking"/> </element> <element name="extLst"> <ref name="CT_OfficeArtExtensionList"/> </element> - </group> <attribute name="preferRelativeResize"> <data type="boolean"/> </attribute> @@ -6787,7 +6747,6 @@ <data type="hexBinary"/> </define> <define name="CT_Inline"> - <group> <element name="extent"> <ref name="CT_PositiveSize2D"/> </element> @@ -6809,7 +6768,6 @@ <element name="wp14:sizeRelV"> <ref name="BUILT_IN_ANY_TYPE"/> </element> - </group> <attribute name="distT"> <ref name="ST_WrapDistance"/> </attribute> @@ -6839,14 +6797,12 @@ </choice> </define> <define name="CT_WrapPath"> - <group> <element name="start"> <ref name="CT_Point2D"/> </element> <element name="lineTo"> <ref name="CT_Point2D"/> </element> - </group> <attribute name="edited"> <data type="boolean"/> </attribute> @@ -7030,7 +6986,6 @@ </attribute> </define> <define name="CT_Anchor"> - <group> <element name="simplePos"> <ref name="CT_Point2D"/> </element> @@ -7062,7 +7017,6 @@ <element name="wp14:sizeRelV"> <ref name="BUILT_IN_ANY_TYPE"/> </element> - </group> <attribute name="distT"> <ref name="ST_WrapDistance"/> </attribute> @@ -8897,12 +8851,10 @@ </attribute> </define> <define name="CT_Shapetype"> - <group> <ref name="EG_ShapeElements"/> <element name="o:complex"> <ref name="BUILT_IN_ANY_TYPE"/> </element> - </group> <ref name="AG_AllCoreAttributes"/> <ref name="AG_AllShapeAttributes"/> <ref name="AG_Adj"/> @@ -9195,7 +9147,6 @@ </attribute> </define> <define name="CT_Stroke"> - <group> <element name="o:left"> <ref name="BUILT_IN_ANY_TYPE"/> </element> @@ -9211,7 +9162,6 @@ <element name="o:column"> <ref name="BUILT_IN_ANY_TYPE"/> </element> - </group> <ref name="AG_Id"/> <ref name="AG_StrokeAttributes"/> </define> @@ -10308,7 +10258,6 @@ </attribute> </define> <define name="CT_OLEObject"> - <group> <element name="LinkType"> <ref name="ST_OLELinkType"/> </element> @@ -10318,7 +10267,6 @@ <element name="FieldCodes"> <data type="string"/> </element> - </group> <attribute name="Type"> <text/> </attribute> @@ -12573,7 +12521,6 @@ </define> <define name="CT_PPr"> <ref name="CT_PPrBase"/> - <group> <element name="rPr"> <ref name="CT_ParaRPr"/> </element> @@ -12583,7 +12530,6 @@ <element name="pPrChange"> <ref name="CT_PPrChange"/> </element> - </group> </define> <define name="CT_Control"> <attribute name="name"> @@ -12639,14 +12585,12 @@ </define> <define name="CT_Picture"> <ref name="CT_PictureBase"/> - <group> <element name="movie"> <ref name="CT_Rel"/> </element> <element name="control"> <ref name="CT_Control"/> </element> - </group> </define> <define name="CT_Drawing"> <choice> @@ -12655,12 +12599,10 @@ </choice> </define> <define name="CT_SimpleField"> - <group> <element name="fldData"> <ref name="CT_FLDData"/> </element> <ref name="EG_PContent"/> - </group> <attribute name="instr"> <text/> </attribute> @@ -13062,7 +13004,6 @@ </choice> </define> <define name="CT_PageBorders"> - <group> <element name="top"> <ref name="CT_Border"/> </element> @@ -13075,7 +13016,6 @@ <element name="right"> <ref name="CT_Border"/> </element> - </group> <attribute name="zOrder"> <ref name="ST_PageBorderZOrder"/> </attribute> @@ -13324,13 +13264,11 @@ <ref name="AG_SectPrAttributes"/> </define> <define name="CT_SectPr"> - <group> <ref name="EG_HdrFtrReferences"/> <ref name="EG_SectPrContents"/> <element name="sectPrChange"> <ref name="CT_SectPrChange"/> </element> - </group> <ref name="AG_SectPrAttributes"/> </define> <define name="ST_BrType"> @@ -13567,10 +13505,8 @@ </choice> </define> <define name="CT_R"> - <group> <ref name="EG_RPr"/> <ref name="EG_RunInnerContent"/> - </group> <attribute name="rsidRPr"> <text/> </attribute> @@ -13935,7 +13871,6 @@ </attribute> </define> <define name="CT_SdtDate"> - <group> <element name="dateFormat"> <ref name="CT_String"/> </element> @@ -13948,7 +13883,6 @@ <element name="calendar"> <ref name="CT_CalendarType"/> </element> - </group> <attribute name="fullDate"> <text/> </attribute> @@ -14198,12 +14132,10 @@ </attribute> </define> <define name="CT_CustomXmlRun"> - <group> <element name="customXmlPr"> <ref name="CT_CustomXmlPr"/> </element> <ref name="EG_PContent"/> - </group> <attribute name="uri"> <text/> </attribute> @@ -14212,12 +14144,10 @@ </attribute> </define> <define name="CT_SmartTagRun"> - <group> <element name="smartTagPr"> <ref name="CT_SmartTagPr"/> </element> <ref name="EG_PContent"/> - </group> <attribute name="uri"> <text/> </attribute> @@ -14226,12 +14156,10 @@ </attribute> </define> <define name="CT_CustomXmlBlock"> - <group> <element name="customXmlPr"> <ref name="CT_CustomXmlPr"/> </element> <ref name="EG_ContentBlockContent"/> - </group> <attribute name="uri"> <text/> </attribute> @@ -14248,12 +14176,10 @@ </element> </define> <define name="CT_CustomXmlRow"> - <group> <element name="customXmlPr"> <ref name="CT_CustomXmlPr"/> </element> <ref name="EG_ContentRowContent"/> - </group> <attribute name="uri"> <text/> </attribute> @@ -14262,12 +14188,10 @@ </attribute> </define> <define name="CT_CustomXmlCell"> - <group> <element name="customXmlPr"> <ref name="CT_CustomXmlPr"/> </element> <ref name="EG_ContentCellContent"/> - </group> <attribute name="uri"> <text/> </attribute> @@ -14295,12 +14219,10 @@ </choice> </define> <define name="CT_P"> - <group> <element name="pPr"> <ref name="CT_PPr"/> </element> <ref name="EG_PContent"/> - </group> <attribute name="rsidRPr"> <text/> </attribute> @@ -14579,7 +14501,6 @@ </define> <define name="CT_TrPr"> <ref name="CT_TrPrBase"/> - <group> <element name="ins"> <ref name="CT_TrackChange"/> </element> @@ -14589,10 +14510,8 @@ <element name="trPrChange"> <ref name="CT_TrPrChange"/> </element> - </group> </define> <define name="CT_Row"> - <group> <element name="tblPrEx"> <ref name="CT_TblPrEx"/> </element> @@ -14600,7 +14519,6 @@ <ref name="CT_TrPr"/> </element> <ref name="EG_ContentCellContent"/> - </group> <attribute name="rsidRPr"> <text/> </attribute> @@ -15869,7 +15787,6 @@ </attribute> </define> <define name="CT_Lvl"> - <group> <element name="start"> <ref name="CT_DecimalNumber"/> </element> @@ -15906,7 +15823,6 @@ <element name="rPr"> <ref name="CT_RPr"/> </element> - </group> <attribute name="ilvl"> <text/> </attribute> @@ -15933,7 +15849,6 @@ </attribute> </define> <define name="CT_AbstractNum"> - <group> <element name="nsid"> <ref name="CT_LongHexNumber"/> </element> @@ -15955,33 +15870,28 @@ <element name="lvl"> <ref name="CT_Lvl"/> </element> - </group> <attribute name="abstractNumId"> <text/> </attribute> </define> <define name="CT_NumLvl"> - <group> <element name="startOverride"> <ref name="CT_DecimalNumber"/> </element> <element name="lvl"> <ref name="CT_Lvl"/> </element> - </group> <attribute name="ilvl"> <text/> </attribute> </define> <define name="CT_Num"> - <group> <element name="abstractNumId"> <ref name="CT_DecimalNumber"/> </element> <element name="lvlOverride"> <ref name="CT_NumLvl"/> </element> - </group> <attribute name="numId"> <text/> </attribute> @@ -16031,7 +15941,6 @@ </choice> </define> <define name="CT_Style_tblStylePr"> - <group> <element name="pPr"> <ref name="CT_PPrBase"/> </element> @@ -16047,7 +15956,6 @@ <element name="tcPr"> <ref name="CT_TcPrBase"/> </element> - </group> <attribute name="type"> <ref name="ST_TblStyleOverrideType"/> </attribute> @@ -16074,7 +15982,6 @@ </choice> </define> <define name="CT_Style"> - <group> <element name="name"> <ref name="CT_String"/> </element> @@ -16141,7 +16048,6 @@ <element name="tblStylePr"> <ref name="CT_Style_tblStylePr"/> </element> - </group> <attribute name="type"> <ref name="ST_StyleType"/> </attribute> @@ -16283,7 +16189,6 @@ </attribute> </define> <define name="CT_Font"> - <group> <element name="altName"> <ref name="CT_String"/> </element> @@ -16320,7 +16225,6 @@ <element name="embedBoldItalic"> <ref name="CT_FontRel"/> </element> - </group> <attribute name="name"> <text/> </attribute> @@ -16353,7 +16257,6 @@ </element> </define> <define name="CT_Div"> - <group> <element name="blockQuote"> <ref name="CT_OnOff"/> </element> @@ -16378,7 +16281,6 @@ <element name="divsChild"> <ref name="CT_Divs"/> </element> - </group> <attribute name="id"> <text/> </attribute> commit 676efaa5a12a48982abbeba5075d8f7686ed3fdb Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Sun Aug 10 11:08:07 2014 +0200 Remove unused list elements Change them to choice, what was probably really meant here: allow one of the values, not a whitespace-separated list of one or more values. Also, clean up nested choices. Change-Id: I87bc30b710569e317da05933502b36d8d97e4155 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 2fedef3..225628b 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -10555,9 +10555,9 @@ <start name="AlternateContent"/> <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/markup-compatibility/2006" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> <define name="nsList"> - <list> + <choice> <data type="NCName"/> - </list> + </choice> </define> <define name="AlternateContent"> <element name="AlternateContent"> @@ -10925,10 +10925,10 @@ </attribute> </define> <define name="ST_HexColorAuto"> - <list> + <choice> <!-- Automatically Determined Color --> <value>auto</value> - </list> + </choice> </define> <define name="ST_HexColorRGB"> <data type="hexBinary"/> @@ -12051,16 +12051,16 @@ </choice> </define> <define name="ST_AlgClass"> - <list> + <choice> <!-- Hashing --> <value>hash</value> - </list> + </choice> </define> <define name="ST_AlgType"> - <list> + <choice> <!-- Any Type --> <value>typeAny</value> - </list> + </choice> </define> <define name="AG_Password"> <attribute name="cryptProviderType"> @@ -12771,7 +12771,6 @@ <element name="statusText"> <ref name="CT_FFStatusText"/> </element> - <choice> <element name="checkBox"> <ref name="CT_FFCheckBox"/> </element> @@ -12781,7 +12780,6 @@ <element name="textInput"> <ref name="CT_FFTextInput"/> </element> - </choice> </choice> </define> <define name="CT_FFHelpText"> @@ -14024,7 +14022,6 @@ <element name="tag"> <ref name="CT_String"/> </element> - <choice> <element name="equation"> <ref name="CT_OnOff"/> </element> @@ -14064,7 +14061,6 @@ <element name="bibliography"> <ref name="CT_Empty"/> </element> - </choice> </choice> </define> <define name="CT_SdtEndPr"> commit b17f4ecea142fd6f311dcb457e8896cd12e60fc0 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Sun Aug 10 10:38:59 2014 +0200 Remove unused name attributes For <value> elements inside <resource> ones, the name attribute and the text of the element was the same, but our scripts only parsed the text. So remove the redundant code that's ignored anyway. Change-Id: I0d96b485c9e095be51571f2d68eb395920c97bc8 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index f535b80..2fedef3 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -351,43 +351,43 @@ </define> </grammar> <resource name="ST_LightRigDirection" resource="List"> - <value name="tl" tokenid="ooxml:Value_drawingml_ST_LightRigDirection_tl">tl</value> - <value name="t" tokenid="ooxml:Value_drawingml_ST_LightRigDirection_t">t</value> - <value name="tr" tokenid="ooxml:Value_drawingml_ST_LightRigDirection_tr">tr</value> - <value name="l" tokenid="ooxml:Value_drawingml_ST_LightRigDirection_l">l</value> - <value name="r" tokenid="ooxml:Value_drawingml_ST_LightRigDirection_r">r</value> - <value name="bl" tokenid="ooxml:Value_drawingml_ST_LightRigDirection_bl">bl</value> - <value name="b" tokenid="ooxml:Value_drawingml_ST_LightRigDirection_b">b</value> - <value name="br" tokenid="ooxml:Value_drawingml_ST_LightRigDirection_br">br</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigDirection_tl">tl</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigDirection_t">t</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigDirection_tr">tr</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigDirection_l">l</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigDirection_r">r</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigDirection_bl">bl</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigDirection_b">b</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigDirection_br">br</value> </resource> <resource name="ST_LightRigType" resource="List"> - <value name="legacyFlat1" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyFlat1">legacyFlat1</value> - <value name="legacyFlat2" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyFlat2">legacyFlat2</value> - <value name="legacyFlat3" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyFlat3">legacyFlat3</value> - <value name="legacyFlat4" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyFlat4">legacyFlat4</value> - <value name="legacyNormal1" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyNormal1">legacyNormal1</value> - <value name="legacyNormal2" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyNormal2">legacyNormal2</value> - <value name="legacyNormal3" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyNormal3">legacyNormal3</value> - <value name="legacyNormal4" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyNormal4">legacyNormal4</value> - <value name="legacyHarsh1" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyHarsh1">legacyHarsh1</value> - <value name="legacyHarsh2" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyHarsh2">legacyHarsh2</value> - <value name="legacyHarsh3" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyHarsh3">legacyHarsh3</value> - <value name="legacyHarsh4" tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyHarsh4">legacyHarsh4</value> - <value name="threePt" tokenid="ooxml:Value_drawingml_ST_LightRigType_threePt">threePt</value> - <value name="balanced" tokenid="ooxml:Value_drawingml_ST_LightRigType_balanced">balanced</value> - <value name="soft" tokenid="ooxml:Value_drawingml_ST_LightRigType_soft">soft</value> - <value name="harsh" tokenid="ooxml:Value_drawingml_ST_LightRigType_harsh">harsh</value> - <value name="flood" tokenid="ooxml:Value_drawingml_ST_LightRigType_flood">flood</value> - <value name="contrasting" tokenid="ooxml:Value_drawingml_ST_LightRigType_contrasting">contrasting</value> - <value name="morning" tokenid="ooxml:Value_drawingml_ST_LightRigType_morning">morning</value> - <value name="sunrise" tokenid="ooxml:Value_drawingml_ST_LightRigType_sunrise">sunrise</value> - <value name="sunset" tokenid="ooxml:Value_drawingml_ST_LightRigType_sunset">sunset</value> - <value name="chilly" tokenid="ooxml:Value_drawingml_ST_LightRigType_chilly">chilly</value> - <value name="freezing" tokenid="ooxml:Value_drawingml_ST_LightRigType_freezing">freezing</value> - <value name="flat" tokenid="ooxml:Value_drawingml_ST_LightRigType_flat">flat</value> - <value name="twoPt" tokenid="ooxml:Value_drawingml_ST_LightRigType_twoPt">twoPt</value> - <value name="glow" tokenid="ooxml:Value_drawingml_ST_LightRigType_glow">glow</value> - <value name="brightRoom" tokenid="ooxml:Value_drawingml_ST_LightRigType_brightRoom">brightRoom</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyFlat1">legacyFlat1</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyFlat2">legacyFlat2</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyFlat3">legacyFlat3</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyFlat4">legacyFlat4</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyNormal1">legacyNormal1</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyNormal2">legacyNormal2</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyNormal3">legacyNormal3</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyNormal4">legacyNormal4</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyHarsh1">legacyHarsh1</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyHarsh2">legacyHarsh2</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyHarsh3">legacyHarsh3</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_legacyHarsh4">legacyHarsh4</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_threePt">threePt</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_balanced">balanced</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_soft">soft</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_harsh">harsh</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_flood">flood</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_contrasting">contrasting</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_morning">morning</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_sunrise">sunrise</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_sunset">sunset</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_chilly">chilly</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_freezing">freezing</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_flat">flat</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_twoPt">twoPt</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_glow">glow</value> + <value tokenid="ooxml:Value_drawingml_ST_LightRigType_brightRoom">brightRoom</value> </resource> </namespace> <namespace name="dml-shape3DScene" file="dml-shape3DScene.rng"> @@ -533,35 +533,35 @@ </define> </grammar> <resource name="ST_BevelPresetType" resource="List"> - <value name="relaxedInset" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_relaxedInset">relaxedInset</value> - <value name="circle" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_circle">circle</value> - <value name="slope" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_slope">slope</value> - <value name="cross" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_cross">cross</value> - <value name="angle" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_angle">angle</value> - <value name="softRound" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_softRound">softRound</value> - <value name="convex" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_convex">convex</value> - <value name="coolSlant" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_coolSlant">coolSlant</value> - <value name="divot" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_divot">divot</value> - <value name="riblet" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_riblet">riblet</value> - <value name="hardEdge" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_hardEdge">hardEdge</value> - <value name="artDeco" tokenid="ooxml:Value_drawingml_ST_BevelPresetType_artDeco">artDeco</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_relaxedInset">relaxedInset</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_circle">circle</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_slope">slope</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_cross">cross</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_angle">angle</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_softRound">softRound</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_convex">convex</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_coolSlant">coolSlant</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_divot">divot</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_riblet">riblet</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_hardEdge">hardEdge</value> + <value tokenid="ooxml:Value_drawingml_ST_BevelPresetType_artDeco">artDeco</value> </resource> <resource name="ST_PresetMaterialType" resource="List"> - <value name="legacyMatte" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_legacyMatte">legacyMatte</value> - <value name="legacyPlastic" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_legacyPlastic">legacyPlastic</value> - <value name="legacyMetal" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_legacyMetal">legacyMetal</value> - <value name="legacyWireframe" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_legacyWireframe">legacyWireframe</value> - <value name="matte" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_matte">matte</value> - <value name="plastic" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_plastic">plastic</value> - <value name="metal" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_metal">metal</value> - <value name="warmMatte" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_warmMatte">warmMatte</value> - <value name="translucentPowder" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_translucentPowder">translucentPowder</value> - <value name="powder" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_powder">powder</value> - <value name="dkEdge" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_dkEdge">dkEdge</value> - <value name="softEdge" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_softEdge">softEdge</value> - <value name="clear" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_clear">clear</value> - <value name="flat" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_flat">flat</value> - <value name="softmetal" tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_softmetal">softmetal</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_legacyMatte">legacyMatte</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_legacyPlastic">legacyPlastic</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_legacyMetal">legacyMetal</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_legacyWireframe">legacyWireframe</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_matte">matte</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_plastic">plastic</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_metal">metal</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_warmMatte">warmMatte</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_translucentPowder">translucentPowder</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_powder">powder</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_dkEdge">dkEdge</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_softEdge">softEdge</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_clear">clear</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_flat">flat</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetMaterialType_softmetal">softmetal</value> </resource> </namespace> <namespace name="dml-shape3DCamera" file="dml-shape3DCamera.rng"> @@ -713,68 +713,68 @@ </define> </grammar> <resource name="ST_PresetCameraType" resource="List"> - <value name="legacyObliqueTopLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueTopLeft">legacyObliqueTopLeft</value> - <value name="legacyObliqueTop" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueTop">legacyObliqueTop</value> - <value name="legacyObliqueTopRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueTopRight">legacyObliqueTopRight</value> - <value name="legacyObliqueLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueLeft">legacyObliqueLeft</value> - <value name="legacyObliqueFront" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueFront">legacyObliqueFront</value> - <value name="legacyObliqueRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueRight">legacyObliqueRight</value> - <value name="legacyObliqueBottomLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueBottomLeft">legacyObliqueBottomLeft</value> - <value name="legacyObliqueBottom" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueBottom">legacyObliqueBottom</value> - <value name="legacyObliqueBottomRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueBottomRight">legacyObliqueBottomRight</value> - <value name="legacyPerspectiveTopLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveTopLeft">legacyPerspectiveTopLeft</value> - <value name="legacyPerspectiveTop" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveTop">legacyPerspectiveTop</value> - <value name="legacyPerspectiveTopRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveTopRight">legacyPerspectiveTopRight</value> - <value name="legacyPerspectiveLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveLeft">legacyPerspectiveLeft</value> - <value name="legacyPerspectiveFront" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveFront">legacyPerspectiveFront</value> - <value name="legacyPerspectiveRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveRight">legacyPerspectiveRight</value> - <value name="legacyPerspectiveBottomLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveBottomLeft">legacyPerspectiveBottomLeft</value> - <value name="legacyPerspectiveBottom" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveBottom">legacyPerspectiveBottom</value> - <value name="legacyPerspectiveBottomRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveBottomRight">legacyPerspectiveBottomRight</value> - <value name="orthographicFront" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_orthographicFront">orthographicFront</value> - <value name="isometricTopUp" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricTopUp">isometricTopUp</value> - <value name="isometricTopDown" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricTopDown">isometricTopDown</value> - <value name="isometricBottomUp" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricBottomUp">isometricBottomUp</value> - <value name="isometricBottomDown" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricBottomDown">isometricBottomDown</value> - <value name="isometricLeftUp" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricLeftUp">isometricLeftUp</value> - <value name="isometricLeftDown" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricLeftDown">isometricLeftDown</value> - <value name="isometricRightUp" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricRightUp">isometricRightUp</value> - <value name="isometricRightDown" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricRightDown">isometricRightDown</value> - <value name="isometricOffAxis1Left" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis1Left">isometricOffAxis1Left</value> - <value name="isometricOffAxis1Right" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis1Right">isometricOffAxis1Right</value> - <value name="isometricOffAxis1Top" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis1Top">isometricOffAxis1Top</value> - <value name="isometricOffAxis2Left" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis2Left">isometricOffAxis2Left</value> - <value name="isometricOffAxis2Right" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis2Right">isometricOffAxis2Right</value> - <value name="isometricOffAxis2Top" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis2Top">isometricOffAxis2Top</value> - <value name="isometricOffAxis3Left" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis3Left">isometricOffAxis3Left</value> - <value name="isometricOffAxis3Right" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis3Right">isometricOffAxis3Right</value> - <value name="isometricOffAxis3Bottom" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis3Bottom">isometricOffAxis3Bottom</value> - <value name="isometricOffAxis4Left" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis4Left">isometricOffAxis4Left</value> - <value name="isometricOffAxis4Right" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis4Right">isometricOffAxis4Right</value> - <value name="isometricOffAxis4Bottom" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis4Bottom">isometricOffAxis4Bottom</value> - <value name="obliqueTopLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueTopLeft">obliqueTopLeft</value> - <value name="obliqueTop" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueTop">obliqueTop</value> - <value name="obliqueTopRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueTopRight">obliqueTopRight</value> - <value name="obliqueLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueLeft">obliqueLeft</value> - <value name="obliqueRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueRight">obliqueRight</value> - <value name="obliqueBottomLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueBottomLeft">obliqueBottomLeft</value> - <value name="obliqueBottom" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueBottom">obliqueBottom</value> - <value name="obliqueBottomRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueBottomRight">obliqueBottomRight</value> - <value name="perspectiveFront" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveFront">perspectiveFront</value> - <value name="perspectiveLeft" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveLeft">perspectiveLeft</value> - <value name="perspectiveRight" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveRight">perspectiveRight</value> - <value name="perspectiveAbove" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveAbove">perspectiveAbove</value> - <value name="perspectiveBelow" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveBelow">perspectiveBelow</value> - <value name="perspectiveAboveLeftFacing" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveAboveLeftFacing">perspectiveAboveLeftFacing</value> - <value name="perspectiveAboveRightFacing" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveAboveRightFacing">perspectiveAboveRightFacing</value> - <value name="perspectiveContrastingLeftFacing" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveContrastingLeftFacing">perspectiveContrastingLeftFacing</value> - <value name="perspectiveContrastingRightFacing" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveContrastingRightFacing">perspectiveContrastingRightFacing</value> - <value name="perspectiveHeroicLeftFacing" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveHeroicLeftFacing">perspectiveHeroicLeftFacing</value> - <value name="perspectiveHeroicRightFacing" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveHeroicRightFacing">perspectiveHeroicRightFacing</value> - <value name="perspectiveHeroicExtremeLeftFacing" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveHeroicExtremeLeftFacing">perspectiveHeroicExtremeLeftFacing</value> - <value name="perspectiveHeroicExtremeRightFacing" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveHeroicExtremeRightFacing">perspectiveHeroicExtremeRightFacing</value> - <value name="perspectiveRelaxed" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveRelaxed">perspectiveRelaxed</value> - <value name="perspectiveRelaxedModerately" tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveRelaxedModerately">perspectiveRelaxedModerately</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueTopLeft">legacyObliqueTopLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueTop">legacyObliqueTop</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueTopRight">legacyObliqueTopRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueLeft">legacyObliqueLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueFront">legacyObliqueFront</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueRight">legacyObliqueRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueBottomLeft">legacyObliqueBottomLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueBottom">legacyObliqueBottom</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyObliqueBottomRight">legacyObliqueBottomRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveTopLeft">legacyPerspectiveTopLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveTop">legacyPerspectiveTop</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveTopRight">legacyPerspectiveTopRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveLeft">legacyPerspectiveLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveFront">legacyPerspectiveFront</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveRight">legacyPerspectiveRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveBottomLeft">legacyPerspectiveBottomLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveBottom">legacyPerspectiveBottom</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_legacyPerspectiveBottomRight">legacyPerspectiveBottomRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_orthographicFront">orthographicFront</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricTopUp">isometricTopUp</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricTopDown">isometricTopDown</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricBottomUp">isometricBottomUp</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricBottomDown">isometricBottomDown</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricLeftUp">isometricLeftUp</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricLeftDown">isometricLeftDown</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricRightUp">isometricRightUp</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricRightDown">isometricRightDown</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis1Left">isometricOffAxis1Left</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis1Right">isometricOffAxis1Right</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis1Top">isometricOffAxis1Top</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis2Left">isometricOffAxis2Left</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis2Right">isometricOffAxis2Right</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis2Top">isometricOffAxis2Top</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis3Left">isometricOffAxis3Left</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis3Right">isometricOffAxis3Right</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis3Bottom">isometricOffAxis3Bottom</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis4Left">isometricOffAxis4Left</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis4Right">isometricOffAxis4Right</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_isometricOffAxis4Bottom">isometricOffAxis4Bottom</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueTopLeft">obliqueTopLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueTop">obliqueTop</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueTopRight">obliqueTopRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueLeft">obliqueLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueRight">obliqueRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueBottomLeft">obliqueBottomLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueBottom">obliqueBottom</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_obliqueBottomRight">obliqueBottomRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveFront">perspectiveFront</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveLeft">perspectiveLeft</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveRight">perspectiveRight</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveAbove">perspectiveAbove</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveBelow">perspectiveBelow</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveAboveLeftFacing">perspectiveAboveLeftFacing</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveAboveRightFacing">perspectiveAboveRightFacing</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveContrastingLeftFacing">perspectiveContrastingLeftFacing</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveContrastingRightFacing">perspectiveContrastingRightFacing</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveHeroicLeftFacing">perspectiveHeroicLeftFacing</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveHeroicRightFacing">perspectiveHeroicRightFacing</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveHeroicExtremeLeftFacing">perspectiveHeroicExtremeLeftFacing</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveHeroicExtremeRightFacing">perspectiveHeroicExtremeRightFacing</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveRelaxed">perspectiveRelaxed</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetCameraType_perspectiveRelaxedModerately">perspectiveRelaxedModerately</value> </resource> </namespace> <namespace name="dml-baseStylesheet" file="dml-baseStylesheet.rng"> @@ -971,18 +971,18 @@ </define> </grammar> <resource name="ST_ColorSchemeIndex" resource="List"> - <value name="dk1" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_dk1">dk1</value> - <value name="lt1" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_lt1">lt1</value> - <value name="dk2" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_dk2">dk2</value> - <value name="lt2" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_lt2">lt2</value> - <value name="accent1" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent1">accent1</value> - <value name="accent2" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent2">accent2</value> - <value name="accent3" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent3">accent3</value> - <value name="accent4" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent4">accent4</value> - <value name="accent5" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent5">accent5</value> - <value name="accent6" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent6">accent6</value> - <value name="hlink" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_hlink">hlink</value> - <value name="folHlink" tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_folHlink">folHlink</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_dk1">dk1</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_lt1">lt1</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_dk2">dk2</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_lt2">lt2</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent1">accent1</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent2">accent2</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent3">accent3</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent4">accent4</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent5">accent5</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_accent6">accent6</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_hlink">hlink</value> + <value tokenid="ooxml:Value_drawingml_ST_ColorSchemeIndex_folHlink">folHlink</value> </resource> <resource name="CT_ColorScheme" resource="Properties"> <element name="dk1" tokenid="ooxml:CT_ColorScheme_dk1"/> @@ -1271,34 +1271,34 @@ </resource> <resource name="ST_TextLanguageID" resource="String"/> <resource name="ST_TextUnderlineType" resource="List"> - <value name="none" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_none">none</value> - <value name="words" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_words">words</value> - <value name="sng" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_sng">sng</value> - <value name="dbl" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dbl">dbl</value> - <value name="heavy" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_heavy">heavy</value> - <value name="dotted" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotted">dotted</value> - <value name="dottedHeavy" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dottedHeavy">dottedHeavy</value> - <value name="dash" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dash">dash</value> - <value name="dashHeavy" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashHeavy">dashHeavy</value> - <value name="dashLong" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashLong">dashLong</value> - <value name="dashLongHeavy" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashLongHeavy">dashLongHeavy</value> - <value name="dotDash" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDash">dotDash</value> - <value name="dotDashHeavy" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDashHeavy">dotDashHeavy</value> - <value name="dotDotDash" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDotDash">dotDotDash</value> - <value name="dotDotDashHeavy" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDotDashHeavy">dotDotDashHeavy</value> - <value name="wavy" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavy">wavy</value> - <value name="wavyHeavy" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavyHeavy">wavyHeavy</value> - <value name="wavyDbl" tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavyDbl">wavyDbl</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_none">none</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_words">words</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_sng">sng</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dbl">dbl</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_heavy">heavy</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotted">dotted</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dottedHeavy">dottedHeavy</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dash">dash</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashHeavy">dashHeavy</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashLong">dashLong</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dashLongHeavy">dashLongHeavy</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDash">dotDash</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDashHeavy">dotDashHeavy</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDotDash">dotDotDash</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_dotDotDashHeavy">dotDotDashHeavy</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavy">wavy</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavyHeavy">wavyHeavy</value> + <value tokenid="ooxml:Value_drawingml_ST_TextUnderlineType_wavyDbl">wavyDbl</value> </resource> <resource name="ST_TextStrikeType" resource="List"> - <value name="noStrike" tokenid="ooxml:Value_drawingml_ST_TextStrikeType_noStrike">noStrike</value> - <value name="sngStrike" tokenid="ooxml:Value_drawingml_ST_TextStrikeType_sngStrike">sngStrike</value> - <value name="dblStrike" tokenid="ooxml:Value_drawingml_ST_TextStrikeType_dblStrike">dblStrike</value> + <value tokenid="ooxml:Value_drawingml_ST_TextStrikeType_noStrike">noStrike</value> + <value tokenid="ooxml:Value_drawingml_ST_TextStrikeType_sngStrike">sngStrike</value> + <value tokenid="ooxml:Value_drawingml_ST_TextStrikeType_dblStrike">dblStrike</value> </resource> <resource name="ST_TextCapsType" resource="List"> - <value name="none" tokenid="ooxml:Value_drawingml_ST_TextCapsType_none">none</value> - <value name="small" tokenid="ooxml:Value_drawingml_ST_TextCapsType_small">small</value> - <value name="all" tokenid="ooxml:Value_drawingml_ST_TextCapsType_all">all</value> + <value tokenid="ooxml:Value_drawingml_ST_TextCapsType_none">none</value> + <value tokenid="ooxml:Value_drawingml_ST_TextCapsType_small">small</value> + <value tokenid="ooxml:Value_drawingml_ST_TextCapsType_all">all</value> </resource> </namespace> <namespace name="dml-shapeEffects" file="dml-shapeEffects.rng"> @@ -2139,38 +2139,38 @@ </define> </grammar> <resource name="ST_PresetShadowVal" resource="List"> - <value name="shdw1" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw1">shdw1</value> - <value name="shdw2" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw2">shdw2</value> - <value name="shdw3" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw3">shdw3</value> - <value name="shdw4" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw4">shdw4</value> - <value name="shdw5" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw5">shdw5</value> - <value name="shdw6" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw6">shdw6</value> - <value name="shdw7" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw7">shdw7</value> - <value name="shdw8" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw8">shdw8</value> - <value name="shdw9" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw9">shdw9</value> - <value name="shdw10" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw10">shdw10</value> - <value name="shdw11" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw11">shdw11</value> - <value name="shdw12" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw12">shdw12</value> - <value name="shdw13" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw13">shdw13</value> - <value name="shdw14" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw14">shdw14</value> - <value name="shdw15" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw15">shdw15</value> - <value name="shdw16" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw16">shdw16</value> - <value name="shdw17" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw17">shdw17</value> - <value name="shdw18" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw18">shdw18</value> - <value name="shdw19" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw19">shdw19</value> - <value name="shdw20" tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw20">shdw20</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw1">shdw1</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw2">shdw2</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw3">shdw3</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw4">shdw4</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw5">shdw5</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw6">shdw6</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw7">shdw7</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw8">shdw8</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw9">shdw9</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw10">shdw10</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw11">shdw11</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw12">shdw12</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw13">shdw13</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw14">shdw14</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw15">shdw15</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw16">shdw16</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw17">shdw17</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw18">shdw18</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw19">shdw19</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetShadowVal_shdw20">shdw20</value> </resource> <resource name="CT_SolidColorFillProperties" resource="Properties"/> <resource name="ST_PathShadeType" resource="List"> - <value name="shape" tokenid="ooxml:Value_drawingml_ST_PathShadeType_shape">shape</value> - <value name="circle" tokenid="ooxml:Value_drawingml_ST_PathShadeType_circle">circle</value> - <value name="rect" tokenid="ooxml:Value_drawingml_ST_PathShadeType_rect">rect</value> + <value tokenid="ooxml:Value_drawingml_ST_PathShadeType_shape">shape</value> + <value tokenid="ooxml:Value_drawingml_ST_PathShadeType_circle">circle</value> + <value tokenid="ooxml:Value_drawingml_ST_PathShadeType_rect">rect</value> </resource> <resource name="ST_TileFlipMode" resource="List"> - <value name="none" tokenid="ooxml:Value_drawingml_ST_TileFlipMode_none">none</value> - <value name="x" tokenid="ooxml:Value_drawingml_ST_TileFlipMode_x">x</value> - <value name="y" tokenid="ooxml:Value_drawingml_ST_TileFlipMode_y">y</value> - <value name="xy" tokenid="ooxml:Value_drawingml_ST_TileFlipMode_xy">xy</value> + <value tokenid="ooxml:Value_drawingml_ST_TileFlipMode_none">none</value> + <value tokenid="ooxml:Value_drawingml_ST_TileFlipMode_x">x</value> + <value tokenid="ooxml:Value_drawingml_ST_TileFlipMode_y">y</value> + <value tokenid="ooxml:Value_drawingml_ST_TileFlipMode_xy">xy</value> </resource> <resource name="CT_GradientStop" resource="Properties"> <attribute name="pos" tokenid="ooxml:CT_GradientStop_pos"/> @@ -2191,11 +2191,11 @@ <element name="stretch" tokenid="ooxml:EG_FillModeProperties_stretch"/> </resource> <resource name="ST_BlipCompression" resource="List"> - <value name="email" tokenid="ooxml:Value_drawingml_ST_BlipCompression_email">email</value> - <value name="screen" tokenid="ooxml:Value_drawingml_ST_BlipCompression_screen">screen</value> - <value name="print" tokenid="ooxml:Value_drawingml_ST_BlipCompression_print">print</value> - <value name="hqprint" tokenid="ooxml:Value_drawingml_ST_BlipCompression_hqprint">hqprint</value> - <value name="none" tokenid="ooxml:Value_drawingml_ST_BlipCompression_none">none</value> + <value tokenid="ooxml:Value_drawingml_ST_BlipCompression_email">email</value> + <value tokenid="ooxml:Value_drawingml_ST_BlipCompression_screen">screen</value> + <value tokenid="ooxml:Value_drawingml_ST_BlipCompression_print">print</value> + <value tokenid="ooxml:Value_drawingml_ST_BlipCompression_hqprint">hqprint</value> + <value tokenid="ooxml:Value_drawingml_ST_BlipCompression_none">none</value> </resource> <resource name="CT_Blip" resource="Properties"> <element name="alphaBiLevel" tokenid="ooxml:CT_Blip_alphaBiLevel"/> @@ -2225,67 +2225,67 @@ <attribute name="rotWithShape" tokenid="ooxml:CT_BlipFillProperties_rotWithShape"/> </resource> <resource name="ST_PresetPatternVal" resource="List"> - <value name="pct5" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct5">pct5</value> - <value name="pct10" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct10">pct10</value> - <value name="pct20" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct20">pct20</value> - <value name="pct25" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct25">pct25</value> - <value name="pct30" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct30">pct30</value> - <value name="pct40" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct40">pct40</value> - <value name="pct50" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct50">pct50</value> - <value name="pct60" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct60">pct60</value> - <value name="pct70" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct70">pct70</value> - <value name="pct75" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct75">pct75</value> - <value name="pct80" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct80">pct80</value> - <value name="pct90" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct90">pct90</value> - <value name="horz" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_horz">horz</value> - <value name="vert" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_vert">vert</value> - <value name="ltHorz" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_ltHorz">ltHorz</value> - <value name="ltVert" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_ltVert">ltVert</value> - <value name="dkHorz" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dkHorz">dkHorz</value> - <value name="dkVert" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dkVert">dkVert</value> - <value name="narHorz" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_narHorz">narHorz</value> - <value name="narVert" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_narVert">narVert</value> - <value name="dashHorz" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dashHorz">dashHorz</value> - <value name="dashVert" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dashVert">dashVert</value> - <value name="cross" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_cross">cross</value> - <value name="dnDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dnDiag">dnDiag</value> - <value name="upDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_upDiag">upDiag</value> - <value name="ltDnDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_ltDnDiag">ltDnDiag</value> - <value name="ltUpDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_ltUpDiag">ltUpDiag</value> - <value name="dkDnDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dkDnDiag">dkDnDiag</value> - <value name="dkUpDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dkUpDiag">dkUpDiag</value> - <value name="wdDnDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_wdDnDiag">wdDnDiag</value> - <value name="wdUpDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_wdUpDiag">wdUpDiag</value> - <value name="dashDnDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dashDnDiag">dashDnDiag</value> - <value name="dashUpDiag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dashUpDiag">dashUpDiag</value> - <value name="diagCross" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_diagCross">diagCross</value> - <value name="smCheck" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_smCheck">smCheck</value> - <value name="lgCheck" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_lgCheck">lgCheck</value> - <value name="smGrid" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_smGrid">smGrid</value> - <value name="lgGrid" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_lgGrid">lgGrid</value> - <value name="dotGrid" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dotGrid">dotGrid</value> - <value name="smConfetti" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_smConfetti">smConfetti</value> - <value name="lgConfetti" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_lgConfetti">lgConfetti</value> - <value name="horzBrick" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_horzBrick">horzBrick</value> - <value name="diagBrick" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_diagBrick">diagBrick</value> - <value name="solidDmnd" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_solidDmnd">solidDmnd</value> - <value name="openDmnd" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_openDmnd">openDmnd</value> - <value name="dotDmnd" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dotDmnd">dotDmnd</value> - <value name="plaid" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_plaid">plaid</value> - <value name="sphere" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_sphere">sphere</value> - <value name="weave" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_weave">weave</value> - <value name="divot" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_divot">divot</value> - <value name="shingle" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_shingle">shingle</value> - <value name="wave" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_wave">wave</value> - <value name="trellis" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_trellis">trellis</value> - <value name="zigZag" tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_zigZag">zigZag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct5">pct5</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct10">pct10</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct20">pct20</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct25">pct25</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct30">pct30</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct40">pct40</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct50">pct50</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct60">pct60</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct70">pct70</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct75">pct75</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct80">pct80</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_pct90">pct90</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_horz">horz</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_vert">vert</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_ltHorz">ltHorz</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_ltVert">ltVert</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dkHorz">dkHorz</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dkVert">dkVert</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_narHorz">narHorz</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_narVert">narVert</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dashHorz">dashHorz</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dashVert">dashVert</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_cross">cross</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dnDiag">dnDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_upDiag">upDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_ltDnDiag">ltDnDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_ltUpDiag">ltUpDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dkDnDiag">dkDnDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dkUpDiag">dkUpDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_wdDnDiag">wdDnDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_wdUpDiag">wdUpDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dashDnDiag">dashDnDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dashUpDiag">dashUpDiag</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_diagCross">diagCross</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_smCheck">smCheck</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_lgCheck">lgCheck</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_smGrid">smGrid</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_lgGrid">lgGrid</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dotGrid">dotGrid</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_smConfetti">smConfetti</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_lgConfetti">lgConfetti</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_horzBrick">horzBrick</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_diagBrick">diagBrick</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_solidDmnd">solidDmnd</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_openDmnd">openDmnd</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_dotDmnd">dotDmnd</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_plaid">plaid</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_sphere">sphere</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_weave">weave</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_divot">divot</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_shingle">shingle</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_wave">wave</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_trellis">trellis</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetPatternVal_zigZag">zigZag</value> </resource> <resource name="ST_BlendMode" resource="List"> - <value name="over" tokenid="ooxml:Value_drawingml_ST_BlendMode_over">over</value> - <value name="mult" tokenid="ooxml:Value_drawingml_ST_BlendMode_mult">mult</value> - <value name="screen" tokenid="ooxml:Value_drawingml_ST_BlendMode_screen">screen</value> - <value name="darken" tokenid="ooxml:Value_drawingml_ST_BlendMode_darken">darken</value> - <value name="lighten" tokenid="ooxml:Value_drawingml_ST_BlendMode_lighten">lighten</value> + <value tokenid="ooxml:Value_drawingml_ST_BlendMode_over">over</value> + <value tokenid="ooxml:Value_drawingml_ST_BlendMode_mult">mult</value> + <value tokenid="ooxml:Value_drawingml_ST_BlendMode_screen">screen</value> + <value tokenid="ooxml:Value_drawingml_ST_BlendMode_darken">darken</value> + <value tokenid="ooxml:Value_drawingml_ST_BlendMode_lighten">lighten</value> </resource> <resource name="EG_Effect" resource="Properties"> <element name="cont" tokenid="ooxml:EG_Effect_cont"/> @@ -2320,8 +2320,8 @@ <element name="xfrm" tokenid="ooxml:EG_Effect_xfrm"/> </resource> <resource name="ST_EffectContainerType" resource="List"> - <value name="sib" tokenid="ooxml:Value_drawingml_ST_EffectContainerType_sib">sib</value> - <value name="tree" tokenid="ooxml:Value_drawingml_ST_EffectContainerType_tree">tree</value> + <value tokenid="ooxml:Value_drawingml_ST_EffectContainerType_sib">sib</value> + <value tokenid="ooxml:Value_drawingml_ST_EffectContainerType_tree">tree</value> </resource> <resource name="CT_EffectContainer" resource="Properties"> <attribute name="type" tokenid="ooxml:CT_EffectContainer_type"/> @@ -2538,22 +2538,22 @@ </define> </grammar> <resource name="ST_LineEndType" resource="List"> - <value name="none" tokenid="ooxml:Value_drawingml_ST_LineEndType_none">none</value> - <value name="triangle" tokenid="ooxml:Value_drawingml_ST_LineEndType_triangle">triangle</value> - <value name="stealth" tokenid="ooxml:Value_drawingml_ST_LineEndType_stealth">stealth</value> - <value name="diamond" tokenid="ooxml:Value_drawingml_ST_LineEndType_diamond">diamond</value> - <value name="oval" tokenid="ooxml:Value_drawingml_ST_LineEndType_oval">oval</value> - <value name="arrow" tokenid="ooxml:Value_drawingml_ST_LineEndType_arrow">arrow</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndType_none">none</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndType_triangle">triangle</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndType_stealth">stealth</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndType_diamond">diamond</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndType_oval">oval</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndType_arrow">arrow</value> </resource> <resource name="ST_LineEndWidth" resource="List"> - <value name="sm" tokenid="ooxml:Value_drawingml_ST_LineEndWidth_sm">sm</value> - <value name="med" tokenid="ooxml:Value_drawingml_ST_LineEndWidth_med">med</value> - <value name="lg" tokenid="ooxml:Value_drawingml_ST_LineEndWidth_lg">lg</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndWidth_sm">sm</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndWidth_med">med</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndWidth_lg">lg</value> </resource> <resource name="ST_LineEndLength" resource="List"> - <value name="sm" tokenid="ooxml:Value_drawingml_ST_LineEndLength_sm">sm</value> - <value name="med" tokenid="ooxml:Value_drawingml_ST_LineEndLength_med">med</value> - <value name="lg" tokenid="ooxml:Value_drawingml_ST_LineEndLength_lg">lg</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndLength_sm">sm</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndLength_med">med</value> + <value tokenid="ooxml:Value_drawingml_ST_LineEndLength_lg">lg</value> </resource> <resource name="CT_LineEndProperties" resource="Properties"> <attribute name="type" tokenid="ooxml:CT_LineEndProperties_type"/> @@ -2567,33 +2567,33 @@ <element name="pattFill" tokenid="ooxml:EG_LineFillProperties_pattFill"/> </resource> <resource name="ST_PresetLineDashVal" resource="List"> - <value name="solid" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_solid">solid</value> - <value name="dot" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_dot">dot</value> - <value name="dash" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_dash">dash</value> - <value name="lgDash" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_lgDash">lgDash</value> - <value name="dashDot" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_dashDot">dashDot</value> - <value name="lgDashDot" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_lgDashDot">lgDashDot</value> - <value name="lgDashDotDot" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_lgDashDotDot">lgDashDotDot</value> - <value name="sysDash" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_sysDash">sysDash</value> - <value name="sysDot" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_sysDot">sysDot</value> - <value name="sysDashDot" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_sysDashDot">sysDashDot</value> - <value name="sysDashDotDot" tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_sysDashDotDot">sysDashDotDot</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_solid">solid</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_dot">dot</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_dash">dash</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_lgDash">lgDash</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_dashDot">dashDot</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_lgDashDot">lgDashDot</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_lgDashDotDot">lgDashDotDot</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_sysDash">sysDash</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_sysDot">sysDot</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_sysDashDot">sysDashDot</value> + <value tokenid="ooxml:Value_drawingml_ST_PresetLineDashVal_sysDashDotDot">sysDashDotDot</value> </resource> <resource name="ST_LineCap" resource="List"> - <value name="rnd" tokenid="ooxml:Value_drawingml_ST_LineCap_rnd">rnd</value> - <value name="sq" tokenid="ooxml:Value_drawingml_ST_LineCap_sq">sq</value> - <value name="flat" tokenid="ooxml:Value_drawingml_ST_LineCap_flat">flat</value> + <value tokenid="ooxml:Value_drawingml_ST_LineCap_rnd">rnd</value> + <value tokenid="ooxml:Value_drawingml_ST_LineCap_sq">sq</value> + <value tokenid="ooxml:Value_drawingml_ST_LineCap_flat">flat</value> </resource> <resource name="ST_PenAlignment" resource="List"> - <value name="ctr" tokenid="ooxml:Value_drawingml_ST_PenAlignment_ctr">ctr</value> - <value name="in" tokenid="ooxml:Value_drawingml_ST_PenAlignment_in">in</value> + <value tokenid="ooxml:Value_drawingml_ST_PenAlignment_ctr">ctr</value> + <value tokenid="ooxml:Value_drawingml_ST_PenAlignment_in">in</value> </resource> <resource name="ST_CompoundLine" resource="List"> - <value name="sng" tokenid="ooxml:Value_drawingml_ST_CompoundLine_sng">sng</value> - <value name="dbl" tokenid="ooxml:Value_drawingml_ST_CompoundLine_dbl">dbl</value> - <value name="thickThin" tokenid="ooxml:Value_drawingml_ST_CompoundLine_thickThin">thickThin</value> - <value name="thinThick" tokenid="ooxml:Value_drawingml_ST_CompoundLine_thinThick">thinThick</value> - <value name="tri" tokenid="ooxml:Value_drawingml_ST_CompoundLine_tri">tri</value> + <value tokenid="ooxml:Value_drawingml_ST_CompoundLine_sng">sng</value> + <value tokenid="ooxml:Value_drawingml_ST_CompoundLine_dbl">dbl</value> + <value tokenid="ooxml:Value_drawingml_ST_CompoundLine_thickThin">thickThin</value> + <value tokenid="ooxml:Value_drawingml_ST_CompoundLine_thinThick">thinThick</value> + <value tokenid="ooxml:Value_drawingml_ST_CompoundLine_tri">tri</value> </resource> <resource name="CT_LineProperties" resource="Properties"> <element name="headEnd" tokenid="ooxml:CT_LineProperties_headEnd"/> @@ -3589,59 +3589,59 @@ <attribute name="lum" tokenid="ooxml:CT_HslColor_lum"/> </resource> <resource name="ST_SystemColorVal" resource="List"> - <value name="scrollBar" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_scrollBar">scrollBar</value> - <value name="background" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_background">background</value> - <value name="activeCaption" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_activeCaption">activeCaption</value> - <value name="inactiveCaption" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_inactiveCaption">inactiveCaption</value> - <value name="menu" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_menu">menu</value> - <value name="window" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_window">window</value> - <value name="windowFrame" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_windowFrame">windowFrame</value> - <value name="menuText" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_menuText">menuText</value> - <value name="windowText" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_windowText">windowText</value> - <value name="captionText" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_captionText">captionText</value> - <value name="activeBorder" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_activeBorder">activeBorder</value> - <value name="inactiveBorder" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_inactiveBorder">inactiveBorder</value> - <value name="appWorkspace" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_appWorkspace">appWorkspace</value> - <value name="highlight" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_highlight">highlight</value> - <value name="highlightText" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_highlightText">highlightText</value> - <value name="btnFace" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_btnFace">btnFace</value> - <value name="btnShadow" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_btnShadow">btnShadow</value> - <value name="grayText" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_grayText">grayText</value> - <value name="btnText" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_btnText">btnText</value> - <value name="inactiveCaptionText" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_inactiveCaptionText">inactiveCaptionText</value> - <value name="btnHighlight" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_btnHighlight">btnHighlight</value> - <value name="3dDkShadow" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_3dDkShadow">3dDkShadow</value> - <value name="3dLight" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_3dLight">3dLight</value> - <value name="infoText" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_infoText">infoText</value> - <value name="infoBk" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_infoBk">infoBk</value> - <value name="hotLight" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_hotLight">hotLight</value> - <value name="gradientActiveCaption" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_gradientActiveCaption">gradientActiveCaption</value> - <value name="gradientInactiveCaption" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_gradientInactiveCaption">gradientInactiveCaption</value> - <value name="menuHighlight" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_menuHighlight">menuHighlight</value> - <value name="menuBar" tokenid="ooxml:Value_drawingml_ST_SystemColorVal_menuBar">menuBar</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_scrollBar">scrollBar</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_background">background</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_activeCaption">activeCaption</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_inactiveCaption">inactiveCaption</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_menu">menu</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_window">window</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_windowFrame">windowFrame</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_menuText">menuText</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_windowText">windowText</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_captionText">captionText</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_activeBorder">activeBorder</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_inactiveBorder">inactiveBorder</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_appWorkspace">appWorkspace</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_highlight">highlight</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_highlightText">highlightText</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_btnFace">btnFace</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_btnShadow">btnShadow</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_grayText">grayText</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_btnText">btnText</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_inactiveCaptionText">inactiveCaptionText</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_btnHighlight">btnHighlight</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_3dDkShadow">3dDkShadow</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_3dLight">3dLight</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_infoText">infoText</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_infoBk">infoBk</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_hotLight">hotLight</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_gradientActiveCaption">gradientActiveCaption</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_gradientInactiveCaption">gradientInactiveCaption</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_menuHighlight">menuHighlight</value> + <value tokenid="ooxml:Value_drawingml_ST_SystemColorVal_menuBar">menuBar</value> </resource> <resource name="CT_SystemColor" resource="Properties"> <attribute name="val" tokenid="ooxml:CT_SystemColor_val"/> <attribute name="lastClr" tokenid="ooxml:CT_SytemColor_lastClr"/> </resource> <resource name="ST_SchemeColorVal" resource="List"> - <value name="bg1" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_bg1">bg1</value> - <value name="tx1" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_tx1">tx1</value> - <value name="bg2" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_bg2">bg2</value> - <value name="tx2" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_tx2">tx2</value> - <value name="accent1" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent1">accent1</value> - <value name="accent2" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent2">accent2</value> - <value name="accent3" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent3">accent3</value> - <value name="accent4" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent4">accent4</value> - <value name="accent5" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent5">accent5</value> - <value name="accent6" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent6">accent6</value> - <value name="hlink" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_hlink">hlink</value> - <value name="folHlink" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_folHlink">folHlink</value> - <value name="phClr" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_phClr">phClr</value> - <value name="dk1" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_dk1">dk1</value> - <value name="lt1" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_lt1">lt1</value> - <value name="dk2" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_dk2">dk2</value> - <value name="lt2" tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_lt2">lt2</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_bg1">bg1</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_tx1">tx1</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_bg2">bg2</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_tx2">tx2</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent1">accent1</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent2">accent2</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent3">accent3</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent4">accent4</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent5">accent5</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_accent6">accent6</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_hlink">hlink</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_folHlink">folHlink</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_phClr">phClr</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_dk1">dk1</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_lt1">lt1</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_dk2">dk2</value> + <value tokenid="ooxml:Value_drawingml_ST_SchemeColorVal_lt2">lt2</value> </resource> <resource name="CT_SchemeColor" resource="Properties"> <attribute name="val" tokenid="ooxml:CT_SchemeColor_val"/> @@ -3799,15 +3799,15 @@ <attribute name="flipV" tokenid="ooxml:CT_Transform2D_flipV"/> </resource> <resource name="ST_RectAlignment" resource="List"> - <value name="tl" tokenid="ooxml:Value_drawingml_ST_RectAlignment_tl">tl</value> - <value name="t" tokenid="ooxml:Value_drawingml_ST_RectAlignment_t">t</value> - <value name="tr" tokenid="ooxml:Value_drawingml_ST_RectAlignment_tr">tr</value> - <value name="l" tokenid="ooxml:Value_drawingml_ST_RectAlignment_l">l</value> - <value name="ctr" tokenid="ooxml:Value_drawingml_ST_RectAlignment_ctr">ctr</value> - <value name="r" tokenid="ooxml:Value_drawingml_ST_RectAlignment_r">r</value> - <value name="bl" tokenid="ooxml:Value_drawingml_ST_RectAlignment_bl">bl</value> - <value name="b" tokenid="ooxml:Value_drawingml_ST_RectAlignment_b">b</value> - <value name="br" tokenid="ooxml:Value_drawingml_ST_RectAlignment_br">br</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_tl">tl</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_t">t</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_tr">tr</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_l">l</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_ctr">ctr</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_r">r</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_bl">bl</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_b">b</value> + <value tokenid="ooxml:Value_drawingml_ST_RectAlignment_br">br</value> </resource> <resource name="EG_ColorChoice" resource="Properties"> <element name="scrgbClr" tokenid="ooxml:EG_ColorChoice_scrgbClr"/> @@ -3820,17 +3820,17 @@ <resource name="CT_Color" resource="Properties"/> <resource name="CT_ColorMRU" resource="Properties"/> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits