metanorma-standoc 1.11.3 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7756f8b45a6897bf3a40e48df348a746bc75b30820597fa8ceadedcbbceb89d9
-  data.tar.gz: e62b62dd699df95d46bd13c18656bf3504c3a34936ff0a094d224d12a9f44987
+  metadata.gz: 3cd9e01037065cfbc5d497224c5d6ed6ac5088cd4b4df6f404e08a7c552abcf9
+  data.tar.gz: 7eefde1d2046eedbce2c46c8841059210480a43cdea3656bbfd7cfbb068df1b1
 SHA512:
-  metadata.gz: 9776d2bfd161b5500e5ac9e8ea47a9597befe1642880a18fdc86839ceee0688e879d37de0bd9000420294f6a0094f455c840643e091a11da0b65489434a44bf9
-  data.tar.gz: 4f4d5f119ce92541ee1a89320fdc094352f3ca2ac885f1d52438279e4f70b995d0f87b4f7d034bafc63f05e2192b9ae8b7f4063dd1972525d773ec2f66e27dd1
+  metadata.gz: 3fcf00d490fa157fdae4029bd261b1d2b3caf09b2d9a7d8e25c67cc0f4e7a474b6baadfedd1f8b9c90d63a8cad59184bafc237500f46cca83364ffd61dc60914
+  data.tar.gz: afb262667567181815daf62ba580d124874d1bba843ff6cda2c39a861acf6ec246c04766d8e5822ae3dd77326e22d687cbb255a0562644f1fb07f97f39c67416

data/lib/asciidoctor/standoc/cleanup_terms_designations.rb

@@ -2,6 +2,17 @@ module Asciidoctor
   module Standoc
     module Cleanup
       def termdef_stem_cleanup(xmldoc)
+        termdef_stem2admitted(xmldoc)
+        xmldoc.xpath("//term//expression/name[stem]").each do |n|
+          test = n.dup
+          test.at("./stem").remove
+          next unless test.text.strip.empty?
+
+          n.parent.name = "letter-symbol"
+        end
+      end
+
+      def termdef_stem2admitted(xmldoc)
         xmldoc.xpath("//term/p/stem").each do |a|
           if initial_formula(a.parent)
             parent = a.parent
@@ -9,12 +20,8 @@ module Asciidoctor
           end
         end
         xmldoc.xpath("//term/formula").each do |a|
-          if initial_formula(a)
+          initial_formula(a) and
             a.replace("<admitted>#{term_expr(a.children.to_xml)}</admitted>")
-          end
-        end
-        xmldoc.xpath("//term//expression/name[stem]").each do |n|
-          n.parent.name = "letter-symbol"
         end
       end
 
@@ -38,7 +45,6 @@ module Asciidoctor
         xmldoc.xpath("//term[dl[@metadata = 'true']]").each do |t|
           t.xpath("./dl[@metadata = 'true']").each do |dl|
             prev = related2pref(dl_to_designation(dl)) or next
-            #require "debug"; binding.b if prev.parent.name == "related"
             term_dl_to_designation_metadata(prev, dl)
             term_dl_to_term_metadata(prev, dl)
             term_dl_to_expression_metadata(prev, dl)

data/lib/asciidoctor/standoc/front.rb

@@ -120,15 +120,19 @@ module Asciidoctor
       end
 
       def metadata_getrelation(node, xml, type, desc = nil)
-        docs = node.attr(desc || type) || return
+        docs = node.attr(desc || type) or return
         HTMLEntities.new.decode(docs).split(/;\s*/).each do |d|
-          id = d.split(/,\s*/)
-          xml.relation **{ type: relation_normalise(type) } do |r|
-            desc.nil? or r.description relation_normalise(desc)
-            fetch_ref(r, d, nil, **{}) or r.bibitem do |b|
-              b.title id[1] || "--"
-              b.docidentifier id[0]
-            end
+          metadata_getrelation1(d, xml, type, desc)
+        end
+      end
+
+      def metadata_getrelation1(doc, xml, type, desc)
+        id = doc.split(/,\s*/)
+        xml.relation **{ type: relation_normalise(type) } do |r|
+          desc.nil? or r.description desc.gsub(/-/, " ")
+          fetch_ref(r, doc, nil, **{}) or r.bibitem do |b|
+            b.title id[1] || "--"
+            b.docidentifier id[0]
           end
         end
       end

data/lib/asciidoctor/standoc/isodoc.rng

@@ -1973,7 +1973,11 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
@@ -1987,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>

data/lib/asciidoctor/standoc/render.rb

@@ -73,16 +73,14 @@ module Asciidoctor
       end
 
       def pdf_extract_attributes(node)
-        attrs =
-          %w(pdf-encrypt pdf-encryption-length pdf-user-password
-             pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
-             pdf-allow-assemble-document pdf-allow-edit-annotations
-             pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
-             pdf-allow-access-content pdf-encrypt-metadata)
-            .each_with_object({}) do |x, m|
-            m[x.gsub(/-/, "").to_i] = node.attr(x)
-          end
-        html_extract_attributes(node).merge(attrs)
+        %w(pdf-encrypt pdf-encryption-length pdf-user-password
+           pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
+           pdf-allow-assemble-document pdf-allow-edit-annotations
+           pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
+           pdf-allow-access-content pdf-encrypt-metadata)
+          .each_with_object({}) do |x, m|
+          m[x.gsub(/-/, "").to_i] = node.attr(x)
+        end
       end
 
       def doc_converter(node)

data/lib/asciidoctor/standoc/section.rb

@@ -190,6 +190,19 @@ module Asciidoctor
           xml_section << content
         end
       end
+
+      def floating_title_attrs(node)
+        attr_code(id_attr(node).merge(align: node.attr("align"),
+                                      type: "floating-title"))
+      end
+
+      def floating_title(node)
+        noko do |xml|
+          xml.p **floating_title_attrs(node) do |xml_t|
+            xml_t << node.title
+          end
+        end.join("\n")
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/terms.rb

@@ -105,8 +105,14 @@ module Asciidoctor
         else
           attrs = term_source_attrs(node, seen_xref)
           attrs.delete(:text)
-          xml_t.origin seen_xref.children[0].content, **attr_code(attrs)
+          xml_t.origin **attr_code(attrs) do |o|
+            o << seen_xref.children[0].children.to_xml
+          end
         end
+        add_term_source_mod(xml_t, match)
+      end
+
+      def add_term_source_mod(xml_t, match)
         match[:text] && xml_t.modification do |mod|
           mod.p { |p| p << match[:text].sub(/^\s+/, "") }
         end

data/lib/isodoc/html/htmlstyle.css

@@ -76,6 +76,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; }
@@ -87,6 +93,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 {
@@ -467,27 +476,27 @@ p.document-stage {
 /*
     3.1 Titles
 */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
   color: #C70039;
   font-weight: 300;
   margin-top: 1.6em;
   margin-bottom: 0.3em; }
 
-h1 {
+h1, .h1 {
   font-size: 1.6em;
   text-transform: uppercase;
   margin-top: 2em; }
 
-h1#content {
+h1#content, #content.h1 {
   margin-top: 2em; }
 
-h2 {
+h2, .h2 {
   margin-top: 1.3em;
   font-size: 1.3em;
   font-weight: 400; }
 
-h3 {
+h3, .h3 {
   margin-top: 1.1em;
   font-size: 1.1em;
   font-weight: 100; }
@@ -791,7 +800,7 @@ p {
   margin-top: 1em;
   margin-bottom: 1em; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 /*
@@ -942,7 +951,7 @@ To top button
 @media print {
   .document-info, nav, .copyright {
     page-break-before: always; }
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; }
   .note, .figure, pre, .pseudocode, table {
@@ -965,12 +974,12 @@ To top button
   h1.content {
     margin-top: 2em;
     line-height: 2.5em; }
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5; }
-  h2 {
+  h2, .h2 {
     font-size: 1.2em; }
-  h3 {
+  h3, .h3 {
     font-size: 1em; }
   .Note {
     background-color: #fff495;

data/lib/isodoc/html/htmlstyle.scss

@@ -155,7 +155,7 @@ p.document-stage {
     3.1 Titles
 */
 
-  h1,h2,h3,h4,h5,h6 {
+  h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6 {
     font-family: $headerfont;
     color: #C70039;
     font-weight: 300;
@@ -163,23 +163,23 @@ p.document-stage {
     margin-bottom: 0.3em;
   }
 
-  h1 {
+  h1,.h1 {
     font-size: 1.6em;
     text-transform: uppercase;
     margin-top: 2em;
   }
 
-  h1#content {
+  h1#content,.h1#content {
       margin-top: 2em;
   }
 
-  h2 {
+  h2,.h2 {
     margin-top: 1.3em;
     font-size: 1.3em;
     font-weight: 400;
   }
 
-  h3 {
+  h3,.h3 {
     margin-top: 1.1em;
     font-size: 1.1em;
     font-weight: 100;
@@ -471,7 +471,7 @@ p {
   margin-bottom: 1em;
 }
 
-h2 p {
+h2 p, .h2 p {
   display: inline;
 }
 
@@ -643,7 +643,7 @@ To top button
       page-break-before: always;
   }
 
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
@@ -685,16 +685,16 @@ To top button
     line-height: 2.5em;
   }
 
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5;
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.11.3".freeze
+    VERSION = "1.11.4".freeze
   end
 end

data/spec/asciidoctor/base_spec.rb

@@ -849,6 +849,47 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes document relations by description" do
+    mock_relaton_relation_descriptions
+    input = <<~INPUT
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :normatively-cited-in: ABC
+
+    INPUT
+    output = <<~OUTPUT
+      <standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
+      <bibdata type='standard'>
+        <title language='en' format='text/plain'>Document title</title>
+        <language>en</language>
+        <script>Latn</script>
+        <status>
+          <stage>published</stage>
+        </status>
+        <copyright>
+          <from>2021</from>
+        </copyright>
+        <relation type='isCitedIn'>
+          <description>normatively cited in</description>
+          <bibitem>
+            <title>--</title>
+            <docidentifier>ABC</docidentifier>
+          </bibitem>
+        </relation>
+        <ext>
+          <doctype>article</doctype>
+        </ext>
+      </bibdata>
+      <sections> </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(Asciidoctor.convert(input, *OPTIONS)))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "reads scripts into blank HTML document" do
     FileUtils.rm_f "test.html"
     Asciidoctor.convert(<<~"INPUT", *OPTIONS)
@@ -986,4 +1027,11 @@ QU1FOiB0ZXN0Cgo=
         "International Standards Organization",
       )
   end
+
+  def mock_relaton_relation_descriptions
+    allow_any_instance_of(::Asciidoctor::Standoc::Front)
+      .to receive(:relaton_relation_descriptions).and_return(
+        "normatively-cited-in" => "isCitedIn",
+      )
+  end
 end

data/spec/asciidoctor/cleanup_terms_spec.rb

@@ -705,6 +705,114 @@ RSpec.describe Asciidoctor::Standoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "differentiates stem-only and mixed terms" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      == Terms and Definitions
+
+      === stem:[t_90]
+
+      Time
+
+      === stem:[t_90]-sensitivity
+
+      Sensitivity
+
+      === sensitivity to stem:[t_90]
+
+      Sensitivity #2
+    INPUT
+    output = <<~OUTPUT
+             #{BLANK_HDR}
+               <sections>
+           <terms id='_' obligation='normative'>
+             <title>Terms and definitions</title>
+             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+             <term id='term-_-t90-'>
+               <preferred>
+                 <letter-symbol>
+                   <name>
+                     <stem type='MathML'>
+                       <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                         <msub>
+                           <mrow>
+                             <mi>t</mi>
+                           </mrow>
+                           <mrow>
+                             <mn>90</mn>
+                           </mrow>
+                         </msub>
+                       </math>
+                     </stem>
+                   </name>
+                 </letter-symbol>
+               </preferred>
+               <definition>
+                 <verbal-definition>
+                   <p id='_'>Time</p>
+                 </verbal-definition>
+               </definition>
+             </term>
+             <term id='term-t90-sensitivity'>
+               <preferred>
+                 <expression>
+                   <name>
+                     <stem type='MathML'>
+                       <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                         <msub>
+                           <mrow>
+                             <mi>t</mi>
+                           </mrow>
+                           <mrow>
+                             <mn>90</mn>
+                           </mrow>
+                         </msub>
+                       </math>
+                     </stem>
+                     -sensitivity
+                   </name>
+                 </expression>
+               </preferred>
+               <definition>
+                 <verbal-definition>
+                   <p id='_'>Sensitivity</p>
+                 </verbal-definition>
+               </definition>
+             </term>
+             <term id='term-sensitivity-to-t90'>
+               <preferred>
+                 <expression>
+                   <name>
+                     sensitivity to 
+                     <stem type='MathML'>
+                       <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                         <msub>
+                           <mrow>
+                             <mi>t</mi>
+                           </mrow>
+                           <mrow>
+                             <mn>90</mn>
+                           </mrow>
+                         </msub>
+                       </math>
+                     </stem>
+                   </name>
+                 </expression>
+               </preferred>
+               <definition>
+                 <verbal-definition>
+                   <p id='_'>Sensitivity #2</p>
+                 </verbal-definition>
+               </definition>
+             </term>
+           </terms>
+         </sections>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
   it "moves term domains out of the term definition paragraph" do
     input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
@@ -1224,7 +1332,7 @@ RSpec.describe Asciidoctor::Standoc do
       x^2^:: Definition
     INPUT
     output = <<~OUTPUT
-           <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='1.11.2'>
+           <standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='#{Metanorma::Standoc::VERSION}'>
          <bibdata type='standard'>
            <title language='en' format='text/plain'>Document title</title>
            <language>en</language>