metanorma-iso 1.10.4 → 2.0.1

data/lib/isodoc/iso/html/style-human.css

@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -86,6 +92,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -338,23 +347,24 @@ span.title {
   font-size: 0.9em; }
 
 /* TYPOGRAPHY */
-h1 {
+h1, .h1 {
   font-weight: 900; }
 
 h2,
 h3,
 h4,
 h5,
-h6 {
+h6,
+.h2, .h3, .h4, .h5, .h6 {
   font-weight: 700; }
 
-h1 {
+h1, .h1 {
   font-size: 1.5em;
   line-height: 2em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h2 {
+h2, .h2 {
   font-size: 1.2em;
   line-height: 1.5em;
   margin-top: 2em;
@@ -365,12 +375,13 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   line-height: 1.2; }
 
 /* override for amendments */
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: normal;
   font-size: initial;
   font-style: italic;
@@ -379,7 +390,7 @@ h1, h2, h3, h4, h5, h6 {
   margin-bottom: 1em; }
 
 {% endif %}
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 p {
@@ -401,7 +412,7 @@ a {
   color: black;
   text-decoration-color: black; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 ul > li {
@@ -432,44 +443,48 @@ p.Terms {
   margin-top: 0em; }
 
 /* Navigation*/
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   font-family: {{bodyfont}};
   font-weight: 400; }
-  #toc ul {
+  #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
     margin: 0;
     padding: 0;
     list-style: none; }
-    #toc ul li a {
+    #toc ul li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
       padding: 5px 10px; }
-    #toc ul a {
+    #toc ul a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
       text-decoration: none;
       display: block; }
-      #toc ul a:hover {
+      #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
         box-shadow: none;
         color: white; }
-  #toc .h2 {
+  #toc .h2, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
     padding-left: 30px; }
-  #toc .h3 {
+  #toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
     padding-left: 50px; }
-  #toc .toc-active, #toc li:hover {
+  #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     background: #1d1d1d;
     box-shadow: inset -5px 0px 10px -5px #1d1d1d !important; }
-    #toc .toc-active a, #toc li:hover a {
+    #toc .toc-active a, #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: white; }
   @media print {
-    #toc .toc-active, #toc li:hover {
+    #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
       background: white;
       box-shadow: none !important; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
   @media screen and (max-width: 768px) {
-    #toc {
+    #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
-  #toc li:before {
+  #toc li:before, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
     content: " ";
     display: none; }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 nav {
   line-height: 1.2em; }
   @media screen and (min-width: 768px) {
@@ -523,7 +538,7 @@ nav {
     display: none; }
   h1.toc-contents {
     margin-top: 1em; }
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0; } }
 

data/lib/isodoc/iso/html/style-human.scss

@@ -140,7 +140,7 @@ span.title {
 
 /* TYPOGRAPHY */
 
-h1 {
+h1, .h1 {
     font-weight: 900;
 }
 
@@ -148,18 +148,19 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6, 
+.h2, .h3, .h4, .h5, .h6{
     font-weight: 700;
 }
 
-h1 {
+h1, .h1 {
     font-size: 1.5em;
     line-height: 2em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h2 {
+h2, .h2 {
     font-size: 1.2em;
     line-height: 1.5em;
     margin-top: 2em;
@@ -171,7 +172,8 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6, 
+.h1, .h2, .h3, .h4, .h5, .h6 {
     line-height: 1.2;
 }
 
@@ -179,7 +181,7 @@ h6 {
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     font-weight: normal;
     font-size: initial;
     font-style: italic;
@@ -190,7 +192,7 @@ h1, h2, h3, h4, h5, h6 {
 
 {% endif %}
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 
@@ -218,7 +220,7 @@ a {
     text-decoration-color: black;
 }
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 
@@ -257,7 +259,7 @@ p.Terms {
 
 /* Navigation*/
 
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     @include toc(null, #1d1d1d, white);
     @include sidebarToc();
 
@@ -273,6 +275,11 @@ p.Terms {
     }
 }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+}
+
 nav {
     @include sidebarNav(#f7f7f7, 278px, 20px);
     line-height: 1.2em;
@@ -297,7 +304,7 @@ nav {
         margin-top: 1em;
     }
 
-    ul#toc-list {
+    ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
         padding: 0;
         margin: 0;
     }

data/lib/isodoc/iso/html/style-iso.css

@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -86,6 +92,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -315,23 +324,23 @@ span.partlabel {
   font-size: 0.9em; }
 
 /* TYPOGRAPHY */
-h1 {
+h1, .h1 {
   font-size: 1.5em;
   line-height: 2em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h2 {
+h2, .h2 {
   font-size: 1.2em;
   line-height: 1.5em;
   margin-top: 2em;
   margin-bottom: 1em; }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   line-height: 1.2; }
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: normal;
   font-size: initial;
   font-style: italic; }
@@ -355,7 +364,7 @@ a {
   color: black;
   text-decoration-color: black; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 ul > li {
@@ -381,48 +390,53 @@ p.Terms {
   margin-top: 0em; }
 
 /* Navigation*/
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   font-family: {{bodyfont}};
   font-weight: 400; }
-  #toc ul {
+  #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
     margin: 0;
     padding: 0;
     list-style: none; }
-    #toc ul li a {
+    #toc ul li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
       padding: 5px 10px; }
-    #toc ul a {
+    #toc ul a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
       text-decoration: none;
       display: block; }
-      #toc ul a:hover {
+      #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
         box-shadow: none;
         color: black; }
-  #toc .h2 {
+  #toc .h2, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
     padding-left: 30px; }
-  #toc .h3 {
+  #toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
     padding-left: 50px; }
-  #toc .toc-active, #toc li:hover {
+  #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     background: #f7f7f7;
     box-shadow: inset -5px 0px 10px -5px #f7f7f7 !important; }
-    #toc .toc-active a, #toc li:hover a {
+    #toc .toc-active a, #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; }
   @media print {
-    #toc .toc-active, #toc li:hover {
+    #toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
       background: white;
       box-shadow: none !important; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
   @media screen and (max-width: 768px) {
-    #toc {
+    #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
   #toc .toc-active,
-  #toc li:hover {
+  #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active,
+  #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     box-shadow: 0px 1px 0px 0px black !important;
     background: none; }
-  #toc li:before {
+  #toc li:before, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
     content: " ";
     display: none; }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 nav {
   line-height: 1.2em; }
   @media screen and (min-width: 768px) {
@@ -477,7 +491,7 @@ nav {
     display: none; }
   h1.toc-contents {
     margin-top: 1em; }
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0; } }
 

data/lib/isodoc/iso/html/style-iso.scss

@@ -112,27 +112,27 @@ span.partlabel {
 
 /* TYPOGRAPHY */
 
-h1 {
+h1, .h1 {
     font-size: 1.5em;
     line-height: 2em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h2 {
+h2, .h2 {
     font-size: 1.2em;
     line-height: 1.5em;
     margin-top: 2em;
     margin-bottom: 1em;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     line-height: 1.2;
 }
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     font-weight: normal;
     font-size: initial;
     font-style: italic;
@@ -164,7 +164,7 @@ a {
     text-decoration-color: black;
 }
 
-h2 p {
+h2 p, .h2 p {
     display: inline;
 }
 
@@ -198,7 +198,7 @@ p.Terms {
 
 /* Navigation*/
 
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     @include toc(null, #f7f7f7, black);
     @include sidebarToc();
 
@@ -214,6 +214,12 @@ p.Terms {
     }
 }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+}
+
+
 nav {
     @include sidebarNav(#f7f7f7, 278px, 20px);
     line-height: 1.2em;
@@ -239,7 +245,7 @@ nav {
         margin-top: 1em;
     }
 
-    ul#toc-list {
+    ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
         padding:0;
         margin:0;
     }

data/lib/isodoc/iso/html/wordstyle.css

@@ -289,7 +289,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 div.figure, p.figure {
   text-align: center; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -304,8 +304,6 @@ h1 {
   line-height: 13.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l1 level1 lfo6;
   mso-hyphenate: none;
   tab-stops: 20.0pt list 21.6pt left 28.0pt;
   {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
@@ -324,6 +322,10 @@ h1 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 h1.ForewordTitle {
   font-size: 13.0pt;
   font-style: normal;
@@ -358,7 +360,7 @@ h1.Annex {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-.h2Annex, h2 {
+.h2Annex, h2, .h2 {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -395,7 +397,7 @@ h2 {
   mso-list: l1 level2 lfo6;
   mso-outline-level: 2; }
 
-.h3Annex, h3 {
+.h3Annex, h3, .h3 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -432,7 +434,7 @@ h3 {
   mso-list: l1 level3 lfo6;
   mso-outline-level: 3; }
 
-.h4Annex, h4 {
+.h4Annex, h4, .h4 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -467,7 +469,7 @@ h4 {
   mso-list: l1 level4 lfo6;
   mso-outline-level: 4; }
 
-.h5Annex, h5 {
+.h5Annex, h5, .h5 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -502,7 +504,7 @@ h5 {
   mso-list: l1 level5 lfo6;
   mso-outline-level: 5; }
 
-h6 {
+h6, .h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;

data/lib/isodoc/iso/html/wordstyle.scss

@@ -269,7 +269,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 div.figure, p.figure
         {text-align: center;}
 
-h1
+h1, .h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -284,8 +284,6 @@ h1
 	line-height:13.5pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:1;
-	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	tab-stops:20.0pt list 21.6pt left 28.0pt;
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
@@ -303,6 +301,10 @@ h1
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h1 {
+	mso-outline-level:1;
+	mso-list:l1 level1 lfo6;
+}
 h1.ForewordTitle {
         font-size:13.0pt;
         font-style: normal ;
@@ -336,7 +338,7 @@ h1.Annex
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-.h2Annex, h2
+.h2Annex, h2, .h2
         {mso-style-priority:2;
         mso-style-unhide:no;
         mso-style-qformat:yes;
@@ -372,7 +374,7 @@ h2
 	{ mso-list:l1 level2 lfo6;
         mso-outline-level:2;
         }
-.h3Annex, h3
+.h3Annex, h3, .h3
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -407,7 +409,7 @@ h2
 h3      {mso-list:l1 level3 lfo6;
 	mso-outline-level:3;
         }
-.h4Annex, h4
+.h4Annex, h4, .h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -440,7 +442,7 @@ h3      {mso-list:l1 level3 lfo6;
 h4      {mso-list:l1 level4 lfo6;
 	mso-outline-level:4;
         }
-.h5Annex, h5
+.h5Annex, h5, .h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -473,7 +475,7 @@ h4      {mso-list:l1 level4 lfo6;
 h5      {mso-list:l1 level5 lfo6;
 	mso-outline-level:5;
         }
-h6
+h6, .h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;

data/lib/isodoc/iso/html_convert.rb

@@ -58,15 +58,17 @@ module IsoDoc
       end
 
       def html_toc_entry(level, header)
-        if level == "h1" && header.parent.at(".//h2[not(@class = 'TermNum')]"\
-                                             "[not(@class = 'noTOC')][text()]")
+        content = header.at("./following-sibling::p"\
+                            "[@class = 'variant-title-toc']") || header
+        if level == "h1" &&
+            header.parent.at(".//h2#{toc_exclude_class}")
           <<~HDR
-            <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(header)}</a></li>
+            <li class="#{level}"><div class="collapse-group"><a href="##{header['id']}">#{header_strip(content)}</a></li>
             <div class="collapse-button"></div></div>
           HDR
         else
           %(<li class="#{level}"><a href="##{header['id']}">\
-      #{header_strip(header)}</a></li>)
+      #{header_strip(content)}</a></li>)
         end
       end