isodoc 1.7.2 → 1.7.5

data/lib/isodoc/presentation_function/inline.rb

@@ -1,3 +1,5 @@
+require "metanorma-utils"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, _target)
@@ -130,7 +132,7 @@ module IsoDoc
       loc = @i18n.locality[type] || type.sub(/^locality:/, "")
       loc = case node["case"]
             when "lowercase" then loc.downcase
-            else loc.capitalize
+            else Metanorma::Utils.strict_capitalize_first(loc)
             end
       " #{loc}"
     end
@@ -161,32 +163,62 @@ module IsoDoc
 
     def concept1(node)
       xref = node&.at(ns("./xref/@target"))&.text or
-        return concept_render(node, node["ital"] || "true",
-                              node["ref"] || "true")
+        return concept_render(node, ital: node["ital"] || "true",
+                                    ref: node["ref"] || "true",
+                                    linkref: node["linkref"] || "true",
+                                    linkmention: node["linkmention"] || "false")
       if node.at(ns("//definitions//dt[@id = '#{xref}']"))
-        concept_render(node, node["ital"] || "false", node["ref"] || "false")
-      else concept_render(node, node["ital"] || "true", node["ref"] || "true")
+        concept_render(node, ital: node["ital"] || "false",
+                             ref: node["ref"] || "false",
+                             linkref: node["linkref"] || "true",
+                             linkmention: node["linkmention"] || "false")
+      else concept_render(node, ital: node["ital"] || "true",
+                                ref: node["ref"] || "true",
+                                linkref: node["linkref"] || "true",
+                                linkmention: node["linkmention"] || "false")
       end
     end
 
-    def concept_render(node, ital, ref)
+    def concept_render(node, opts)
       node&.at(ns("./refterm"))&.remove
       r = node.at(ns("./renderterm"))
-      r&.next = " "
-      if ital == "true" then r&.name = "em"
-      else r&.replace(r&.children)
+      ref = node.at(ns("./xref | ./eref | ./termref"))
+      ref && opts[:ref] != "false" and r&.next = " "
+      opts[:ital] == "true" and r&.name = "em"
+      if opts[:linkmention] == "true" && !r.nil? && !ref.nil?
+        ref2 = ref.clone
+        r2 = r.clone
+        r.replace(ref2).children = r2
+      end
+      concept1_ref(node, ref, opts)
+      if opts[:ital] == "false"
+        r = node.at(ns(".//renderterm"))
+        r&.replace(r&.children)
       end
-      concept1_ref(node, ref)
       node.replace(node.children)
     end
 
-    def concept1_ref(node, ref)
-      r = node.at(ns("./xref | ./eref | ./termref")) or return
-      return r.remove if ref == "false"
+    def concept1_ref(_node, ref, opts)
+      ref.nil? and return
+      return ref.remove if opts[:ref] == "false"
+
+      r = concept1_ref_content(ref)
+      ref = r.at("./descendant-or-self::xmlns:xref | "\
+                 "./descendant-or-self::xmlns:eref | "\
+                 "./descendant-or-self::xmlns:termref")
+      %w(xref eref).include? ref&.name and get_linkend(ref)
+      if opts[:linkref] == "false" && %w(xref eref).include?(ref&.name)
+        ref.replace(ref.children)
+      end
+    end
 
-      if non_locality_elems(r).select { |c| !c.text? || /\S/.match(c) }.empty?
-        r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml))
-      else r.replace("[#{r.to_xml}]")
+    def concept1_ref_content(ref)
+      if non_locality_elems(ref).select do |c|
+           !c.text? || /\S/.match(c)
+         end.empty?
+        ref.replace(@i18n.term_defined_in.sub(/%/,
+                                              ref.to_xml))
+      else ref.replace("[#{ref.to_xml}]")
       end
     end
 

data/lib/isodoc/presentation_function/math.rb

@@ -1,5 +1,6 @@
 require "twitter_cldr"
 require "bigdecimal"
+require "mathml2asciimath"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -70,7 +71,15 @@ module IsoDoc
       locale
     end
 
+    def asciimath_dup(node)
+      return if @suppressasciimathdup
+
+      a = MathML2AsciiMath.m2a(node.to_xml)
+      node.next = "<!-- #{a} -->"
+    end
+
     def mathml1(node, locale)
+      asciimath_dup(node)
       localize_maths(node, locale)
       return unless node.elements.size == 1 && node.elements.first.name == "mn"
 

data/lib/isodoc/presentation_function/section.rb

@@ -78,12 +78,23 @@ module IsoDoc
       i = display_order_at(docxml, "//clause[@type = 'scope']", i)
       i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
       i = display_order_at(docxml, "//sections/terms | "\
-                           "//sections/clause[descendant::terms]", i)
+                                   "//sections/clause[descendant::terms]", i)
       i = display_order_at(docxml, "//sections/definitions", i)
       i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
       i = display_order_xpath(docxml, "//annex", i)
       i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
       display_order_xpath(docxml, "//indexsect", i)
     end
+
+    def clausetitle(docxml)
+      docxml.xpath(ns("//variant-title[@type = 'toc']")).each(&:remove)
+    end
+
+    def toc(docxml)
+      docxml.xpath(ns("//toc//xref[text()]")).each do |x|
+        lbl = @xrefs.get[x["target"]][:label] or next
+        x.children.first.previous = "#{lbl}<tab/>"
+      end
+    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -34,6 +34,8 @@ module IsoDoc
       term docxml
       references docxml
       index docxml
+      clausetitle docxml
+      toc docxml
       display_order docxml
     end
 
@@ -47,6 +49,7 @@ module IsoDoc
       termexample docxml
       note docxml
       termnote docxml
+      termdefinition docxml
       permission docxml
       requirement docxml
       recommendation docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.7.2".freeze
+  VERSION = "1.7.5".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -46,9 +46,9 @@ module IsoDoc::WordFunction
       end
     end
 
-    def insert_tab(out, n)
-      out.span **attr_code(style: "mso-tab-count:#{n}") do |span|
-        [1..n].each { span << "&#xA0; " }
+    def insert_tab(out, count)
+      out.span **attr_code(style: "mso-tab-count:#{count}") do |span|
+        [1..count].each { span << "&#xA0; " }
       end
     end
 
@@ -137,7 +137,7 @@ module IsoDoc::WordFunction
       name = node&.at(ns("./name"))&.remove
       div.p **{ class: "Note" } do |p|
         p.span **{ class: "note_label" } do |s|
-          name and name.children.each { |n| parse(n, s) }
+          name&.children&.each { |n| parse(n, s) }
         end
         insert_tab(p, 1)
         node.first_element_child.children.each { |n| parse(n, p) }
@@ -149,7 +149,7 @@ module IsoDoc::WordFunction
       name = node&.at(ns("./name"))&.remove
       div.p **{ class: "Note" } do |p|
         p.span **{ class: "note_label" } do |s|
-          name and name.children.each { |n| parse(n, s) }
+          name&.children&.each { |n| parse(n, s) }
         end
         insert_tab(p, 1)
       end

data/lib/isodoc/xslfo_convert.rb

@@ -37,12 +37,12 @@ module IsoDoc
         input_filename,
         output_filename || "#{filename}.#{@suffix}",
         File.join(@libdir, pdf_stylesheet(docxml)),
-        pdf_options(docxml)
+        pdf_options(docxml),
       )
     end
 
     def xref_parse(node, out)
-      out.a(**{ "href": target_pdf(node) }) { |l| l << get_linkend(node) }
+      out.a(**{ href: target_pdf(node) }) { |l| l << get_linkend(node) }
     end
 
     def input_xml_path(input_filename, xml_file, debug)

data/lib/isodoc.rb

@@ -17,8 +17,8 @@ require "isodoc/convert"
 require "isodoc/metadata"
 require "isodoc/html_convert"
 require "isodoc/word_convert"
-require "isodoc/pdf_convert"
 require "isodoc/xslfo_convert"
+require "isodoc/pdf_convert"
 require "isodoc/headlesshtml_convert"
 require "isodoc/presentation_xml_convert"
 require "isodoc/xref"

data/spec/assets/outputtest/iso.international-standard.xsl

@@ -1436,7 +1436,7 @@
 	</xsl:template>
 
 	<xsl:template match="iso:sourcecode">
-		<fo:block font-family="Courier" font-size="9pt" margin-bottom="12pt">
+		<fo:block font-family="Courier New" font-size="9pt" margin-bottom="12pt">
 			<xsl:choose>
 				<xsl:when test="@lang = 'en'"/>
 				<xsl:otherwise>
@@ -2760,7 +2760,7 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template xmlns:iec="http://riboseinc.com/isoxml" xmlns:itu="https://open.ribose.com/standards/itu" xmlns:nist="http://www.nist.gov/metanorma" xmlns:un="https://open.ribose.com/standards/unece" xmlns:csd="https://www.calconnect.org/standards/csd" match="*[local-name()='tt']">
-		<fo:inline font-family="Courier" font-size="10pt">
+		<fo:inline font-family="Courier New" font-size="10pt">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template xmlns:iec="http://riboseinc.com/isoxml" xmlns:itu="https://open.ribose.com/standards/itu" xmlns:nist="http://www.nist.gov/metanorma" xmlns:un="https://open.ribose.com/standards/unece" xmlns:csd="https://www.calconnect.org/standards/csd" match="*[local-name()='del']">

data/spec/isodoc/blocks_spec.rb

@@ -1572,6 +1572,7 @@ RSpec.describe IsoDoc do
         <inherit>/ss/584/2015/level/1</inherit>
         <inherit><eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></inherit>
         <subject>user</subject>
+        <subject>non-user</subject>
         <classification> <tag>control-class</tag> <value>Technical</value> </classification><classification> <tag>priority</tag> <value>P0</value> </classification><classification> <tag>family</tag> <value>System and Communications Protection</value> </classification><classification> <tag>family</tag> <value>System and Communications Protocols</value> </classification>
         <description>
           <p id="_">I recommend <em>this</em>.</p>
@@ -1611,6 +1612,9 @@ RSpec.describe IsoDoc do
         <import exclude="true">
           <sourcecode id="_">success-response()</sourcecode>
         </import>
+        <component exclude='false' class='component1'>
+                  <p id='_'>Hello</p>
+                </component>
       </permission>
           </foreword></preface>
           <bibliography><references id="_bibliography" obligation="informative" normative="false" displayorder="2">
@@ -1628,6 +1632,7 @@ RSpec.describe IsoDoc do
         <inherit>/ss/584/2015/level/1</inherit>
         <inherit><eref type="inline" bibitemid="rfc2616" citeas="RFC 2616">RFC 2616 (HTTP/1.1)</eref></inherit>
         <subject>user</subject>
+        <subject>non-user</subject>
         <classification> <tag>control-class</tag> <value>Technical</value> </classification><classification> <tag>priority</tag> <value>P0</value> </classification><classification> <tag>family</tag> <value>System and Communications Protection</value> </classification><classification> <tag>family</tag> <value>System and Communications Protocols</value> </classification>
         <description>
           <p id="_">I recommend <em>this</em>.</p>
@@ -1668,6 +1673,9 @@ RSpec.describe IsoDoc do
         <import exclude="true">
           <sourcecode id="_">success-response()</sourcecode>
         </import>
+        <component exclude='false' class='component1'>
+                  <p id='_'>Hello</p>
+                </component>
       </permission>
           </foreword></preface>
           <bibliography><references id="_bibliography" obligation="informative" normative="false"  displayorder='2'>
@@ -1684,6 +1692,7 @@ RSpec.describe IsoDoc do
                     <div class="permission" id='_' style='page-break-after: avoid;page-break-inside: avoid;'>
                     <p class="RecommendationTitle">Permission 1:<br/>/ogc/recommendation/wfs/2</p>
                     <p><i>Subject: user<br/>
+                    Subject: non-user<br/>
             Inherits: /ss/584/2015/level/1
             <br/>
             Inherits: <a href='#rfc2616'>RFC 2616 (HTTP/1.1)</a>
@@ -1702,6 +1711,7 @@ RSpec.describe IsoDoc do
                 <p id="_">The following code will be run for verification:</p>
                 <pre id="_" class="prettyprint ">CoreRoot(success): HttpResponse<br/>&#160;&#160;&#160;&#160;&#160; if (success)<br/>&#160;&#160;&#160;&#160;&#160; recommendation(label: success-response)<br/>&#160;&#160;&#160;&#160;&#160; end<br/>&#160;&#160;&#160; </pre>
               </div>
+              <div class='requirement-component1'> <p id='_'>Hello</p> </div>
             </div>
                   </div>
                   <p class="zzSTDTitle1"/>
@@ -1770,6 +1780,9 @@ RSpec.describe IsoDoc do
         <import exclude="true">
           <sourcecode id="_">success-response()</sourcecode>
         </import>
+        <component exclude='false' class='component1'>
+                  <p id='_'>Hello</p>
+                </component>
       </requirement>
           </foreword></preface>
           </iso-standard>
@@ -1824,6 +1837,9 @@ RSpec.describe IsoDoc do
                 <import exclude='true'>
                   <sourcecode id='_'>success-response()</sourcecode>
                 </import>
+                <component exclude='false' class='component1'>
+                  <p id='_'>Hello</p>
+                </component>
               </requirement>
             </foreword>
           </preface>
@@ -1851,6 +1867,7 @@ RSpec.describe IsoDoc do
                     <p id="_">The following code will be run for verification:</p>
                     <pre id="_" class="prettyprint ">CoreRoot(success): HttpResponse<br/>&#160;&#160;&#160;&#160;&#160; if (success)<br/>&#160;&#160;&#160;&#160;&#160; recommendation(label: success-response)<br/>&#160;&#160;&#160;&#160;&#160; end<br/>&#160;&#160;&#160; </pre>
                   </div>
+              <div class='requirement-component1'> <p id='_'>Hello</p> </div>
                 </div>
                       </div>
                       <p class="zzSTDTitle1"/>
@@ -1915,6 +1932,9 @@ RSpec.describe IsoDoc do
         <import exclude="true">
           <sourcecode id="_">success-response()</sourcecode>
         </import>
+        <component exclude='false' class='component1'>
+                  <p id='_'>Hello</p>
+                </component>
       </requirement>
           </foreword></preface>
           </iso-standard>
@@ -1970,6 +1990,9 @@ RSpec.describe IsoDoc do
                <import exclude="true">
                  <sourcecode id="_">success-response()</sourcecode>
                </import>
+               <component exclude='false' class='component1'>
+                  <p id='_'>Hello</p>
+                </component>
              </requirement>
                  </foreword></preface>
                  </iso-standard>
@@ -2026,6 +2049,7 @@ RSpec.describe IsoDoc do
                                <br/>
                              </pre>
                            </div>
+                          <div class='requirement-component1'> <p id='_'>Hello</p> </div>
                          </div>
                        </div>
                        <p class='zzSTDTitle1'/>
@@ -2089,6 +2113,9 @@ RSpec.describe IsoDoc do
         <import exclude="true">
           <sourcecode id="_">success-response()</sourcecode>
         </import>
+        <component exclude='false' class='component1'>
+                  <p id='_'>Hello</p>
+                </component>
       </recommendation>
           </foreword></preface>
           </iso-standard>
@@ -2151,6 +2178,9 @@ RSpec.describe IsoDoc do
                  <import exclude='true'>
                    <sourcecode id='_'>success-response()</sourcecode>
                  </import>
+                 <component exclude='false' class='component1'>
+                  <p id='_'>Hello</p>
+                </component>
                </recommendation>
              </foreword>
            </preface>
@@ -2178,6 +2208,7 @@ RSpec.describe IsoDoc do
                     <p id="_">The following code will be run for verification:</p>
                     <pre id="_" class="prettyprint ">CoreRoot(success): HttpResponse<br/>&#160;&#160;&#160;&#160;&#160; if (success)<br/>&#160;&#160;&#160;&#160;&#160; recommendation(label: success-response)<br/>&#160;&#160;&#160;&#160;&#160; end<br/>&#160;&#160;&#160; </pre>
                   </div>
+                          <div class='requirement-component1'> <p id='_'>Hello</p> </div>
                 </div>
                       </div>
                       <p class="zzSTDTitle1"/>
@@ -2503,73 +2534,156 @@ RSpec.describe IsoDoc do
         </sections>
       </standard-document>
     INPUT
+    presxml = <<~INPUT
+           <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation" version="1.10.2">
+         <bibdata type="standard">
+           <title language="en" format="text/plain">Document title</title>
+           <language current="true">en</language>
+           <script current="true">Latn</script>
+           <status>
+             <stage language="">published</stage>
+           </status>
+           <copyright>
+             <from>2021</from>
+           </copyright>
+           <ext>
+             <doctype language="">article</doctype>
+           </ext>
+         </bibdata>
+         <sections>
+           <clause id="clause1" inline-header="false" obligation="normative" displayorder="1">
+             <title depth="1">1.<tab/>Clause 1</title>
+             <clause id="clause1A" inline-header="false" obligation="normative">
+               <title depth="2">1.1.<tab/>Clause 1A</title>
+               <clause id="clause1Aa" inline-header="false" obligation="normative">
+                 <title depth="3">1.1.1.<tab/>Clause 1Aa</title>
+               </clause>
+               <clause id="clause1Ab" inline-header="false" obligation="normative">
+                 <title depth="3">1.1.2.<tab/>Clause 1Ab</title>
+               </clause>
+             </clause>
+             <clause id="clause1B" inline-header="false" obligation="normative">
+               <title depth="2">1.2.<tab/>Clause 1B</title>
+               <clause id="clause1Ba" inline-header="false" obligation="normative">
+                 <title depth="3">1.2.1.<tab/>Clause 1Ba</title>
+               </clause>
+             </clause>
+           </clause>
+           <clause id="clause2" inline-header="false" obligation="normative" displayorder="2">
+             <title depth="1">2.<tab/>Clause 2</title>
+             <p id="A">And introducing: </p>
+             <toc>
+               <ul id="B">
+                 <li>
+                   <xref target="clause1A">1.1<tab/>Clause 1A</xref>
+                 </li>
+                 <li>
+                   <ul id="C">
+                     <li>
+                       <xref target="clause1Aa">1.1.1<tab/>Clause 1Aa</xref>
+                     </li>
+                     <li>
+                       <xref target="clause1Ab">1.1.2<tab/>Clause 1Ab</xref>
+                     </li>
+                   </ul>
+                 </li>
+                 <li>
+                   <xref target="clause1B">1.2<tab/>Clause 1B</xref>
+                 </li>
+                 <li>
+                   <ul id="D">
+                     <li>
+                       <xref target="clause1Ba">1.2.1<tab/>Clause 1Ba</xref>
+                     </li>
+                   </ul>
+                 </li>
+               </ul>
+             </toc>
+             <toc>
+               <ul id="E">
+                 <li>
+                   <xref target="clause1A">1.1<tab/>Clause 1A</xref>
+                 </li>
+                 <li>
+                   <xref target="clause1B">1.2<tab/>Clause 1B</xref>
+                 </li>
+               </ul>
+             </toc>
+           </clause>
+         </sections>
+       </standard-document>
+    INPUT
     output = <<~OUTPUT
          #{HTML_HDR}
-            <p class='zzSTDTitle1'>Document title</p>
-            <div id='clause1'>
-              <h1>Clause 1</h1>
-              <div id='clause1A'>
-                <h2>Clause 1A</h2>
-                <div id='clause1Aa'>
-                  <h3>Clause 1Aa</h3>
-                </div>
-                <div id='clause1Ab'>
-                  <h3>Clause 1Ab</h3>
-                </div>
-              </div>
-              <div id='clause1B'>
-                <h2>Clause 1B</h2>
-                <div id='clause1Ba'>
-                  <h3>Clause 1Ba</h3>
-                </div>
-              </div>
-            </div>
-            <div id='clause2'>
-              <h1>Clause 2</h1>
-              <p id='A'>And introducing: </p>
-              <div class='toc'>
-                <ul id='B'>
-                  <li>
-                    <a href='#clause1A'>Clause 1A</a>
-                  </li>
-                  <li>
-                    <ul id='C'>
-                      <li>
-                        <a href='#clause1Aa'>Clause 1Aa</a>
-                      </li>
-                      <li>
-                        <a href='#clause1Ab'>Clause 1Ab</a>
-                      </li>
-                    </ul>
-                  </li>
-                  <li>
-                    <a href='#clause1B'>Clause 1B</a>
-                  </li>
-                  <li>
-                    <ul id='D'>
-                      <li>
-                        <a href='#clause1Ba'>Clause 1Ba</a>
-                      </li>
-                    </ul>
-                  </li>
-                </ul>
-              </div>
-              <div class='toc'>
-                <ul id='E'>
-                  <li>
-                    <a href='#clause1A'>Clause 1A</a>
-                  </li>
-                  <li>
-                    <a href='#clause1B'>Clause 1B</a>
-                  </li>
-                </ul>
-              </div>
-            </div>
-          </div>
-        </body>
-      </html>
+                      <p class='zzSTDTitle1'>Document title</p>
+             <div id='clause1'>
+               <h1>1.&#160; Clause 1</h1>
+               <div id='clause1A'>
+                 <h2>1.1.&#160; Clause 1A</h2>
+                 <div id='clause1Aa'>
+                   <h3>1.1.1.&#160; Clause 1Aa</h3>
+                 </div>
+                 <div id='clause1Ab'>
+                   <h3>1.1.2.&#160; Clause 1Ab</h3>
+                 </div>
+               </div>
+               <div id='clause1B'>
+                 <h2>1.2.&#160; Clause 1B</h2>
+                 <div id='clause1Ba'>
+                   <h3>1.2.1.&#160; Clause 1Ba</h3>
+                 </div>
+               </div>
+             </div>
+             <div id='clause2'>
+               <h1>2.&#160; Clause 2</h1>
+               <p id='A'>And introducing: </p>
+               <div class='toc'>
+                 <ul id='B'>
+                   <li>
+                     <a href='#clause1A'>1.1&#160; Clause 1A</a>
+                   </li>
+                   <li>
+                     <ul id='C'>
+                       <li>
+                         <a href='#clause1Aa'>1.1.1&#160; Clause 1Aa</a>
+                       </li>
+                       <li>
+                         <a href='#clause1Ab'>1.1.2&#160; Clause 1Ab</a>
+                       </li>
+                     </ul>
+                   </li>
+                   <li>
+                     <a href='#clause1B'>1.2&#160; Clause 1B</a>
+                   </li>
+                   <li>
+                     <ul id='D'>
+                       <li>
+                         <a href='#clause1Ba'>1.2.1&#160; Clause 1Ba</a>
+                       </li>
+                     </ul>
+                   </li>
+                 </ul>
+               </div>
+               <div class='toc'>
+                 <ul id='E'>
+                   <li>
+                     <a href='#clause1A'>1.1&#160; Clause 1A</a>
+                   </li>
+                   <li>
+                     <a href='#clause1B'>1.2&#160; Clause 1B</a>
+                   </li>
+                 </ul>
+               </div>
+             </div>
+           </div>
+         </body>
+       </html>
     OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+     .convert("test", input, true)
+     .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+     .to be_equivalent_to xmlpp(presxml)
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
-  .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 end