metanorma-iso 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4aececcab24bcc1cf73e4ccaeb5b09d4dee655365401dbcfe659efe98233e65
-  data.tar.gz: c94f52a47cfb911bbd0386aba74596b5713248f8bb0630a0c5a2059afdc1d47a
+  metadata.gz: 62383db44746d5687ee8f592669444896cb5f24b79265194a496ef11b0ad0c40
+  data.tar.gz: 8ce7b65a8d65719729bde2e6a78c442aef2281262b850e16e2bc8d6b3c3210d1
 SHA512:
-  metadata.gz: 9a50262b7cddf480a0da235510757d0f5bf2784d4d3875900f63c8f28f0206482d648a366041f917edc9146f3665bc8eced9744e3bcc8638f4c6559605a5db6f
-  data.tar.gz: 6311eaa0ba4d80312075298fb9e5815e551d0dd7e1af65eb5a3ce89df0e2f161f5d629a094cc21c8172bed798e9e0af768a2af4c6f87aa8575459329b44cc239
+  metadata.gz: c5b9244680bc5f548676e5a5b77e26456bbaa3f4bb47125a38053b19ca83a34ac7c37d23ccdc45b12dc568832e9c157f010dbc5417171efd41708b85187c484e
+  data.tar.gz: e5f05e8738f30968928dbebcadf19709da40afc102d909918f63517af96fae7cb92b4f8189952d02eb3f38ada00ed2078e38d096fab2ddecf1dc86d139b3faa2

data/lib/isodoc/iso/base_convert.rb

@@ -27,7 +27,7 @@ module IsoDoc
       def example_p_parse(node, div)
         name = node.at(ns("./fmt-name"))
         para = node.at(ns("./p")) || node.at(ns("./semx/p"))
-        div.p **attr_code(class: example_p_class) do |p|
+        div.p(**attr_code(class: example_p_class)) do |p|
           name and p.span class: "example_label" do |s|
             name.children.each { |n| parse(n, s) }
           end
@@ -68,12 +68,6 @@ module IsoDoc
         end
       end
 
-      def admonition_class(node)
-        if node["type"] == "editorial" then "zzHelp"
-        else super
-        end
-      end
-
       def admonition_p_parse(node, div)
         admonition_name_in_first_para(node, div)
       end
@@ -83,13 +77,6 @@ module IsoDoc
         para << " "
       end
 
-      def figure_name_parse(_node, div, name)
-        name.nil? and return
-        div.p class: "FigureTitle", style: "text-align:center;" do |p|
-          name.children.each { |n| parse(n, p) }
-        end
-      end
-
       def top_element_render(elem, out)
         if %w(clause terms definitions).include?(elem.name) &&
             elem.parent.name == "sections" &&
@@ -100,10 +87,10 @@ module IsoDoc
       end
 
       def clause_etc1(clause, out, num)
-        out.div **attr_code(
+        out.div(**attr_code(
           id: clause["id"],
           class: clause.name == "definitions" ? "Symbols" : nil,
-        ) do |div|
+        )) do |div|
           num = num + 1
           clause_name(clause, clause&.at(ns("./fmt-title")), div, nil)
           clause.elements.each do |e|
@@ -114,15 +101,28 @@ module IsoDoc
 
       def table_parse(node, out)
         @in_table = true
-        table_title_parse(node, out)
-        measurement_units(node, out)
-        out.table **table_attrs(node) do |t|
+        out.table(**table_attrs(node)) do |t|
+          table_title_parse(node, t)
           table_parse_core(node, t)
           table_parse_tail(node, t)
         end
         @in_table = false
       end
 
+      def table_title_parse(node, out)
+        name = node.at(ns("./fmt-name"))
+        summ = node["summary"]
+        meas = node.at(ns("./note[@type = 'units']"))
+        name || summ || meas or return
+        out.caption do |p|
+          children_parse(name, p)
+          measurement_units(node, p)
+          summ and p.span style: "display:none" do |s|
+            s << summ
+          end
+        end
+      end
+
       def table_parse_tail(node, out)
         (key = node.at(ns("./key"))) && parse(key, out)
         node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
@@ -134,8 +134,8 @@ module IsoDoc
       end
 
       def figure_parse1(node, out)
-        measurement_units(node, out)
-        out.div **figure_attrs(node) do |div|
+        out.figure(**figure_attrs(node)) do |div|
+          measurement_units(node, out)
           node.children.each do |n|
             n.name == "note" && n["type"] == "units" and next
             parse(n, div) unless n.name == "fmt-name"
@@ -158,7 +158,7 @@ module IsoDoc
         super
         docxml.xpath("//tfoot//div[@class = 'figdl']/p[@class = 'ListTitle']")
           .each do |p|
-            p["align"] = "left"
+          p["align"] = "left"
         end
         docxml
       end

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

@@ -319,6 +319,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }
@@ -865,14 +870,14 @@ nav {
     width: 100%;
   }
 }
-.figure .SourceTitle,
+figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
 }
-.figure,
+figure,
 pre,
 .pseudocode {
   background-color: #f7f7f7;
@@ -884,26 +889,26 @@ pre,
   font-size: {{normalfontsize}};
 }
 
-div.figure .FigureTitle, div.figure .figure-title {
+figure figcaption {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
 }
-div.figure > img, div.figure > svg {
+figure > img, figure > svg {
   margin-left: auto;
   margin-right: auto;
   display: block;
   max-width: 100%;
   height: auto;
 }
-div.figure {
+figure {
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -1130,17 +1135,21 @@ p.NormRef, div.Biblio, div.NormRef {
   margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3.5em;
+}
+
 /*
 3.6 Source Code + figures
 */
-.figure .SourceTitle,
+figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
 }
-.figure,
+figure,
 pre,
 .pseudocode {
   background-color: #f7f7f7;
@@ -1176,8 +1185,7 @@ pre {
   text-align: left;
 }
 
-.figure-title,
-.FigureTitle,
+figcaption,
 .SourceTitle,
 .AdmonitionTitle,
 .RecommendationTitle {
@@ -1291,7 +1299,7 @@ table.rouge-line-table td, table.rouge-line-table th {
   padding: 0em !important;
 }
 
-p.TableTitle {
+table > caption {
   text-align: center;
   margin-top: 2.5em;
   font-weight: 800;
@@ -1436,16 +1444,13 @@ span.keyword {
 }
 
 .Admonition p,
-.admonition p,
-.zzHelp p {
+.admonition p {
   margin: 0;
 }
 
-div.zzHelp {
+div.Admonition.AdmonitionEditorial {
   color: green;
-  padding: 0.5em;
-  margin: 1.5em 0 1.5em 0;
-  text-align: left;
+  background-color: white;
 }
 
 /* Collapse TOC */

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

@@ -330,18 +330,18 @@ nav {
     }
 }
 
-.figure,
+figure,
 pre,
 .pseudocode {
     @include pseudocodeBlock(#f7f7f7);
     font-size: $normalfontsize;
 }
 
-div.figure {
+figure {
     @include figureBlock();
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -496,11 +496,15 @@ p.NormRef, div.Biblio, div.NormRef {
     margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3.5em;
+}
+
 /*
 3.6 Source Code + figures
 */
 
-.figure,
+figure,
 pre,
 .pseudocode {
     @include pseudocodeBlock(#f7f7f7);
@@ -515,15 +519,14 @@ pre {
 @include recommendationBlock();
 @include listBlock();
 
-.figure-title,
-.FigureTitle,
+figcaption,
 .SourceTitle,
 .AdmonitionTitle,
 .RecommendationTitle {
     @include blockTitle()
 }
 
-.figure dl {
+figure dl {
 }
 
 /*
@@ -601,7 +604,7 @@ table.rouge-line-table td, table.rouge-line-table th {
     padding: 0em !important;
 }
 
-p.TableTitle {
+table > caption {
     text-align: center;
     margin-top: 2.5em;
     font-weight: 800;
@@ -744,16 +747,14 @@ span.keyword {
 }
 
 .Admonition p,
-.admonition p,
-.zzHelp p {
+.admonition p
+{
     margin: 0;
 }
 
-div.zzHelp {
+div.Admonition.AdmonitionEditorial {
   color: green;
-  padding: 0.5em;
-  margin: 1.5em 0 1.5em 0;
-  text-align: left;
+  background-color: white;
 }
 
 /* Collapse TOC */

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

@@ -319,6 +319,11 @@ svg {
   display: block; /* ← removes unwanted inline spacing */
 }
 
+/* style dfn by override in flavor */
+dfn {
+  font-style: inherit;
+}
+
 #standard-band {
   background-color: #0AC442;
 }
@@ -814,14 +819,14 @@ nav {
     width: 100%;
   }
 }
-.figure .SourceTitle,
+figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
 }
-.figure,
+figure,
 pre,
 .pseudocode {
   background-color: #f7f7f7;
@@ -833,26 +838,26 @@ pre,
   font-size: {{normalfontsize}};
 }
 
-div.figure .FigureTitle, div.figure .figure-title {
+figure figcaption {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
 }
-div.figure > img, div.figure > svg {
+figure > img, figure > svg {
   margin-left: auto;
   margin-right: auto;
   display: block;
   max-width: 100%;
   height: auto;
 }
-div.figure {
+figure {
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -1195,17 +1200,21 @@ p.Biblio, p.NormRef, div.Biblio, div.NormRef {
   margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3.5em;
+}
+
 /*
 3.6 Source Code + figures
 */
-.figure .SourceTitle,
+figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
 }
-.figure,
+figure,
 pre,
 .pseudocode {
   background-color: #f7f7f7;
@@ -1241,7 +1250,7 @@ pre {
   text-align: left;
 }
 
-.figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
+figcaption, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
@@ -1270,15 +1279,13 @@ pre {
   text-align: left;
 }
 
-.Admonition p, .zzHelp p {
+.Admonition p {
   margin: 0;
 }
 
-div.zzHelp {
+div.Admonition.AdmonitionEditorial {
   color: green;
-  padding: 0.5em;
-  margin: 1.5em 0 1.5em 0;
-  text-align: left;
+  background-color: white;
 }
 
 /*
@@ -1357,7 +1364,7 @@ td > p:last-child, th > p:last-child {
   margin-bottom: 0em;
 }
 
-p.TableTitle {
+table > caption {
   text-align: center;
   margin-top: 2.5em;
   font-weight: 800;

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

@@ -270,18 +270,18 @@ nav {
     }
 }
 
-.figure,
+figure,
 pre,
 .pseudocode {
     @include pseudocodeBlock(#f7f7f7);
     font-size: $normalfontsize;
 }
 
-div.figure {
+figure {
     @include figureBlock();
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -530,11 +530,15 @@ p.Biblio, p.NormRef, div.Biblio, div.NormRef {
     margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3.5em;
+}
+
 /*
 3.6 Source Code + figures
 */
 
-.figure,
+figure,
 pre,
 .pseudocode {
     @include pseudocodeBlock(#f7f7f7);
@@ -549,11 +553,11 @@ pre {
 @include recommendationBlock();
 @include listBlock();
 
-.figure-title, .FigureTitle, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
+figcaption, .SourceTitle, .AdmonitionTitle, .RecommendationTitle {
     @include blockTitle()
 }
 
-.figure dl {
+figure dl {
 }
 
 /*
@@ -580,15 +584,13 @@ pre {
     text-align: left;
 }
 
-.Admonition p, .zzHelp p {
+.Admonition p {
     margin: 0;
 }
 
-div.zzHelp {
+div.Admonition.AdmonitionEditorial {
   color: green;
-  padding: 0.5em;
-  margin: 1.5em 0 1.5em 0;
-  text-align: left;
+  background-color: white;
 }
 
 
@@ -636,7 +638,7 @@ td > p:last-child, th > p:last-child {
 }
 
 
-p.TableTitle {
+table > caption {
     text-align: center;
     margin-top: 2.5em;
     font-weight: 800;

data/lib/isodoc/iso/html_convert.rb

@@ -115,7 +115,14 @@ module IsoDoc
 
       def ol_attrs(node)
         ret = super
-        ret.merge(class: OL_STYLE.invert[ret[:type]])
+        klass = OL_STYLE.invert[ret[:type]]
+        ret = ret.merge(class: klass)
+        if (start = node["start"]) && klass
+          start_val = start.to_i - 1
+          existing_style = ret[:style] ? "#{ret[:style]};" : ""
+          ret = ret.merge(style: "#{existing_style}counter-reset: #{klass} #{start_val}")
+        end
+        ret
       end
 
       include BaseConvert