metanorma-standoc 3.1.4 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07dd4263f3139ccb6d6f742e52e7ccf48a4d5f585dc442fd4fe22019f68a2173
-  data.tar.gz: 013cd7e28bb591c2b09b138de8debe85831bc30460ed6192aae2dd9d4434de89
+  metadata.gz: 9bc2bfaaaf9871ba417d1d455867a0d67b6df3f219886aa290a6195583eacafc
+  data.tar.gz: 3f2a6511903492d4853334fc0780143a7b01d13e8d8f6d27630631208fc10b5d
 SHA512:
-  metadata.gz: 4a856c20cb73fb75982c1e473d5d959e1aeed8cd1354eb53af33d612d8769e03b4f85229bfd93adaafb0840e1a4071eca7c99e49e4ed5ae0dd2211e55d6ec8fa
-  data.tar.gz: bcc1fa89fe0ddd3b33c0bf9d0bd7696a1668a9d123b289aff61d4f82969bcdc54c7dc0088e7debb3d3256221eefbc5609b8e0ac3d074c62dfcbde826e5b995e7
+  metadata.gz: 3485d18dfbe8b3474770f3e97d80652225539cca579b06cf1f0ca9a2ebe414c8ba1663a9b099eabecdea30cd3c630c2bebc54dfc1eb7dd954ffe89155d9d1da4
+  data.tar.gz: 8953152a143fbc28f9117e1f593b47e26f06b54eebd6498b71b98c5b5ea91a2240e41fae83af96d5f0a1ae618ebf0cb0d55b6f787db68d4ceb3509937493413c

data/lib/isodoc/html/htmlstyle.css

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -477,11 +467,13 @@ body {
   line-height: 1.4em;
   color: #1d1d1d;
   background-color: #ffffff;
-  font-weight: 400;
 }
 body main {
   margin: 0 3em 0 6em;
 }
+body {
+  font-weight: 400;
+}
 body pre * {
   font-family: {{bodyfont}} !important;
 }
@@ -489,10 +481,6 @@ body pre * {
 /*
     2. Responsive navigation layout
 */
-#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -544,6 +532,10 @@ body pre * {
     color: black;
   }
 }
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -632,12 +624,6 @@ body pre * {
   }
 }
 
-div.figure {
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-}
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -650,6 +636,12 @@ div.figure > img, div.figure > svg {
   max-width: 100%;
   height: auto;
 }
+div.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 /*
     Document types + stages
@@ -969,6 +961,13 @@ p.Biblio, p.NormRef {
 /*
     3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -979,13 +978,6 @@ pre,
   margin: 2em 0 1em 0;
   overflow: auto;
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1032,12 +1024,14 @@ pre {
   padding: 1.2em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2.7em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2.7em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
@@ -1318,7 +1312,6 @@ To top button
   cursor: pointer;
   padding: 10px 15px 10px 15px;
   border-radius: 4px;
-  text-transform: uppercase;
 }
 #myBtn:hover {
   opacity: 1;
@@ -1328,6 +1321,9 @@ To top button
     display: none;
   }
 }
+#myBtn {
+  text-transform: uppercase;
+}
 #myBtn a.anchorjs-link:hover {
   background: none;
   color: #485094;

data/lib/metanorma/standoc/base.rb

@@ -139,7 +139,7 @@ module Metanorma
           %w(presentation semantic).each do |t|
             /^#{t}-metadata-/.match?(k) or next
             k = k.sub(/^#{t}-metadata-/, "")
-            quoted_csv_split(v.gsub("&#", "&#"))&.each do |c|
+            csv_split(v.gsub("&#", "&#"), ",", encode: false)&.each do |c|
               ret << "<#{t}-metadata><#{k}>#{c}</#{k}></#{t}-metadata>"
             end
           end

data/lib/metanorma/standoc/cleanup.rb

@@ -83,7 +83,9 @@ module Metanorma
         ext_contributor_cleanup(xmldoc) # feeds: bibdata_cleanup
         ext_dochistory_cleanup(xmldoc) # feeds: bibdata_cleanup
         bibdata_cleanup(xmldoc) # feeds: boilerplate_cleanup
-        boilerplate_cleanup(xmldoc) # feeds: xref_cleanup for new <<>> introduced
+        boilerplate_cleanup(xmldoc) # feeds: xref_cleanup for new <<>> 
+        # introduced, pres_metadata_cleanup
+        pres_metadata_cleanup(xmldoc)
         xref_cleanup(xmldoc)
         svgmap_cleanup(xmldoc) # feeds: img_cleanup
         review_cleanup(xmldoc)
@@ -209,6 +211,16 @@ module Metanorma
         ins = add_misc_container(xmldoc)
         ins << @metadata_attrs
       end
+
+      def pres_metadata_cleanup(xmldoc)
+        @isodoc ||= isodoc(@lang, @script, @locale)
+        isodoc_bibdata_parse(xmldoc)
+        xmldoc.xpath("//presentation-metadata/* | //semantic-metadata/*")
+          .each do |x|
+          /\{\{|\{%/.match?(x) or next
+          x.children = @isodoc.populate_template(to_xml(x.children), nil)
+        end
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_boilerplate.rb

@@ -3,7 +3,7 @@ require_relative "cleanup_terms_boilerplate"
 module Metanorma
   module Standoc
     module Cleanup
-      def norm_ref_preface(ref)
+      def norm_ref_preface(ref, isodoc)
         ins = norm_ref_boilerplate_insert_location(ref)
         ins2 = norm_ref_process_boilerplate_note(ref)
         ins2 == :populated and return
@@ -12,7 +12,7 @@ module Metanorma
           %w(references bibitem).include? e.name
         end
         pref = refs.empty? ? @i18n.norm_empty_pref : @i18n.norm_with_refs_pref
-        ins.next = boilerplate_snippet_convert(pref)
+        ins.next = boilerplate_snippet_convert(pref, isodoc)
       end
 
       def norm_ref_process_boilerplate_note(ref)
@@ -40,18 +40,27 @@ module Metanorma
         "//bibliography/references[@normative = 'true'][not(@hidden)] | " \
         "//bibliography/clause[.//references[@normative = 'true']]".freeze
 
+      def dup_with_namespace(elem)
+        ret = elem.dup
+        ret.add_namespace(nil, xml_namespace)
+        ret
+      end
+
       def boilerplate_isodoc(xmldoc)
         # prevent infinite recursion of asciidoc boilerplate processing
         # in termdef_boilerplate_insert and initial_boilerplate
         xmldoc.at("//metanorma-extension/semantic-metadata/" \
                   "headless[text() = 'true']") and return nil
-        x = xmldoc.dup
-        x.root.add_namespace(nil, xml_namespace)
-        xml = Nokogiri::XML(x.to_xml)
         @isodoc ||= isodoc(@lang, @script, @locale)
+        isodoc_bibdata_parse(xmldoc)
+        @isodoc
+      end
+
+      def isodoc_bibdata_parse(xmldoc)
         # initialise @isodoc.xrefs, for @isodoc.xrefs.info
+        x = dup_with_namespace(xmldoc.root)
+        xml = Nokogiri::XML(x.to_xml)
         @isodoc.bibdata(xml) # do i18n
-        @isodoc
       end
 
       def unwrap_boilerplate_clauses(xmldoc, xpath)
@@ -71,7 +80,7 @@ module Metanorma
         termdef_boilerplate_insert(xmldoc, isodoc)
         unwrap_boilerplate_clauses(xmldoc, self.class::TERM_CLAUSE)
         if f = xmldoc.at(self.class::NORM_REF)
-          norm_ref_preface(f)
+          norm_ref_preface(f, isodoc)
           unwrap_boilerplate_clauses(f, ".")
         end
         initial_boilerplate(xmldoc, isodoc)
@@ -210,16 +219,16 @@ module Metanorma
         /\.adoc(\.liquid)?$/.match?(file) or return ret
 
         # Split content into macro and non-macro parts
-        parts = ret.split(/(#{ADOC_MACRO_PATTERN})/)
+        parts = ret.split(/(#{ADOC_MACRO_PATTERN})/o)
 
         parts.map.with_index do |part, index|
-          if index.odd? && is_valid_macro?(part)
+          if index.odd? && valid_macro?(part)
             # This is a macro - leave unchanged
             part
           else
             # Not a macro - wrap {{ }} patterns
             part.gsub(/(?<!\{)(\{\{[^{}]+\}\})(?!\})/,
-                     "pass-format:metanorma[++\\1++]")
+                      "pass-format:metanorma[++\\1++]")
           end
         end.join
       end
@@ -240,7 +249,7 @@ module Metanorma
 
       private
 
-      def is_valid_macro?(text)
+      def valid_macro?(text)
         # Simple validation - does it look like a macro?
         text.match?(/^\S+:[^\[]*\[.*\]$/)
       end

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -51,9 +51,9 @@ module Metanorma
       NO_SYMABBR = "[.//definitions[not(@type)]]".freeze
       SYMABBR = "[.//definitions[@type = 'symbols']]" \
                 "[.//definitions[@type = 'abbreviated_terms']]".freeze
-      SYMnoABBR = "[.//definitions[@type = 'symbols']]" \
+      SYM_NO_ABBR = "[.//definitions[@type = 'symbols']]" \
                   "[not(.//definitions[@type = 'abbreviated_terms'])]".freeze
-      ABBRnoSYM = "[.//definitions[@type = 'abbreviated_terms']]" \
+      ABBR_NO_SYM = "[.//definitions[@type = 'abbreviated_terms']]" \
                   "[not(.//definitions[@type = 'symbols'])]".freeze
 
       def section_names_terms_cleanup(xml)
@@ -81,9 +81,9 @@ module Metanorma
 
       def section_names_terms1_cleanup(xml)
         auto_name_terms(xml) or return
-        replace_title(xml, "//terms#{SYMnoABBR} | //clause[@type = 'terms']#{SYMnoABBR}",
+        replace_title(xml, "//terms#{SYM_NO_ABBR} | //clause[@type = 'terms']#{SYM_NO_ABBR}",
                       @i18n&.termsdefsymbols, true)
-        replace_title(xml, "//terms#{ABBRnoSYM} | //clause[@type = 'terms']#{ABBRnoSYM}",
+        replace_title(xml, "//terms#{ABBR_NO_SYM} | //clause[@type = 'terms']#{ABBR_NO_SYM}",
                       @i18n&.termsdefabbrev, true)
         replace_title(xml, "//terms#{SYMABBR} | //clause[@type = 'terms']#{SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
@@ -124,12 +124,12 @@ module Metanorma
                 unless acc[:parent] == :term # don't count Term > Term twice
                   :term
                 end
-              elsif hasterm && node.at("./self::*#{SYMnoABBR}") then :tsna
-              elsif hasterm && node.at("./self::*#{ABBRnoSYM}") then :tans
+              elsif hasterm && node.at("./self::*#{SYM_NO_ABBR}") then :tsna
+              elsif hasterm && node.at("./self::*#{ABBR_NO_SYM}") then :tans
               elsif hasterm && node.at("./self::*#{SYMABBR}") then :tsa
               elsif hasterm && node.at("./self::*#{NO_SYMABBR}") then :tnsa
-              elsif node.at("./self::*#{SYMnoABBR}") then :sna
-              elsif node.at("./self::*#{ABBRnoSYM}") then :ans
+              elsif node.at("./self::*#{SYM_NO_ABBR}") then :sna
+              elsif node.at("./self::*#{ABBR_NO_SYM}") then :ans
               elsif node.at("./self::*#{SYMABBR}") then :sa
               elsif node.at("./self::*#{NO_SYMABBR}") then :nsa
               elsif node.name == "definitions" # ignore

data/lib/metanorma/standoc/cleanup_terms_boilerplate.rb

@@ -11,19 +11,20 @@ module Metanorma
         e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "??")
       end
 
-      def boilerplate_snippet_convert(adoc)
-        ret = boilerplate_xml_cleanup(adoc2xml(adoc, backend.to_sym))
+      def boilerplate_snippet_convert(adoc, isodoc)
+        b = isodoc.populate_template(adoc, nil)
+        ret = boilerplate_xml_cleanup(adoc2xml(b, backend.to_sym))
         @i18n.l10n(ret.children.to_xml, @lang, @script)
       end
 
       def term_defs_boilerplate(div, source, term, _preface, isodoc)
         verify_term_defs_source(source)
         a = @i18n.term_def_boilerplate and
-          div.next = boilerplate_snippet_convert(a)
+          div.next = boilerplate_snippet_convert(a, isodoc)
         a = if source.empty? && term.nil? then @i18n.no_terms_boilerplate
             else term_defs_boilerplate_cont(source, term, isodoc)
             end
-        a and div.next = boilerplate_snippet_convert(a)
+        a and div.next = boilerplate_snippet_convert(a, isodoc)
       end
 
       def verify_term_defs_source(source)

data/lib/metanorma/standoc/converter.rb

@@ -34,11 +34,11 @@ module Metanorma
         block Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlock
         block_macro Metanorma::Plugin::Lutaml::LutamlKlassTableBlockMacro
         block_macro Metanorma::Plugin::Lutaml::LutamlEnumTableBlockMacro
+        block Metanorma::Plugin::Plantuml::BlockProcessor
+        block_macro Metanorma::Plugin::Plantuml::ImageBlockMacroProcessor
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::PassProtectPreprocessor
-        preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
-        preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Json2TextPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Yaml2TextPreprocessor
         preprocessor Metanorma::Plugin::Lutaml::Data2TextPreprocessor
@@ -81,7 +81,6 @@ module Metanorma
         inline_macro Metanorma::Standoc::SourceIncludeInlineMacro
         block Metanorma::Standoc::ToDoAdmonitionBlock
         block Metanorma::Standoc::EditorAdmonitionBlock
-        block Metanorma::Standoc::PlantUMLBlockMacro
         block Metanorma::Standoc::PseudocodeBlockMacro
         block_macro Metanorma::Standoc::ColumnBreakBlockMacro
       end

data/lib/metanorma/standoc/front.rb

@@ -1,6 +1,7 @@
 require "date"
 require "pathname"
 require_relative "./front_contributor"
+require_relative "./front_ext"
 require "isoics"
 
 module Metanorma
@@ -53,17 +54,6 @@ module Metanorma
         end
       end
 
-      def metadata_ics(node, xml)
-        ics = node.attr("library-ics")
-        ics&.split(/,\s*/)&.each do |i|
-          xml.ics do |elem|
-            elem.code i
-            icsdata = Isoics.fetch i
-            elem.text_ icsdata.description
-          end
-        end
-      end
-
       def metadata_source(node, xml)
         node.attr("uri") && xml.uri(node.attr("uri"))
         %w(xml html pdf doc relaton).each do |t|
@@ -183,66 +173,37 @@ module Metanorma
         end
       end
 
-      def metadata_ext(node, ext)
-        metadata_doctype(node, ext)
-        metadata_subdoctype(node, ext)
-        metadata_flavor(node, ext)
-        metadata_ics(node, ext)
-        structured_id(node, ext)
-        metadata_coverpage_images(node, ext)
-      end
-
-      def structured_id(node, xml); end
-
-      def metadata_doctype(node, xml)
-        xml.doctype doctype(node)
-      end
-
-      def metadata_subdoctype(node, xml)
-        s = node.attr("docsubtype") and xml.subdoctype s
-      end
-
-      def metadata_flavor(_node, ext)
-        ext.flavor processor.new.asciidoctor_backend
-      end
-
       def metadata_note(node, xml); end
 
       def metadata_series(node, xml); end
 
       def title(node, xml)
-        title_english(node, xml)
-        title_otherlangs(node, xml)
-      end
-
-      def title_english(node, xml)
-        ["en"].each do |lang|
-          at = { language: lang, format: "text/plain" }
-          xml.title **attr_code(at) do |t|
-            title = Metanorma::Utils::asciidoc_sub(
-              node.attr("title") || node.attr("title-en") || node.attr("doctitle"),
-            )
-            t << title
-          end
-        end
+        title_main(node, xml)
+        title_other(node, xml)
       end
 
-      def title_otherlangs(node, xml)
+      # English plain title: :title: or implicit, typed as main
+      def title_main(node, xml)
+        title = node.attr("title") || node.attr("doctitle")
+        node.attr("title-en") and return
+        add_title_xml(xml, title, "en", "main")
+      end
+
+      def title_other(node, xml)
         node.attributes.each do |k, v|
-          /^title-(?<titlelang>.+)$/ =~ k or next
-          titlelang == "en" and next
-          xml.title v, { language: titlelang, format: "text/plain" }
+          /^title-(?<remainder>.+)$/ =~ k or next
+          type, language = remainder.split("-", 2)
+          if language.nil?
+            language = type
+            type = "main"
+          end
+          add_title_xml(xml, v, language, type)
         end
       end
 
-      def metadata_coverpage_images(node, xml)
-        %w(coverpage-image innercoverpage-image tocside-image
-           backpage-image).each do |n|
-          if a = node.attr(n)
-            xml.send n do |c|
-              a.split(",").each { |x| c.image src: x }
-            end
-          end
+      def add_title_xml(xml, content, language, type)
+        xml.title **attr_code(language: language, type: type) do |t|
+          t << Metanorma::Utils::asciidoc_sub(content)
         end
       end
     end

data/lib/metanorma/standoc/front_committee.rb

@@ -90,11 +90,13 @@ module Metanorma
                   agency_abbrev: opts.dig(:agency_abbrev, i), abbr: opts[:abbr],
                   committee: opts[:committee], default_org: opts[:default_org])
         end
-        org_attrs_add_committees(node, ret, opts, opts_orig)
+        if !opts_orig[:groups] || opts_orig[:groups].empty? then ret.first
+        else org_attrs_add_committees(node, ret, opts, opts_orig)
+        end
       end
 
       def org_attrs_add_committees(node, ret, opts, opts_orig)
-        opts_orig[:groups]&.each_with_index do |g, i|
+        opts_orig[:groups].each_with_index do |g, i|
           i.zero? and next
           contributors_committees_pad_multiples(ret.first, node, g)
           opts = committee_contrib_org_prep(node, g, nil, opts_orig)

data/lib/metanorma/standoc/front_contributor.rb

@@ -5,13 +5,22 @@ module Metanorma
   module Standoc
     module Front
       def metadata_author(node, xml)
-        org_contributor(node, xml,
-                        { source: ["publisher", "pub"], role: "author",
-                          default: default_publisher })
+        org_author(node, xml)
         personal_author(node, xml)
         committee_contributors(node, xml, default_publisher, {})
       end
 
+      def org_author(node, xml)
+        if node.attr("corporate-author")
+          org_contributor(node, xml, { source: ["corporate-author"],
+                                       role: "author" })
+        else
+          org_contributor(node, xml,
+                          { source: ["publisher", "pub"], role: "author",
+                            default: default_publisher })
+        end
+      end
+
       def personal_author(node, xml)
         (node.attr("fullname") || node.attr("surname")) and
           personal_author1(node, xml, "")

data/lib/metanorma/standoc/front_ext.rb

@@ -0,0 +1,50 @@
+module Metanorma
+  module Standoc
+    module Front
+      def metadata_ics(node, xml)
+        ics = node.attr("library-ics")
+        ics&.split(/,\s*/)&.each do |i|
+          xml.ics do |elem|
+            elem.code i
+            icsdata = Isoics.fetch i
+            elem.text_ icsdata.description
+          end
+        end
+      end
+
+      def metadata_ext(node, ext)
+        metadata_doctype(node, ext)
+        metadata_subdoctype(node, ext)
+        metadata_flavor(node, ext)
+        metadata_ics(node, ext)
+        structured_id(node, ext)
+        metadata_coverpage_images(node, ext)
+      end
+
+      def structured_id(node, xml); end
+
+      def metadata_doctype(node, xml)
+        xml.doctype doctype(node)
+      end
+
+      def metadata_subdoctype(node, xml)
+        s = node.attr("docsubtype") and xml.subdoctype s
+      end
+
+      def metadata_flavor(_node, ext)
+        ext.flavor processor.new.asciidoctor_backend
+      end
+
+      def metadata_coverpage_images(node, xml)
+        %w(coverpage-image innercoverpage-image tocside-image
+           backpage-image).each do |n|
+          if a = node.attr(n)
+            xml.send n do |c|
+              a.split(",").each { |x| c.image src: x }
+            end
+          end
+        end
+      end
+    end
+  end
+end