metanorma-itu 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fdddaec3384534927a88d4a07598884be02c732c4c22ebb4f48a25d1ba25e26
-  data.tar.gz: e2f5b1459929f5e8a1db46fa2a38ab0bfee5c582a7c9fd5c482fb28bb7de9f56
+  metadata.gz: 5edf39d184a64b3dea930821b40da7c92071b6a41194d5faac3f8e6f75167528
+  data.tar.gz: f0501d3013f6b7f1b4d6b3b0d191084b2a653111d8fb7cdc8ac7821910a0f147
 SHA512:
-  metadata.gz: 5e8eb91dcc35be210a9f55eaa7e256d1a5c31785341e3749667eca9a0c6a97e1c2f2c7a283711520f476377ad2db75d791acf4f43da567833f65c8cb53c74d32
-  data.tar.gz: 4471f53be6a4fd4167e70b6670a68b9b67cef8e3421075e049bd871acc443b4ade5cb3766dc0904c5980caa5f157fc3a258b095fd3e22f910b945fdefc89f2b3
+  metadata.gz: 1e0fe821463e07e9db98a9d2cf8179135b92dd825999af71f4585ddeaf3370cdd478cf3b7a54b18175f016082bd7f1f95ec455432e73c2f88cdd268ff7c1d9d1
+  data.tar.gz: dac3cf8c61853963698b124fc6a909c62b44f08156a5be3bfa750d65ef6aaee411a51584f53c9e6e3abb0d2ecef1ae2bd52201fb6f8b278d10826483c70f19c9

data/lib/isodoc/itu/base_convert.rb

@@ -53,6 +53,7 @@ module IsoDoc
       end
 
       def annex_name(annex, name, div)
+        preceding_floating_titles(name, div)
         r_a = @meta.get[:doctype_original] == "recommendation-annex"
         div.h1 **{ class: r_a ? "RecommendationAnnex" : "Annex" } do |t|
           name&.children&.each { |c2| parse(c2, t) }

data/lib/isodoc/itu/html/htmlstyle.css

@@ -678,57 +678,61 @@ nav #toc {
     nav #toc {
       padding: 0 1.5em;
       overflow: visible; } }
-#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 {
       color: #141115;
       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: #da1d52;
     box-shadow: inset -5px 0px 10px -5px #da1d52 !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 .toc-active a {
+    #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
       color: #141115; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
-  #toc .h1 {
+  #toc .h1, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h1 {
     text-transform: uppercase; }
-  #toc li a {
+  #toc li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
     font-size: {{normalfontsize}}; }
-  #toc li:hover a {
+  #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
     background: none;
     box-shadow: none; }
-  #toc li:before {
+  #toc li:before, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
     content: " ";
     display: none; }
   @media print {
-    #toc .toc-active a {
+    #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
       color: #4D7EA5; }
-    #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; } }
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 #toc-list ul {
   margin-bottom: 0.25em; }
 
@@ -789,7 +793,7 @@ nav #toc {
 @media screen and (min-width: 768px) {
   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/itu/html/htmlstyle.scss

@@ -52,7 +52,7 @@ nav {
   }
 }
 
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   font-family: $bodyfont;
   font-weight: 400;
 
@@ -92,6 +92,12 @@ nav {
   }
 }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+ }
+
+
 #toc-list {
   ul {
     margin-bottom: 0.25em;
@@ -136,7 +142,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;
   }