Skip to content

Commit 27f86de

Browse files
committed
[css2] Made quotes rule into just: [LANG|=fr] > *.
Minor edits. --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401397
1 parent 3efecf5 commit 27f86de

1 file changed

Lines changed: 47 additions & 58 deletions

File tree

css2/generate.src

Lines changed: 47 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,14 @@ should be able to insert these strings.
2626
<li>The <span class="propinst-content">'content'</span>
2727
property, in conjunction with the :before and :after pseudo-elements.
2828
<li>The <span class="propinst-cue-before">'cue-before'</span>,
29-
<span class="propinst-cue-after">'cue-after'</span>,
30-
<span class="propinst-pause-before">'pause-before'</span>,
31-
and <span class="propinst-pause-after">'pause-after'</span>
29+
<span class="propinst-cue-after">'cue-after'</span>
3230
aural properties. When the aural properties
3331
are specified as well as the the <span
3432
class="propinst-content">'content'</span> property, content
3533
is rendered in the following order: :before, <span
36-
class="propinst-cue-before">'cue-before'</span>, <span
37-
class="propinst-pause-before">'pause-before'</span>, the element's
38-
content, <span class="propinst-pause-after">'pause-after'</span>,
34+
class="propinst-cue-before">'cue-before'</span>, (<span
35+
class="propinst-pause-before">'pause-before'</span>), the element's
36+
content, (<span class="propinst-pause-after">'pause-after'</span>),
3937
<span class="propinst-cue-after">'cue-after'</span>, and :after.
4038
<li>Elements with a value of 'list-item'
4139
for the <span class="propinst-display">'display'</span> property.
@@ -210,29 +208,24 @@ in the indicated <a href="#counter-styles">style</a> ('decimal' by default).
210208
<dt><span class="index-inst" title="open-quote"><span
211209
class="value-inst-open-quote"><strong>open-quote</strong></span></span> and
212210
<span class="index-inst" title="close-quote"><span
213-
class="value-inst-close-quote">'close-quote'</span></span>
211+
class="value-inst-close-quote"><strong>'close-quote'</strong></span></span>
214212

215213
<dd>Both of these values are replaced by the appropriate string
216214
from the <span class="propinst-quotes"><strong>'quotes'</strong></span> property.
217215

218216
<dt><span class="index-inst" title="no-open-quote"><span
219217
class="value-inst-no-open-quote"><strong>no-open-quote</strong></span></span>
220-
221-
<dd>Inserts nothing (the empty string), but increments the level of
222-
nesting for quotes.
223-
224-
<dt><span class="index-inst" title="no-close-quote"><span
218+
and <span class="index-inst" title="no-close-quote"><span
225219
class="value-inst-no-close-quote"><strong>no-close-quote</strong></span></span>
226220

227-
<dd>Inserts nothing (the empty string), but decrements the level of
221+
<dd>Inserts nothing (the empty string), but increments,
222+
resp. decrements the level of
228223
nesting for quotes.
229224

230225
<dt><span class="index-def" title="attr()"><strong>attr(X)</strong></span>
231226
<dd>This function returns the value of attribute X as a string. The
232227
string is not parsed by the CSS processor. If the current element
233-
doesn't have an attribute X, an empty string is returned. If two or
234-
more attributes named 'X' appear in a selector, the value of the
235-
rightmost attribute is the one inserted by 'attr(X)'. The
228+
doesn't have an attribute X, an empty string is returned. The
236229
case-sensitivity of attribute names depends on the document language.
237230

238231
<!--
@@ -557,53 +550,50 @@ The device of the order of the garter is &#8220;Honi soit qui mal y
557550
pense.&#8221;
558551
</blockquote>
559552

560-
<P>English inside French:
553+
English inside French:
561554

562555
<blockquote>
563556
Il disait: �&nbsp;Il faut mettre l'action en &#8249;&nbsp;fast
564557
forward&nbsp;&#8250;.�
565558
</blockquote>
566559

567-
<p>For French-English documents, a style sheet like the following will
568-
ensure the right quotes everywhere. Note the use of the child <span
560+
<p>A style sheet like the following will set the 'quotes' property so
561+
that 'open-quote' and 'close-quote' will work correctly on all elements.
562+
These rules are for documents that contain only English, French, or
563+
both. One rule is needed for every additional language.
564+
Note the use of the child <span
569565
class="index-inst" title="combinator"><a
570566
name="selector.html#combinator">combinator</a></span> (">") to set
571-
quotes on Q elements based on the language of the surrounding
567+
quotes on elements based on the language of the surrounding
572568
text:</P>
573569

570+
<!--
574571
<PRE class="example">
575572
HTML:lang(en), :lang(en) > Q { quotes: '\201C' '\201D' '\2018' '\2019' }
576573
HTML:lang(fr), :lang(fr) > Q { quotes: '� ' ' �' }
577574
Q:before { content: open-quote }
578575
Q:after { content: close-quote }
579576
</PRE>
580-
581-
<!-- [old example, HWL]
577+
-->
582578
<pre class="example">
583-
HTML:lang(fr) {quotes: "�" "�" "\2039" "\203A"}
584-
HTML:lang(en) {quotes: "\201C" "\201D" "\2018" "\2019"}
585-
[LANG|=fr] > * {quotes: "�" "�" "\2039" "\203A"}
586-
[LANG|=en] > * {quotes: "\201C" "\201D" "\2018" "\2019"}
579+
[LANG|=fr] > * {quotes: "�" "�" "\2039" "\203A"}
580+
[LANG|=en] > * {quotes: "\201C" "\201D" "\2018" "\2019"}
587581
</pre>
588-
-->
589582

590583
<p>The quotation marks for English are shown here in a form that most
591584
people will be able to type. If you can type them directly, they will
592585
look like this:
593586

587+
<!--
594588
<PRE class="example">
595589
HTML:lang(en), :lang(en) > Q { quotes: "&#8220;" "&#8221;" "&#8216;" "&#8217;"}
596590
</PRE>
591+
-->
597592

598-
599-
<!-- [old example, HWL]
600593
<pre class="example">
601-
HTML:lang(fr) {quotes: "�" "�" "&#8249;" "&#8250;"}
602-
HTML:lang(en) {quotes: "&#8220;" "&#8221;" "&#8216;" "&#8217;"}
603594
[LANG|=fr] > * {quotes: "�" "�" "&#8249;" "&#8250;"}
604595
[LANG|=en] > * {quotes: "&#8220;" "&#8221;" "&#8216;" "&#8217;"}
605596
</pre>
606-
-->
607597

608598
</div>
609599

@@ -636,7 +626,7 @@ is 0.
636626

637627
<p>If <span
638628
class="propinst-counter-increment">'counter-increment'</span> refers
639-
to a counter that is not in the <a href="#scope">scope</a> of any
629+
to a counter that is not in the <a href="#scope">scope (see below</a>) of any
640630
<span class="propinst-counter-reset">'counter-reset'</span>, the
641631
counter is assumed to have been reset to 0 by the root element.
642632

@@ -856,11 +846,11 @@ principal box.
856846
specified with the <span
857847
class="propinst-vertical-align">'vertical-align'</span> property.
858848

859-
<p>By default, the height of the :before marker and of the first line
849+
<p>The height of the :before marker and of the first line
860850
box of the principal box is computed as if they were a single line
861-
box. Analogously for the :after marker and the last line box. However,
862-
the <span class="propinst-height">'height'</span> property may be
863-
specified for a marker box.
851+
box. Analogously for the :after marker and the last line box.
852+
The <span class="propinst-line-height">'line-height'</span> property
853+
sets the height of the marker box.
864854

865855
<P>The width of a marker box defaults to the natural width of its
866856
content, but may be specified with the <span
@@ -878,8 +868,7 @@ the horizontal alignment of the content in the marker box.
878868
property specifies the horizontal offset between a marker box and the
879869
associated <a href="visuren.html#principal-box">principal box</a>. The
880870
distance is measured between their nearest <a
881-
href="box.html#border-edge">border edges</a>. If the content of the
882-
marker box overflows, however, the marker offset is ignored.
871+
href="box.html#border-edge">border edges</a>.
883872

884873
<P>When the <span class="propinst-display">'display'</span> property
885874
has the value 'marker' for content generated by an element with
@@ -891,24 +880,24 @@ be used to add periods after each numbered list item.
891880
This HTML program and style sheet:</p>
892881

893882
<pre class="html-example">
894-
&lt;HTML&gt;
895-
&lt;HEAD&gt;
896-
&lt;STYLE type="text/css"&gt;
897-
LI:before {
898-
display: marker;
899-
content: counter(mycounter, roman) ".";
900-
counter-increment: mycounter;
901-
}
902-
&lt;/STYLE&gt;
903-
&lt;/HEAD&gt;
904-
&lt;BODY&gt;
905-
&lt;OL&gt;
906-
&lt;LI&gt; This is the first item.
907-
&lt;LI&gt; This is the second item.
908-
&lt;LI&gt; This is the third item.
909-
&lt;/OL&gt;
910-
&lt;/BODY&gt;
911-
&lt;/HTML&gt;
883+
&lt;HTML&gt;
884+
&lt;HEAD&gt;
885+
&lt;STYLE type="text/css"&gt;
886+
LI:before {
887+
display: marker;
888+
content: counter(mycounter, lower-roman) ".";
889+
counter-increment: mycounter;
890+
}
891+
&lt;/STYLE&gt;
892+
&lt;/HEAD&gt;
893+
&lt;BODY&gt;
894+
&lt;OL&gt;
895+
&lt;LI&gt; This is the first item.
896+
&lt;LI&gt; This is the second item.
897+
&lt;LI&gt; This is the third item.
898+
&lt;/OL&gt;
899+
&lt;/BODY&gt;
900+
&lt;/HTML&gt;
912901
</pre>
913902

914903
<P>should produce something like this: </P>
@@ -1060,7 +1049,7 @@ This HTML program and style sheet:</p>
10601049
LI:before {
10611050
display: marker;
10621051
marker-offset: 3em;
1063-
content: counter(mycounter, roman) ".";
1052+
content: counter(mycounter, lower-roman) ".";
10641053
counter-increment: mycounter;
10651054
}
10661055
&lt;/STYLE&gt;

0 commit comments

Comments
 (0)