Visitar URL original
oxml: convert CT_RPr to xmlchemy · pythoningLearning/python-docx@6f1a000 · GitHub
Skip to content

Commit 6f1a000

Browse files
author
Steve Canny
committed
oxml: convert CT_RPr to xmlchemy
1 parent 34a475b commit 6f1a000

4 files changed

Lines changed: 69 additions & 512 deletions

File tree

‎docs/dev/analysis/features/bool-run-props.rst‎

Lines changed: 42 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -138,63 +138,53 @@ below when it writes the file.::
138138
<xsd:attribute name="rsidR" type="ST_LongHexNumber"/>
139139
</xsd:complexType>
140140

141-
<xsd:complexType name="CT_RPr">
141+
<xsd:complexType name="CT_RPr"> <!-- denormalized -->
142142
<xsd:sequence>
143-
<xsd:group ref="EG_RPrContent" minOccurs="0"/>
144-
</xsd:sequence>
145-
</xsd:complexType>
146-
147-
<xsd:group name="EG_RPrContent">
148-
<xsd:sequence>
149-
<xsd:group ref="EG_RPrBase" minOccurs="0" maxOccurs="unbounded"/>
143+
<xsd:choice minOccurs="0" maxOccurs="unbounded"/>
144+
<xsd:element name="rStyle" type="CT_String"/>
145+
<xsd:element name="rFonts" type="CT_Fonts"/>
146+
<xsd:element name="b" type="CT_OnOff"/>
147+
<xsd:element name="bCs" type="CT_OnOff"/>
148+
<xsd:element name="i" type="CT_OnOff"/>
149+
<xsd:element name="iCs" type="CT_OnOff"/>
150+
<xsd:element name="caps" type="CT_OnOff"/>
151+
<xsd:element name="smallCaps" type="CT_OnOff"/>
152+
<xsd:element name="strike" type="CT_OnOff"/>
153+
<xsd:element name="dstrike" type="CT_OnOff"/>
154+
<xsd:element name="outline" type="CT_OnOff"/>
155+
<xsd:element name="shadow" type="CT_OnOff"/>
156+
<xsd:element name="emboss" type="CT_OnOff"/>
157+
<xsd:element name="imprint" type="CT_OnOff"/>
158+
<xsd:element name="noProof" type="CT_OnOff"/>
159+
<xsd:element name="snapToGrid" type="CT_OnOff"/>
160+
<xsd:element name="vanish" type="CT_OnOff"/>
161+
<xsd:element name="webHidden" type="CT_OnOff"/>
162+
<xsd:element name="color" type="CT_Color"/>
163+
<xsd:element name="spacing" type="CT_SignedTwipsMeasure"/>
164+
<xsd:element name="w" type="CT_TextScale"/>
165+
<xsd:element name="kern" type="CT_HpsMeasure"/>
166+
<xsd:element name="position" type="CT_SignedHpsMeasure"/>
167+
<xsd:element name="sz" type="CT_HpsMeasure"/>
168+
<xsd:element name="szCs" type="CT_HpsMeasure"/>
169+
<xsd:element name="highlight" type="CT_Highlight"/>
170+
<xsd:element name="u" type="CT_Underline"/>
171+
<xsd:element name="effect" type="CT_TextEffect"/>
172+
<xsd:element name="bdr" type="CT_Border"/>
173+
<xsd:element name="shd" type="CT_Shd"/>
174+
<xsd:element name="fitText" type="CT_FitText"/>
175+
<xsd:element name="vertAlign" type="CT_VerticalAlignRun"/>
176+
<xsd:element name="rtl" type="CT_OnOff"/>
177+
<xsd:element name="cs" type="CT_OnOff"/>
178+
<xsd:element name="em" type="CT_Em"/>
179+
<xsd:element name="lang" type="CT_Language"/>
180+
<xsd:element name="eastAsianLayout" type="CT_EastAsianLayout"/>
181+
<xsd:element name="specVanish" type="CT_OnOff"/>
182+
<xsd:element name="oMath" type="CT_OnOff"/>
183+
</xsd:choice>
150184
<xsd:element name="rPrChange" type="CT_RPrChange" minOccurs="0"/>
151185
</xsd:sequence>
152186
</xsd:group>
153187

154-
<xsd:group name="EG_RPrBase">
155-
<xsd:choice>
156-
<xsd:element name="rStyle" type="CT_String"/>
157-
<xsd:element name="rFonts" type="CT_Fonts"/>
158-
<xsd:element name="b" type="CT_OnOff"/>
159-
<xsd:element name="bCs" type="CT_OnOff"/>
160-
<xsd:element name="i" type="CT_OnOff"/>
161-
<xsd:element name="iCs" type="CT_OnOff"/>
162-
<xsd:element name="caps" type="CT_OnOff"/>
163-
<xsd:element name="smallCaps" type="CT_OnOff"/>
164-
<xsd:element name="strike" type="CT_OnOff"/>
165-
<xsd:element name="dstrike" type="CT_OnOff"/>
166-
<xsd:element name="outline" type="CT_OnOff"/>
167-
<xsd:element name="shadow" type="CT_OnOff"/>
168-
<xsd:element name="emboss" type="CT_OnOff"/>
169-
<xsd:element name="imprint" type="CT_OnOff"/>
170-
<xsd:element name="noProof" type="CT_OnOff"/>
171-
<xsd:element name="snapToGrid" type="CT_OnOff"/>
172-
<xsd:element name="vanish" type="CT_OnOff"/>
173-
<xsd:element name="webHidden" type="CT_OnOff"/>
174-
<xsd:element name="color" type="CT_Color"/>
175-
<xsd:element name="spacing" type="CT_SignedTwipsMeasure"/>
176-
<xsd:element name="w" type="CT_TextScale"/>
177-
<xsd:element name="kern" type="CT_HpsMeasure"/>
178-
<xsd:element name="position" type="CT_SignedHpsMeasure"/>
179-
<xsd:element name="sz" type="CT_HpsMeasure"/>
180-
<xsd:element name="szCs" type="CT_HpsMeasure"/>
181-
<xsd:element name="highlight" type="CT_Highlight"/>
182-
<xsd:element name="u" type="CT_Underline"/>
183-
<xsd:element name="effect" type="CT_TextEffect"/>
184-
<xsd:element name="bdr" type="CT_Border"/>
185-
<xsd:element name="shd" type="CT_Shd"/>
186-
<xsd:element name="fitText" type="CT_FitText"/>
187-
<xsd:element name="vertAlign" type="CT_VerticalAlignRun"/>
188-
<xsd:element name="rtl" type="CT_OnOff"/>
189-
<xsd:element name="cs" type="CT_OnOff"/>
190-
<xsd:element name="em" type="CT_Em"/>
191-
<xsd:element name="lang" type="CT_Language"/>
192-
<xsd:element name="eastAsianLayout" type="CT_EastAsianLayout"/>
193-
<xsd:element name="specVanish" type="CT_OnOff"/>
194-
<xsd:element name="oMath" type="CT_OnOff"/>
195-
</xsd:choice>
196-
</xsd:group>
197-
198188
<xsd:complexType name="CT_OnOff">
199189
<xsd:attribute name="val" type="s:ST_OnOff"/>
200190
</xsd:complexType>

‎docx/oxml/shared.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,3 @@ def new(cls, nsptagname, val):
5353
elm = OxmlElement(nsptagname)
5454
elm.val = val
5555
return elm
56-
57-
@classmethod
58-
def new_rStyle(cls, val):
59-
"""
60-
Return a new ``<w:rStyle>`` element with ``val`` attribute set to
61-
*val*.
62-
"""
63-
rStyle = OxmlElement('w:rStyle')
64-
rStyle.val = val
65-
return rStyle

0 commit comments

Comments
 (0)