mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oox, writerfilter: add a14 namespace and tokens

Browse Source 
Added the artistic effects defined in the MS-ODRAWXML extension. Ref:
http://msdn.microsoft.com/en-us/library/dd905216(v=office.12).aspx

Change-Id: I24c5e5bbe569f160d300a7a7293ca047cb7a1b88.
This commit is contained in:
Jacobo Aragunde Pérez
2014-05-20 20:11:13 +02:00
parent 131d553864
commit 21d4cfe19e
5 changed files with 458 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
oox/source/token/namespaces-strict.txt
View File

@@ -75,6 +75,7 @@ wps http://schemas.microsoft.com/office/word/2010/wordproces
wpg http://schemas.microsoft.com/office/word/2010/wordprocessingGroup
wp14 http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing
w14 http://schemas.microsoft.com/office/word/2010/wordml
a14 http://schemas.microsoft.com/office/drawingml/2010/main
# extlst namespaces

1
oox/source/token/namespaces.txt
View File

@@ -75,6 +75,7 @@ wps http://schemas.microsoft.com/office/word/2010/wordproces
wpg http://schemas.microsoft.com/office/word/2010/wordprocessingGroup
wp14 http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing
w14 http://schemas.microsoft.com/office/word/2010/wordml
a14 http://schemas.microsoft.com/office/drawingml/2010/main
# extlst namespaces

43
oox/source/token/tokens.txt
View File

@@ -414,6 +414,7 @@ YZ
Year
YearAccessed
ZX
a14
a
aa
above
@@ -560,6 +561,7 @@ always
alwaysMergeEmptyNamespace
alwaysShow
alwaysShowPlaceholderText
amount
amt
anchor
anchorCtr
@@ -640,6 +642,33 @@ array
arrow
arrowok
artDeco
artisticBlur
artisticCement
artisticChalkSketch
artisticCrisscrossEtching
artisticCutout
artisticFilmGrain
artisticGlass
artisticGlowDiffused
artisticGlowEdges
artisticLightScreen
artisticLineDrawing
artisticMarker
artisticMosiaicBubbles
artisticPaintStrokes
artisticPaintBrush
artisticPastelsSmooth
artisticPencilGrayscale
artisticPencilSketch
artisticPhotocopy
artisticPlasticWrap
artisticTexturizer
artisticWatercolorSponge
artisticBackgroundRemoval
artisticBrightnessContrast
artisticColorTemperature
artisticSaturation
artisticSharpenSoften
asDisplayed
ascending
ascendingAlpha
@@ -947,6 +976,7 @@ brkBinSub
brown
browse
browser
brushSize
bstr
btLr
btnFace
@@ -1257,6 +1287,7 @@ color2
colorFilter
colorId
colorScale
colorTemp
colormenu
colormode
colormru
@@ -1390,6 +1421,7 @@ cover
coverPg
cp
cr
crackSpacing
crashSave
crazyMaze
created
@@ -1729,6 +1761,7 @@ destId
destOrd
destination
destinationFile
detail
detectmouseclick
dgm
dgmbasetextscale
@@ -2430,6 +2463,7 @@ gradientInactiveCaption
gradientRadial
gradientUnscaled
gradientshapeok
grainSize
gramEnd
gramStart
grammar
@@ -2471,6 +2505,7 @@ gridDropZones
gridLegend
gridLines
gridLinesSet
gridSize
gridSpacing
gridSpan
group
@@ -2732,7 +2767,10 @@ imagedata
imagesize
imeMode
img
imgEffect
imgH
imgLayer
imgProps
imgSz
imgW
immersive
@@ -2795,6 +2833,7 @@ intLim
intVal
integer
integrated
intensity
interSp
interactiveSeq
intercept
@@ -3568,6 +3607,7 @@ numStyleLink
numTab
number
numberInDash
numberOfShades
numberStoredAsText
numbering
numberingChange
@@ -3839,6 +3879,7 @@ pctPosVOffset
pctWidth
peachPuff
penClr
pencilSize
pencils
pentagon
people
@@ -4002,6 +4043,7 @@ preserveSortFilterLayout
presetClass
presetID
presetSubtype
pressure
prev
prevAc
prevCondLst
@@ -4710,6 +4752,7 @@ smartTags
smileyFace
smooth
smoothMarker
smoothness
smtClean
smtId
snake

1
writerfilter/CustomTarget_source.mk
View File

@@ -41,6 +41,7 @@ writerfilter_OOXMLNAMESPACES= \
mce \
wp14 \
w14 \
a14 \
wml
writerfilter_ALL = \

412
writerfilter/source/ooxml/model.xml
View File

@@ -46,6 +46,7 @@
<namespace-alias name="http://schemas.openxmlformats.org/markup-compatibility/2006" alias="mce" id="mce"/>
<namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" alias="wp14" id="wp14"/>
<namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordml" alias="w14" id="w14"/>
<namespace-alias name="http://schemas.microsoft.com/office/drawing/2010/main" alias="a14" id="a14"/>
<namespace-alias name="http://sprm" alias="sprm" id="sprm"/>
<token tokenid="ooxml:shape"/>
<token tokenid="ooxml:token"/>
@@ -6793,6 +6794,417 @@
<element name="cntxtAlts" tokenid="ooxml:cntxtAlts_cntxtAlts"/>
</resource>
</namespace>
<namespace name="a14" file="a14.rng">
<grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/drawingml/2010/main" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<!-- Simple types -->
<define name="ST_ArtisticEffectParam10">
<data type="integer">
<xs:documentation>Integer value (0 to 10)</xs:documentation>
<param name="minInclusive">0</param>
<param name="maxInclusive">10</param>
</data>
</define>
<define name="ST_ArtisticEffectParam100">
<data type="integer">
<xs:documentation>Integer value (0 to 100)</xs:documentation>
<param name="minInclusive">0</param>
<param name="maxInclusive">100</param>
</data>
</define>
<define name="ST_ArtisticEffectParam4">
<data type="integer">
<xs:documentation>Integer value (0 to 4)</xs:documentation>
<param name="minInclusive">0</param>
<param name="maxInclusive">4</param>
</data>
</define>
<define name="ST_ArtisticEffectParam6">
<data type="integer">
<xs:documentation>Integer value (0 to 6)</xs:documentation>
<param name="minInclusive">0</param>
<param name="maxInclusive">6</param>
</data>
</define>
<define name="ST_ColorTemperature">
<data type="integer">
<xs:documentation>Integer value (1500 to 11500)</xs:documentation>
<param name="minInclusive">1500</param>
<param name="maxInclusive">11500</param>
</data>
</define>
<define name="ST_LegacySpreadsheetColorIndex">
<data type="integer">
<xs:documentation>Integer value (0 to 80)</xs:documentation>
<param name="minInclusive">0</param>
<param name="maxInclusive">80</param>
</data>
</define>
<define name="ST_SaturationAmount">
<data type="integer">
<xs:documentation>Integer value (0 to 400000)</xs:documentation>
<param name="minInclusive">0</param>
<param name="maxInclusive">400000</param>
</data>
</define>
<!-- Complex types for effects -->
<define name="CT_PictureEffectBlur">
<optional>
<attribute name="visible">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectCement">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="crackSpacing">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectChalkSketch">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam4"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectCrisscrossEtching">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam4"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectCutout">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="numberOfShades">
<ref name="ST_ArtisticEffectParam6"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectFilmGrain">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="grainSize">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectGlass">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectGlowDiffused">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="intensity">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectGlowEdges">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="smoothness">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectLightScreen">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="gridSize">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectLineDrawing">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pencilSize">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectMarker">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="size">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectMosiaicBubbles">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectPaintStrokes">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="intensity">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectPaintBrush">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="brushSize">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectPastelsSmooth">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectPencilGrayscale">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pencilSize">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectPencilSketch">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectPhotocopy">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="detail">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectPlasticWrap">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="smoothness">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectTexturizer">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectWatercolorSponge">
<optional>
<attribute name="trans">
<ref name="a:ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="brushSize">
<ref name="ST_ArtisticEffectParam10"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectBrightnessContrast">
<optional>
<attribute name="bright">
<ref name="a:ST_FixedPercentage"/>
</attribute>
<attribute name="contrast">
<ref name="a:ST_FixedPercentage"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectColorTemperature">
<optional>
<attribute name="colorTemp">
<ref name="ST_ColorTemperature"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectSaturation">
<optional>
<attribute name="sat">
<ref name="ST_SaturationAmount"/>
</attribute>
</optional>
</define>
<define name="CT_PictureEffectSharpenSoften">
<optional>
<attribute name="amount">
<ref name="ST_FixedPercentage"/>
</attribute>
</optional>
</define>
<!-- Complex types for containers -->
<define name="CT_PictureEffect">
<choice>
<element name="artisticBlur">
<ref name="CT_PictureEffectBlur"/>
</element>
<element name="artisticCement">
<ref name="CT_PictureEffectCement"/>
</element>
<element name="artisticChalkSketch">
<ref name="CT_PictureEffectChalkSketch"/>
</element>
<element name="artisticCrisscrossEtching">
<ref name="CT_PictureEffectCrisscrossEtching"/>
</element>
<element name="artisticCutout">
<ref name="CT_PictureEffectCutout"/>
</element>
<element name="artisticFilmGrain">
<ref name="CT_PictureEffectFilmGrain"/>
</element>
<element name="artisticGlass">
<ref name="CT_PictureEffectGlass"/>
</element>
<element name="artisticGlowDiffused">
<ref name="CT_PictureEffectGlowDiffused"/>
</element>
<element name="artisticGlowEdges">
<ref name="CT_PictureEffectGlowEdges"/>
</element>
<element name="artisticLightScreen">
<ref name="CT_PictureEffectLightScreen"/>
</element>
<element name="artisticLineDrawing">
<ref name="CT_PictureEffectLineDrawing"/>
</element>
<element name="artisticMarker">
<ref name="CT_PictureEffectMarker"/>
</element>
<element name="artisticMosiaicBubbles">
<ref name="CT_PictureEffectMosiaicBubbles"/>
</element>
<element name="artisticPaintStrokes">
<ref name="CT_PictureEffectPaintStrokes"/>
</element>
<element name="artisticPaintBrush">
<ref name="CT_PictureEffectPaintBrush"/>
</element>
<element name="artisticPastelsSmooth">
<ref name="CT_PictureEffectPastelsSmooth"/>
</element>
<element name="artisticPencilGrayscale">
<ref name="CT_PictureEffectPencilGrayscale"/>
</element>
<element name="artisticPencilSketch">
<ref name="CT_PictureEffectPencilSketch"/>
</element>
<element name="artisticPhotocopy">
<ref name="CT_PictureEffectPhotocopy"/>
</element>
<element name="artisticPlasticWrap">
<ref name="CT_PictureEffectPlasticWrap"/>
</element>
<element name="artisticTexturizer">
<ref name="CT_PictureEffectTexturizer"/>
</element>
<element name="artisticWatercolorSponge">
<ref name="CT_PictureEffectWatercolorSponge"/>
</element>
<element name="artisticBrightnessContrast">
<ref name="CT_PictureEffectBrightnessContrast"/>
</element>
<element name="artisticColorTemperature">
<ref name="CT_PictureEffectColorTemperature"/>
</element>
<element name="artisticSaturation">
<ref name="CT_PictureEffectSaturation"/>
</element>
<element name="artisticSharpenSoften">
<ref name="CT_PictureEffectSharpenSoften"/>
</element>
</choice>
<optional>
<attribute name="visible">
<data type="boolean"/>
</attribute>
</optional>
</define>
<define name="CT_PictureLayer">
<zeroOrMore>
<element name="imgEffect">
<ref name="CT_PictureEffect"/>
</element>
</zeroOrMore>
<attribute name="r:embed">
<text/>
<xs:documentation>Embedded Image Relationship Target</xs:documentation>
</attribute>
</define>
<define name="CT_Photo">
<zeroOrMore>
<element name="imgLayer">
<ref name="CT_PictureLayer"/>
</element>
</zeroOrMore>
</define>
</grammar>
</namespace>
<namespace name="dml-shapeGeometry" file="dml-shapeGeometry.rng" todo="ignore">
<grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2006/xpath-functions" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<!-- ISO RELAX NG Schema -->