[HTML] whatwg/html@db55877 Allow heading content within legend and su…

…mmary elements
triple-underscore · Feb 20, 2020 · 77214d3 · 77214d3
1 parent e37553e
commit 77214d3
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 27 deletions.
diff --git a/HTML-form-elements-ja.html b/HTML-form-elements-ja.html
@@ -147,8 +147,8 @@
 
 ●●options
 
-spec_date:2019-12-19
-trans_update:2019-12-20
+spec_date:2020-02-20
+trans_update:2020-02-20
 source_checked:191126
 page_state_key:HTML
 spec_status:LS
@@ -678,6 +678,7 @@
 なし:~HTMLdom#concept-content-nothing
 可触~内容:~HTMLdom#palpable-content-2
 句ng内容:~HTMLdom#phrasing-content-2
+見出し内容:~HTMLdom#heading-content-2
 text/html における~tag省略:~HTMLdom#concept-element-tag-omission
 ~text:~HTMLdom#text-content
 方向性:~HTMLdom#the-directionality
@@ -907,7 +908,9 @@
 sectioning::::セクショニング
 legend:
 microdata::::
+outline::::アウトライン
 句ng:phrasing::句::フレージング
+見出し:heading::~
 	文脈に応じた:context-sensitive
 可触:palpable::~
 分類:categories:~
@@ -917,7 +920,7 @@
 単語:word:~
 句:phrase::~
 生の:raw:~
-
+	~~混在-:intermix
 
 	●仕様
 	適切でない:inappropriate
@@ -972,6 +975,7 @@
 不等式:inequality:~
 種類:kind:~
 切落す:truncateする:切り落とす
+表面化-:surface:~
 
 	respond
 	-:paragraph
@@ -1577,6 +1581,43 @@ <h3>Suggested groups</h3>
  </fieldset>
 </fieldset>
 
+■fieldset-4
+<fieldset>
+ <legend> <h2>
+  連絡方法は、どれにしますか？
+ </h2> </legend>
+ <p> <label>
+ <input type=radio checked name=contact_pref>
+  電話
+ </label> </p>
+ <p> <label>
+  <input type=radio name=contact_pref>
+  テキストメッセージ
+ </label> </p>
+ <p> <label>
+  <input type=radio name=contact_pref>
+  メール
+ </label> </p>
+</fieldset>
+
+<fieldset>
+ <legend> <h2>
+  How can we best reach you?
+ </h2> </legend>
+ <p> <label>
+ <input type=radio checked name=contact_pref>
+  Phone
+ </label> </p>
+ <p> <label>
+  <input type=radio name=contact_pref>
+  Text
+ </label> </p>
+ <p> <label>
+  <input type=radio name=contact_pref>
+  Email
+ </label> </p>
+</fieldset>
+
 
 ●●trans_metadata
 <p>
@@ -8253,6 +8294,21 @@ <h3 title="The fieldset element">4.10.15. ``fieldset^e 要素</h3>
 In this example, if the outer "Use Club Card" checkbox is not checked, everything inside the outer fieldset, including the two radio buttons in the legends of the two nested fieldsets, will be disabled. However, if the checkbox is checked, then the radio buttons will both be enabled and will let you select which of the two inner fieldsets is to be enabled.
 </p>
 
+</div>
+
+<div class="example">
+
+<p>
+~controlを~group化する例。
+~groupを~labelする `legend$e 要素は
+— ~groupが文書の~outline内に表面化するよう —
+見出し要素を入子にしている：
+◎
+This example shows a grouping of controls where the legend element both labels the grouping, and the nested heading element surfaces the grouping in the document outline:
+</p>
+
+`fieldset-4^xCode
+
 </div>
 
 			</section>
@@ -8278,8 +8334,9 @@ <h3 title="The legend element">4.10.16. ``legend^e 要素</h3>
 	<dt>`内容~model$</dt>
 	<dd>
 `句ng内容$。
+加えて，`見出し内容$が~~混在していてもよい。
 ◎
-Phrasing content.
+Phrasing content, optionally intermixed with heading content.
 </dd>
 
 	<dt>`text/html における~tag省略$</dt>

diff --git a/HTML-index-ja.html b/HTML-index-ja.html
@@ -188,7 +188,7 @@
 
 ●●options
 
-spec_date:2020-02-12
+spec_date:2020-02-20
 trans_update:2020-02-14
 source_checked:180817
 page_state_key:HTML

diff --git a/HTML-index1-ja.html b/HTML-index1-ja.html
@@ -217,8 +217,8 @@
 
 ●●options
 
-spec_date:2020-02-12
-trans_update:2020-02-14
+spec_date:2020-02-20
+trans_update:2020-02-20
 source_checked:180117
 page_state_key:HTML
 spec_status:LS
@@ -1717,7 +1717,7 @@ <h2 title="Elements">要素</h2>
 ◎
 Section heading
 <td>`~flow$ | `見出し$ | `可触$
-<td>`hgroup$e | `~flow$
+<td>`legend$e | `summary$e | `~flow$
 <td>`句ng$
 <td>`大域$
 <td>`HTMLHeadingElement$I
@@ -1752,7 +1752,7 @@ <h2 title="Elements">要素</h2>
 ◎
 heading group
 <td>`~flow$ | `見出し$ | `可触$
-<td>`~flow$
+<td>`legend$e | `summary$e | `~flow$
 <td>`h1$e | `h2$e | `h3$e | `h4$e | `h5$e | `h6$e | `~script用$
 ◎
 h1; h2; h3; h4; h5; h6; script-supporting elements
@@ -1811,7 +1811,7 @@ <h2 title="Elements">要素</h2>
 <td>`~flow$ | `句ng$ | `埋込d$ | `対話的$* | `~formに所有され得る$ | `可触$
 <td>`句ng$ | `picture$e
 <td>空
-<td>`大域$ | `alt$a | `src$a | `sizes$a | `srcset$a | `crossorigin$a | `usemap$a | `ismap$a | `width$a | `height$a | `referrerpolicy$a | `decoding$a | `loading$a＊
+<td>`大域$ | `alt$a | `src$a | `sizes$a | `srcset$a | `crossorigin$a | `usemap$a | `ismap$a | `width$a | `height$a | `referrerpolicy$a | `decoding$a | `loading$a
 <td>`HTMLImageElement$I
 
 <tr><th>`input!e
@@ -1865,7 +1865,7 @@ <h2 title="Elements">要素</h2>
 Caption for fieldset
 <td>ナシ
 <td>`fieldset$e
-<td>`句ng$
+<td>`句ng$ | `見出し$
 <td>`大域$
 <td>`HTMLLegendElement$I
 
@@ -2291,7 +2291,7 @@ <h2 title="Elements">要素</h2>
 Caption for details
 <td>ナシ
 <td>`details$e
-<td>`句ng$
+<td>`句ng$ | `見出し$
 <td>`大域$
 <td>`HTMLElement$I
 

diff --git a/HTML-interactive-elements-ja.html b/HTML-interactive-elements-ja.html
@@ -111,8 +111,8 @@
 
 ●●options
 
-spec_date:2019-12-16
-trans_update:2019-12-17
+spec_date:2020-02-20
+trans_update:2020-02-20
 source_checked:191126
 page_state_key:HTML
 spec_status:LS
@@ -231,9 +231,10 @@
 分類:category:~
 句ng:phrasing::句::フレージング
 可触:palpable::~
-見出し:heading:~
+見出し:heading::~
 sectioning::::セクショニング
 none::なし
+	~~混在-:intermix
 
 	●未分類
 	作成し直す:recreate
@@ -979,13 +980,10 @@ <h3 title="The summary element">4.11.2. `summary^e 要素</h3>
 
 	<dt>`内容~model$</dt>
 	<dd>
-次のいずれかの一方
-⇒
-`句ng内容$, または 1 個の`見出し内容$ 要素
-◎
-Either: phrasing content.
+`句ng内容$。
+加えて，`見出し内容$が~~混在していてもよい。
 ◎
-Or: one element of heading content.
+Phrasing content, optionally intermixed with heading content.
 </dd>
 
 	<dt>`text/html における~tag省略$</dt>

diff --git a/HTML-sections-ja.html b/HTML-sections-ja.html
@@ -110,8 +110,8 @@
 
 ●●options
 
-spec_date:2019-12-16
-trans_update:2019-12-17
+spec_date:2020-02-20
+trans_update:2020-02-20
 source_checked:191126
 page_state_key:HTML
 spec_status:LS
@@ -3420,9 +3420,11 @@ <h3 title="The h1, h2, h3, h4, h5, and h6 elements">4.3.6 `h1^e, `h2^e, `h3^e, `
 As a child of an hgroup element.
 </dd>
 	<dd>
-`~flow内容$が期待される所。
+［
+`~flow内容$／`見出し内容$
+］が期待される所。
 ◎
-Where flow content is expected.
+Where flow content or heading content is expected.
 </dd>
 
 	<dt>`内容~model$</dt>
@@ -3543,9 +3545,11 @@ <h3 title="The hgroup element">4.3.7. `hgroup^e 要素</h3>
 
 	<dt>`この要素を利用できる文脈$</dt>
 	<dd>
-`~flow内容$が期待される所。
+［
+`~flow内容$／`見出し内容$
+］が期待される所。
 ◎
-Where flow content is expected.
+Where flow content or heading content is expected.
 </dd>
 
 	<dt>`内容~model$</dt>