Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove enumeration for scale, apart from table #397 #716

Merged
merged 2 commits into from
Jun 21, 2022
+79 −89
Merged

Remove enumeration for scale, apart from table #397 #716

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6e4511
Remove enumeration for scale, apart from table #397
robander Jun 21, 2022
310dadd
Update spec source for scale att #397
robander Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove enumeration for scale, apart from table #397
@robander
robander committed Jun 21, 2022
commit d6e4511f553fef750cdb5841b6563497b46fd1bc
46 changes: 29 additions & 17 deletions doctypes/dtd/base/commonElements.mod
View file
Original file line number Diff line number Diff line change
@@ -423,7 +423,31 @@
%foreign.unknown.incl; |
%txt.incl;"
>
<!ENTITY % frame-expanse-atts
"frame
(all |
bottom |
none |
sides |
top |
topbot |
-dita-use-conref-target)
#IMPLIED
expanse
(column |
page |
spread |
textline |
-dita-use-conref-target)
#IMPLIED"
>
<!ENTITY % display-atts
"scale
NMTOKEN
#IMPLIED
%frame-expanse-atts;"
>
<!ENTITY % table-scale-att
"scale
(50 |
60 |
@@ -437,25 +461,13 @@
160 |
180 |
200 |
-dita-use-conref-target)
#IMPLIED
frame
(all |
bottom |
none |
sides |
top |
topbot |
-dita-use-conref-target)
#IMPLIED
expanse
(column |
page |
spread |
textline |
-dita-use-conref-target)
#IMPLIED"
>
<!ENTITY % simpletable-display-atts
"%table-scale-att;
%frame-expanse-atts;"
>
<!ENTITY % props-attribute-extensions
""
>
@@ -1324,7 +1336,7 @@
keycol
NMTOKEN
#IMPLIED
%display-atts;
%simpletable-display-atts;
%univ-atts;"
>
<!ELEMENT simpletable %simpletable.content;>
16 changes: 1 addition & 15 deletions doctypes/dtd/base/tblDecl.mod
View file
Original file line number Diff line number Diff line change
@@ -147,21 +147,7 @@
norowheader |
-dita-use-conref-target)
#IMPLIED
scale
(50 |
60 |
70 |
80 |
90 |
100 |
110 |
120 |
140 |
160 |
180 |
200 |
-dita-use-conref-target)
#IMPLIED
%table-scale-att;
%univ-atts;"
>
<!ENTITY % dita.tgroup.attributes
56 changes: 35 additions & 21 deletions doctypes/rng/base/commonElementsMod.rng
View file
Original file line number Diff line number Diff line change
@@ -818,26 +818,7 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
</div>
<div>
<a:documentation>COMMON ATTRIBUTE SETS</a:documentation>
<define name="display-atts">
<optional>
<attribute name="scale">
<choice>
<value>50</value>
<value>60</value>
<value>70</value>
<value>80</value>
<value>90</value>
<value>100</value>
<value>110</value>
<value>120</value>
<value>140</value>
<value>160</value>
<value>180</value>
<value>200</value>
<value>-dita-use-conref-target</value>
</choice>
</attribute>
</optional>
<define name="frame-expanse-atts">
<optional>
<attribute name="frame">
<choice>
@@ -863,6 +844,39 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
</attribute>
</optional>
</define>
<define name="display-atts">
<optional>
<attribute name="scale">
<data type="NMTOKEN"/>
</attribute>
</optional>
<ref name="frame-expanse-atts"/>
</define>
<define name="table-scale-att">
<optional>
<attribute name="scale">
<choice>
<value>50</value>
<value>60</value>
<value>70</value>
<value>80</value>
<value>90</value>
<value>100</value>
<value>110</value>
<value>120</value>
<value>140</value>
<value>160</value>
<value>180</value>
<value>200</value>
<value>-dita-use-conref-target</value>
</choice>
</attribute>
</optional>
</define>
<define name="simpletable-display-atts">
<ref name="table-scale-att"/>
<ref name="frame-expanse-atts"/>
</define>

<define name="props-attribute-extensions">
<a:documentation>Provide a default of no attribute extensions</a:documentation>
@@ -2281,7 +2295,7 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Common Elements//EN"
<data type="NMTOKEN"/>
</attribute>
</optional>
<ref name="display-atts"/>
<ref name="simpletable-display-atts"/>
<ref name="univ-atts"/>
</define>
<define name="simpletable.element">
20 changes: 1 addition & 19 deletions doctypes/rng/base/tblDeclMod.rng
View file
Original file line number Diff line number Diff line change
@@ -206,25 +206,7 @@ For <entry>, add:
</choice>
</attribute>
</optional>
<optional>
<attribute name="scale">
<choice>
<value>50</value>
<value>60</value>
<value>70</value>
<value>80</value>
<value>90</value>
<value>100</value>
<value>110</value>
<value>120</value>
<value>140</value>
<value>160</value>
<value>180</value>
<value>200</value>
<value>-dita-use-conref-target</value>
</choice>
</attribute>
</optional>
<ref name="table-scale-att"/>
<ref name="univ-atts"/>
</define>
<define name="dita.tgroup.attributes">