Merge branch 'master' of github.com:w3c/csswg-drafts

Author: frivoal

css-conditional/Overview.bs

@@ -312,7 +312,7 @@ by adding:</p>
 
 <pre>
 <dfn>supports_rule</dfn>
-  : <a>SUPPORTS_SYM</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>group_rule_body</a>
+  : <a>SUPPORTS_SYM</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition</a> <a>group_rule_body</a>
   ;
 
 <dfn>supports_condition</dfn>
@@ -321,7 +321,7 @@ by adding:</p>
   ;
 
 <dfn>supports_condition_in_parens</dfn>
-  : ( '(' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* ')' ) | <a>supports_declaration_condition</a> |
+  : ( '(' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition</a> ')' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* ) | <a>supports_declaration_condition</a> |
     <a>general_enclosed</a>
   ;
 
@@ -330,19 +330,19 @@ by adding:</p>
   ;
 
 <dfn>supports_conjunction</dfn>
-  : <a>supports_condition_in_parens</a> ( <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a href="https://www.w3.org/TR/css3-mediaqueries/#syntax">AND</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition_in_parens</a> )+
+  : <a>supports_condition_in_parens</a> ( <a href="https://www.w3.org/TR/css3-mediaqueries/#syntax">AND</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition_in_parens</a> )+
   ;
 
 <dfn>supports_disjunction</dfn>
-  : <a>supports_condition_in_parens</a> ( <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>OR</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition_in_parens</a> )+
+  : <a>supports_condition_in_parens</a> ( <a>OR</a> <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a>supports_condition_in_parens</a> )+
   ;
 
 <dfn>supports_declaration_condition</dfn>
-  : '(' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">declaration</a> ')'
+  : '(' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>* <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">declaration</a> ')' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>*
   ;
 
 <dfn>general_enclosed</dfn>
-  : ( <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">FUNCTION</a> | '(' ) ( <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">any</a> | <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">unused</a> )* ')'
+  : ( <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">FUNCTION</a> | '(' ) ( <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">any</a> | <a href="https://www.w3.org/TR/CSS21/syndata.html#tokenization">unused</a> )* ')' <a href="https://www.w3.org/TR/CSS21/grammar.html#scanner">S</a>*
   ;
 </pre>
 

css-fonts-4/Overview.bs

@@ -305,7 +305,178 @@ at least as dark as its predecessor. Only values between 1 - 999 are valid, and
 
 <h3 id="font-size-prop">Font size: the 'font-size' property</h3>
 
-    Issue: Import from level 3
+	<pre class="propdef">
+	Name: font-size
+	Value: <<absolute-size>> | <<relative-size>> | <<length-percentage>>
+	Initial: medium
+	Applies to: all elements
+	Inherited: yes
+	Percentages: refer to parent element's font size
+	Computed value: absolute length
+	Media: visual
+	Animatable: As <<length>>
+	</pre>
+
+    This property indicates the desired height of glyphs from the
+    font. For scalable fonts, the font-size is a scale factor applied to the EM unit
+    of the font. (Note that certain glyphs may bleed outside their EM box.) For
+    non-scalable fonts, the font-size is converted into absolute units and matched
+    against the declared font-size of the font, using the same absolute coordinate
+    space for both of the matched values.
+    Values have the following meanings:
+
+	<dl dfn-for=font-size dfn-type=value>
+		<dt><dfn><<absolute-size>></dfn></dt>
+		<dd>
+			An <<absolute-size>> keyword refers to an entry
+			in a table of font sizes computed and kept by the user agent. Possible values
+			are:
+
+			[ xx-small | x-small | small | medium | large | x-large | xx-large ]
+		</dd>
+
+		<dt><dfn><<relative-size>></dfn></dt>
+		<dd>
+    		A <<relative-size>> keyword is interpreted
+    		relative to the table of font sizes and the computed 'font-size' of the
+    		parent element. Possible values are:
+
+    		[ larger | smaller ]
+
+    		For example, if the parent element has a font size of
+    		'medium', a value of 'larger' will make the font size of the
+    		current element be 'large'.  If the parent element's size is not
+    		close to a table entry, the user agent is free to interpolate
+    		between table entries or round off to the closest one. The user
+    		agent may have to extrapolate table values if the numerical value
+    		goes beyond the keywords.
+		</dd>
+
+		<dt><dfn><<length-percentage>></dfn></dt>
+		<dd>
+    		A length value specifies an absolute font size
+        	(independent of the user agent's font table).
+        	Negative lengths are invalid.
+
+			A percentage value specifies an absolute font size relative
+        	to the parent element's font size. Use of percentage values, or
+        	values in 'em's, leads to more robust and cascadable style sheets.
+      		Negative percentages are invalid.
+		</dd>
+	</dl>
+
+	The following table provides user agent guidelines for the
+	absolute-size scaling factor and their mapping to HTML heading and
+	absolute font-sizes. The 'medium' value is used as the reference
+	middle value. The user agent may fine-tune these values for different
+	fonts or different types of display devices.
+
+	<table class="data">
+	<thead>
+	  <th>CSS absolute-size values</th>
+	  <th>xx-small</td>
+	  <th>x-small</td>
+	  <th>small</td>
+	  <th>medium</td>
+	  <th>large</td>
+	  <th>x-large</td>
+	  <th>xx-large</td>
+	  <th>&nbsp;</td>
+	</thead>
+	<tbody>
+	  <tr>
+	    <th>scaling factor</th>
+	    <td>3/5</td>
+	    <td>3/4</td>
+	    <td>8/9</td>
+	    <td>1</td>
+	    <td>6/5</td>
+	    <td>3/2</td>
+	    <td>2/1</td>
+	    <td>3/1</td>
+	  </tr>
+	  <tr>
+	    <th>HTML headings</th>
+	    <td>h6</td>
+	    <td>&nbsp;</td>
+	    <td>h5</td>
+	    <td>h4</td>
+	    <td>h3</td>
+	    <td>h2</td>
+	    <td>h1</td>
+	    <td>&nbsp;</td>
+	  </tr>
+	  <tr>
+	    <th>HTML font sizes</th>
+	    <td>1</td>
+	    <td>&nbsp;</td>
+	    <td>2</td>
+	    <td>3</td>
+	    <td>4</td>
+	    <td>5</td>
+	    <td>6</td>
+	    <td>7</td>
+	  </tr>
+	</tbody>
+	</table>
+
+	<p class="note"><strong>Note 1.</strong> To preserve readability, an UA applying
+	these guidelines should nevertheless avoid creating font-size resulting
+	in less than 9 device pixels per EM unit on a computer display.</p>
+
+	<p class="note"><strong>Note 2.</strong> In CSS1, the suggested
+	scaling factor between adjacent indexes was 1.5 which user experience
+	proved to be too large. In CSS2, the suggested scaling factor for computer
+	screen between adjacent indexes was 1.2 which still created issues for the small
+	sizes. The new scaling factor varies between each index to provide a better
+	readability.</p>
+
+	The actual value of this property may differ from the computed
+	value due a numerical value on 'font-size-adjust' and the
+	unavailability of certain font sizes.
+
+	Child elements inherit the computed 'font-size' value (otherwise, the
+	effect of 'font-size-adjust' would compound).
+
+	<div class="example">
+	<pre>
+	p { font-size: 12pt; }
+	blockquote { font-size: larger }
+	em { font-size: 150% }
+	em { font-size: 1.5em }
+	</pre>
+	</div>
+
+<h3 id="font-size-adjust-prop">Relative sizing: the 'font-size-adjust' property</h3>
+
+	TODO: Migrate this from level 3.
+
+<h3 id="font-size-adjust-prop">Controlling synthetic faces: the 'font-synthesis' property</h3>
+
+	<pre class="propdef">
+	Name: font-synthesis
+	Value: none | [ weight || style || small-caps ]
+	Initial: weight style small-caps
+	Applies to: all elements
+	Inherited: yes
+	Percentages: N/A
+	Computed value: as specified
+	Media: visual
+	Animatable: no
+	</pre>
+
+	This property controls whether user agents are allowed to synthesize bold or oblique font
+	faces when a font family lacks bold or italic faces.  If 'weight' is not specified, user agents
+	must not synthesize bold faces. If 'style' is not specified, user agents must not synthesize
+	italic faces. If 'small-caps' is not specified, user agents must not synthesize small-caps faces.
+	A value of 'none' disallows all synthetic faces.
+
+	<div class="example">
+	<p>The style rule below disables the use of synthetically obliqued Arabic:</p>
+	</p>
+	<pre>*:lang(ar) { font-synthesis: none; }
+	</pre>
+	</div>
 
 <h2 id="font-resources">Font Resources</h2>
 
@@ -1172,18 +1343,21 @@ at least as dark as its predecessor. Only values between 1 - 999 are valid, and
 
 	The <<string>> is a case-sensitive OpenType or TrueType variation axis name. As
 	specified in the OpenType / TrueType specifications, axis names contain four
-	ASCII characters. axis name strings longer or shorter than four characters,
+	ASCII characters. Axis name strings longer or shorter than four characters,
 	or containing characters outside the U+20&ndash;7E codepoint range are
 	invalid. Axis names need only
 	match an axis tag defined in the font, so they are not limited to
 	explicitly registered OpenType / TrueType variation axes. Fonts defining custom axis names should follow the
 	<a href="https://www.microsoft.com/typography/otspec/fvar.htm">name rules</a>
 	defined in the OpenType specification.
 
-	Axis values not present in the font, or axis values greater or less than the range supported by the font, are ignored and therefore have no effect; a user agent must
+	Axis values not present in the font are ignored and therefore have no effect; a user agent must
 	not attempt to synthesize fallback behavior based on these axis tags. Other axis values
 	within the same CSS 'font-variation-settings' statement are not ignored.
 
+	Axis values greater or less than the range supported by the font are clamped to the closest value supported by
+	the font.
+
 	Values are allowed to be fractional or negative.
 
 	If the same axis name appears twice, the second one supercedes the first.
@@ -1237,15 +1411,6 @@ at least as dark as its predecessor. Only values between 1 - 999 are valid, and
 		(so you can declare a palette in a variable, and override bits as desired).
 </div>
 
-<h2 id="expanded-font-weight-scale">Expanding the scale of <code>font-weight</code></h2>
-
-<p>Expand the range of weights possible within the <code>font-weight</code>
-property and <code>font-weight</code> descriptor to include integer values within
-the range [1..1000]. Define precisely how the font matching algorithm works
-when using weights in this range.</p>
-
-<p class="example">Example of using new font weights mixed with old ones</p>
-
 <h2 id="min-max-font-size">Minimum and maximum <code>font-size</code></h2>
 
 <p>Define new properties to control the minimum and maximum font-size,
@@ -1274,13 +1439,6 @@ of predefined CSS generic font families to cover these type styles.</p>
 Issue: Add ''system-ui'' fingerprinting issue to Security and Privacy Considerations section
 per <a href="https://lists.w3.org/Archives/Public/www-style/2015Aug/0051.html">discussion</a>.
 
-<h2 id="font-synthesis-small-caps">New <code>small-caps</code> value for <code>font-synthesis</code></h2>
-
-<p>Since small capitals are often synthesized for fonts lacking smalls-caps glyphs,
-add a <code>small-caps</code> value to the <code>font-synthesis</code> property
-to allow small-caps synthesis to be disabled.
-(<a href="https://lists.w3.org/Archives/Public/www-style/2015Jul/0463.html">www-style discussion</a>)</p>
-
 <h2 id="emoji-fallback">Font fallback for emoji codepoints</h2>
 
 <p>Many codepoints supported by emoji fonts overlap with codepoints supported