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

Jump to bottom

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

Merged
merged 2 commits into from
Jun 21, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
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
46 changes: 29 additions & 17 deletions doctypes/dtd/base/commonElements.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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
""
>
Expand Down Expand Up @@ -1324,7 +1336,7 @@
keycol
NMTOKEN
#IMPLIED
%display-atts;
%simpletable-display-atts;
%univ-atts;"
>
<!ELEMENT simpletable %simpletable.content;>
Expand Down
16 changes: 1 addition & 15 deletions doctypes/dtd/base/tblDecl.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
56 changes: 35 additions & 21 deletions doctypes/rng/base/commonElementsMod.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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">
Expand Down
20 changes: 1 addition & 19 deletions doctypes/rng/base/tblDeclMod.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
30 changes: 13 additions & 17 deletions specification/langRef/attributes/commonAttributes.dita
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,23 +712,19 @@
</dlentry>
<dlentry id="scale">
<dt id="attr-scale"><xmlatt>scale</xmlatt> (display attributes)</dt>
<dd>Specifies the percentage by which fonts are resized in
relation to the normal text size. The following values are
valid: <keyword>50</keyword>, <keyword>60</keyword>,
<keyword>70</keyword>, <keyword>80</keyword>,
<keyword>90</keyword>, <keyword>100</keyword>,
<keyword>110</keyword>, <keyword>120</keyword>,
<keyword>140</keyword>, <keyword>160</keyword>,
<keyword>180</keyword>, <keyword>200</keyword>, and <xref
keyref="attributes-useconreftarget"
>-dita-use-conref-target</xref>. <p>This attribute is
primarily useful for print-oriented display. Some processors
might not support all values.</p><p>If the
<xmlatt>scale</xmlatt> attribute is specified on an element
that contains an image, the image is not scaled. The image is
scaled <b>only</b> if a scaling property is explicitly
specified for the <xmlelement>image</xmlelement>
element.</p><!--<draft-comment author="robander" time="Dec 28 2021">Just noting that we seem to repeat ourselves here, saying this is 1) primarily for print-oriented, 2) primarily for print accommodation, and 3) some processors (implementations) might not support all values. Also feels really odd to say it's "an acknowledged style-based property", I think we can just delete that sentence? It doesn't add anything except to suggest we might be embarassed to have this attribute?</draft-comment>--><!--<draft-comment author="Kristen J Eberlein" time="29 December 2021"><p>I've made some edits, including some that I think eliminated the repetition.</p><p>Is <xmlatt>scale</xmlatt> used on elements other than fig, simpletable, and table? Note that we do not mention <xmlelement>simpletable</xmlelement> above ...</p><p>Maybe the paragraph about image should be moved to the <xmlelement>image</xmlelement> topic? Or covered in the topics for elements that support <xmlatt>scale</xmlatt>?</p><p>Do we need to discuss processing expectations about scaling elsewhere? It's buried here. Putting it in a more prominent place might improve the likelihood that processors would support it.</p><p>Based on a quick test, DITA-OT PDF: <ul><li>Supports <xmlatt>scale</xmlatt> on table but not <xmlelement>simpletable</xmlelement></li><li>Scales the image contained in a table when the <xmlatt>scale</xmlatt> attribute is set</li></ul> .</p></draft-comment>--></dd>
<dd>Specifies the percentage by which fonts are resized in relation to the normal text
size. The value of this attribute is a positive integer. When used on
<xmlelement>table</xmlelement> or <xmlelement>simpletable</xmlelement>, the following
values are valid: <keyword>50</keyword>, <keyword>60</keyword>, <keyword>70</keyword>,
<keyword>80</keyword>, <keyword>90</keyword>, <keyword>100</keyword>,
<keyword>110</keyword>, <keyword>120</keyword>, <keyword>140</keyword>,
<keyword>160</keyword>, <keyword>180</keyword>, <keyword>200</keyword>, and <xref
keyref="attributes-useconreftarget">-dita-use-conref-target</xref>. <p>This attribute
is primarily useful for print-oriented display. Some processors might not support all
values.</p><p>If the <xmlatt>scale</xmlatt> attribute is specified on an element that
contains an image, the image is not scaled. The image is scaled <b>only</b> if a
scaling property is explicitly specified for the <xmlelement>image</xmlelement>
element.</p><!--<draft-comment author="robander" time="Dec 28 2021">Just noting that we seem to repeat ourselves here, saying this is 1) primarily for print-oriented, 2) primarily for print accommodation, and 3) some processors (implementations) might not support all values. Also feels really odd to say it's "an acknowledged style-based property", I think we can just delete that sentence? It doesn't add anything except to suggest we might be embarassed to have this attribute?</draft-comment>--><!--<draft-comment author="Kristen J Eberlein" time="29 December 2021"><p>I've made some edits, including some that I think eliminated the repetition.</p><p>Is <xmlatt>scale</xmlatt> used on elements other than fig, simpletable, and table? Note that we do not mention <xmlelement>simpletable</xmlelement> above ...</p><p>Maybe the paragraph about image should be moved to the <xmlelement>image</xmlelement> topic? Or covered in the topics for elements that support <xmlatt>scale</xmlatt>?</p><p>Do we need to discuss processing expectations about scaling elsewhere? It's buried here. Putting it in a more prominent place might improve the likelihood that processors would support it.</p><p>Based on a quick test, DITA-OT PDF: <ul><li>Supports <xmlatt>scale</xmlatt> on table but not <xmlelement>simpletable</xmlelement></li><li>Scales the image contained in a table when the <xmlatt>scale</xmlatt> attribute is set</li></ul> .</p></draft-comment>--></dd>
</dlentry>
<dlentry id="scope">
<dt id="attr-scope"><xmlatt>scope</xmlatt> (link-relationship attributes)</dt>
Expand Down