metanorma-iso 1.10.2 → 1.10.3

data/spec/isodoc/terms_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe IsoDoc do
             <term id="paddy1">
               <preferred><expression><name>paddy</name></expression></preferred>
               <domain>rice</domain>
-              <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+              <definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbal-definition></definition>
               <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
                 <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
                 <ul>
@@ -35,7 +35,7 @@ RSpec.describe IsoDoc do
               <admitted><expression><name>paddy rice</name></expression></admitted>
               <admitted><expression><name>rough rice</name></expression></admitted>
               <deprecates><expression><name>cargo rice</name></expression></deprecates>
-              <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+              <definition><verbal-definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbal-definition></definition>
               <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
                 <p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
               </termnote>
@@ -54,10 +54,10 @@ RSpec.describe IsoDoc do
             </term>
             <term id="A">
               <preferred><expression><name>term1</name></expression></preferred>
-              <definition><verbaldefinition>term1 definition</verbaldefinition></definition>
+              <definition><verbal-definition>term1 definition</verbal-definition></definition>
               <term id="B">
               <preferred><expression><name>term2</name></expression></preferred>
-              <definition><verbaldefinition>term2 definition</verbaldefinition></definition>
+              <definition><verbal-definition>term2 definition</verbal-definition></definition>
               </term>
             </term>
           </terms>
@@ -65,16 +65,16 @@ RSpec.describe IsoDoc do
       </iso-standard>
     INPUT
     presxml = <<~OUTPUT
+      <?xml version='1.0'?>
       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
         <sections>
           <terms id='_terms_and_definitions' obligation='normative' displayorder='1'>
           <title depth='1'>1<tab/>Terms and Definitions</title>
 
             <term id='paddy1'><name>1.1</name>
-              <preferred>paddy</preferred>
-              <domain>rice</domain>
+              <preferred><strong>paddy</strong></preferred>
               <definition>
-                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>&lt;rice&gt; rice retaining its husk after threshing</p>
               </definition>
               <termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f892'>
                 <name>EXAMPLE 1</name>
@@ -97,7 +97,7 @@ RSpec.describe IsoDoc do
               </termsource>
             </term>
             <term id='paddy'><name>1.2</name>
-              <preferred>paddy</preferred>
+              <preferred><strong>paddy</strong></preferred>
               <admitted>paddy rice</admitted>
               <admitted>rough rice</admitted>
               <deprecates>cargo rice</deprecates>
@@ -129,11 +129,11 @@ RSpec.describe IsoDoc do
             </term>
             <term id='A'>
               <name>1.3</name>
-              <preferred>term1</preferred>
+              <preferred><strong>term1</strong></preferred>
               <definition>term1 definition</definition>
               <term id='B'>
                 <name>1.3.1</name>
-                <preferred>term2</preferred>
+                <preferred><strong>term2</strong></preferred>
                 <definition>term2 definition</definition>
               </term>
             </term>
@@ -147,7 +147,7 @@ RSpec.describe IsoDoc do
             <p class="zzSTDTitle1"/>
             <div id="_terms_and_definitions">
               <h1>1&#160; Terms and Definitions</h1>
-              <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
+              <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;"><b>paddy</b></p>
 
               <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
               <div class="example" id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
@@ -168,7 +168,7 @@ RSpec.describe IsoDoc do
                   [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
               [/TERMREF]</p>
               <p class="TermNum" id="paddy">1.2</p>
-              <p class="Terms" style="text-align:left;">paddy</p>
+              <p class="Terms" style="text-align:left;"><b>paddy</b></p>
               <p class="AltTerms" style="text-align:left;">paddy rice</p>
               <p class="AltTerms" style="text-align:left;">rough rice</p>
               <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
@@ -194,10 +194,10 @@ RSpec.describe IsoDoc do
               <p>[TERMREF]<a href="#ISO7301">ISO 7301:2011, 3.1</a>
               [/TERMREF]</p>
               <p class='TermNum' id='A'>1.3</p>
-              <p class='Terms' style='text-align:left;'>term1</p>
+              <p class='Terms' style='text-align:left;'><b>term1</b></p>
                term1 definition
               <p class='TermNum' id='B'>1.3.1</p>
-              <p class='Terms' style='text-align:left;'>term2</p>
+              <p class='Terms' style='text-align:left;'><b>term2</b></p>
                term2 definition
             </div>
           </div>
@@ -207,7 +207,7 @@ RSpec.describe IsoDoc do
 
     word = <<~OUTPUT
       <div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">&#160; </span>Terms and Definitions</h1>
-        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
+        <p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;"><b>paddy</b></p>
 
         <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f" class="Definition">&lt;rice&gt; rice retaining its husk after threshing</p>
         <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><p><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">&#160; </span>Foreign seeds, husks, bran, sand, dust.</p><ul>
@@ -222,7 +222,7 @@ RSpec.describe IsoDoc do
             [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
         [/TERMREF]</p>
         <p class="TermNum" id="paddy">1.2</p>
-        <p class="Terms" style="text-align:left;">paddy</p>
+        <p class="Terms" style="text-align:left;"><b>paddy</b></p>
         <p class="AltTerms" style="text-align:left;">paddy rice</p>
         <p class="AltTerms" style="text-align:left;">rough rice</p>
         <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
@@ -237,10 +237,10 @@ RSpec.describe IsoDoc do
         <p class="Source">[TERMREF]<a href="#ISO7301">ISO 7301:2011, 3.1</a>
         [/TERMREF]</p>
         <p class='TermNum' id='A'>1.3</p>
-        <p class='Terms' style='text-align:left;'>term1</p>
+        <p class='Terms' style='text-align:left;'><b>term1</b></p>
          term1 definition
         <p class='TermNum' id='B'>1.3.1</p>
-        <p class='Terms' style='text-align:left;'>term2</p>
+        <p class='Terms' style='text-align:left;'><b>term2</b></p>
          term2 definition
       </div>
     OUTPUT

data/spec/isodoc/xref_spec.rb

@@ -1002,7 +1002,7 @@ RSpec.describe IsoDoc do
             <title>2</title>
             <term id="_waxy_rice">
               <name>2.1</name>
-              <preferred>waxy rice</preferred>
+              <preferred><strong>waxy rice</strong></preferred>
               <termnote id="note1">
                 <name>Note 1 to entry</name>
                 <p id="_b0cb3dfd-78fc-47dd-a339-84070d947463">The starch of waxy rice consists almost entirely of amylopectin. The
@@ -1012,7 +1012,7 @@ RSpec.describe IsoDoc do
             </term>
             <term id="_nonwaxy_rice">
               <name>2.2</name>
-              <preferred>nonwaxy rice</preferred>
+              <preferred><strong>nonwaxy rice</strong></preferred>
               <termnote id="note2">
                 <name>Note 1 to entry</name>
                 <p id="_b0cb3dfd-78fc-47dd-a339-84070d947463">The starch of waxy rice consists almost entirely of amylopectin. The
@@ -1199,7 +1199,7 @@ RSpec.describe IsoDoc do
               </title>
               <term id='J'>
                 <name>3.1.1</name>
-                <preferred>Term2</preferred>
+                <preferred><strong>Term2</strong></preferred>
               </term>
             </terms>
             <definitions id='K' inline-header='true'>

data/spec/metanorma/processor_spec.rb

@@ -8,6 +8,100 @@ RSpec.describe Metanorma::Iso::Processor do
   registry.register(Metanorma::Iso::Processor)
   processor = registry.find_processor(:iso)
 
+  inputxml = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+<bibdata type="standard">
+<title language="en" format="text/plain" type="main">English</title>
+<title language="en" format="text/plain" type="title-main">English</title>
+<title language="fr" format="text/plain" type="main">French</title>
+<title language="fr" format="text/plain" type="title-main">French</title>
+<docidentifier type="ISO">ISO DIR 1</docidentifier><docidentifier type="iso-with-lang">ISO DIR 1(F)</docidentifier><docidentifier type="iso-reference">ISO DIR 1(F)</docidentifier>
+<docnumber>1</docnumber>
+<contributor>
+<role type="author"/>
+<organization>
+<name>International Organization for Standardization</name>
+<abbreviation>ISO</abbreviation>
+</organization>
+</contributor>
+<contributor>
+<role type="publisher"/>
+<organization>
+<name>International Organization for Standardization</name>
+<abbreviation>ISO</abbreviation>
+</organization>
+</contributor>
+<language>fr</language>
+<script>Latn</script>
+<status>
+<stage abbreviation="IS">60</stage>
+<substage>60</substage>
+</status>
+<copyright>
+<from>2021</from>
+<owner>
+<organization>
+<name>International Organization for Standardization</name>
+<abbreviation>ISO</abbreviation>
+</organization>
+</owner>
+</copyright>
+<ext>
+<doctype>directive</doctype>
+<subdoctype>vocabulary</subdoctype>
+<editorialgroup>
+<technical-committee/>
+<subcommittee/>
+<workgroup/>
+</editorialgroup>
+<structuredidentifier>
+<project-number>ISO 1</project-number>
+</structuredidentifier>
+<stagename>International standard</stagename>
+</ext>
+</bibdata>
+<boilerplate>
+  <copyright-statement>
+    <clause>
+      <title>DOCUMENT PROT&#201;G&#201; PAR COPYRIGHT</title>
+    <p id="boilerplate-year">&#169; ISO 2021</p>
+
+  <p id="boilerplate-message">
+Droits de reproduction r&#233;serv&#233;s. Sauf indication contraire, aucune partie de cette publication ne
+peut &#234;tre reproduite ni utilis&#233;e sous quelque forme que ce soit et par aucun proc&#233;d&#233;, &#233;lectronique
+ou m&#233;canique, y compris la photocopie, l&#8217;affichage sur l&#8217;internet ou sur un Intranet, sans
+autorisation &#233;crite pr&#233;alable. Les demandes d&#8217;autorisation peuvent &#234;tre adress&#233;es &#224; l&#8217;ISO &#224;
+l&#8217;adresse ci-apr&#232;s ou au comit&#233; membre de l&#8217;ISO dans le pays du demandeur.
+  </p>
+
+  <p id="boilerplate-address" align="left">
+    ISO copyright office<br/>
+    Ch. de Blandonnet 8 &#8226; CP 401<br/>
+    CH-1214 Vernier, Geneva, Switzerland<br/>
+    Tel.&#160;&#160;+ 41 22 749 01 11<br/>
+    Fax&#160;&#160;+ 41 22 749 09 47<br/>
+    Email: copyright@iso.org<br/>
+    Website: www.iso.org
+  </p>
+    <p id="boilerplate-place">
+    Publi&#233; en Suisse
+  </p>
+</clause>
+  </copyright-statement>
+
+
+</boilerplate>
+      <sections>
+        <terms id="H" obligation="normative"><title>1&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</title>
+          <term id="J">
+            <name>1.1</name>
+            <preferred>Term2</preferred>
+          </term>
+        </terms>
+      </sections>
+    </iso-standard>
+  INPUT
+
   it "registers against metanorma" do
     expect(processor).not_to be nil
   end
@@ -35,27 +129,18 @@ RSpec.describe Metanorma::Iso::Processor do
       .to be_equivalent_to xmlpp(output)
   end
 
-  it "generates HTML from IsoDoc XML" do
+  it "generates HTML from Metanorma XML" do
     FileUtils.rm_f "test.xml"
-    processor.output(<<~"INPUT", "test.xml", "test.html", :html)
-      <iso-standard xmlns="http://riboseinc.com/isoxml">
-        <sections>
-          <terms id="H" obligation="normative"><title>1&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</title>
-            <term id="J">
-              <name>1.1</name>
-              <preferred>Term2</preferred>
-            </term>
-          </terms>
-        </sections>
-      </iso-standard>
-    INPUT
+    FileUtils.rm_f "test.html"
+    processor.output(inputxml, "test.xml", "test.html", :html)
     expect(xmlpp(File.read("test.html", encoding: "utf-8")
       .gsub(%r{^.*<main}m, "<main")
       .gsub(%r{</main>.*}m, "</main>")))
       .to be_equivalent_to xmlpp(<<~"OUTPUT")
         <main class="main-section">
           <button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
-          <p class="zzSTDTitle1"></p>
+          <div class='authority'> </div>
+          <p class='zzSTDTitle1'>French</p>
           <div id="H"><h1 id="toc0">1&#xA0; Terms, Definitions, Symbols and Abbreviated Terms</h1>
             <h2 class="TermNum" id="J">1.1</h2>
             <p class="Terms" style="text-align:left;">Term2</p>
@@ -63,4 +148,15 @@ RSpec.describe Metanorma::Iso::Processor do
         </main>
       OUTPUT
   end
+
+  it "generates STS from Metanorma XML" do
+    FileUtils.rm_f "test.xml"
+    FileUtils.rm_f "test.sts.xml"
+    FileUtils.rm_f "test.iso.sts.xml"
+    File.open("test.xml", "w") { |f| f.write inputxml }
+    processor.output(inputxml, "test.xml", "test.sts.xml", :sts)
+    processor.output(inputxml, "test.xml", "test.iso.sts.xml", :isosts)
+    expect(File.exist?("test.sts.xml")).to be true
+    expect(File.exist?("test.iso.sts.xml")).to be true
+  end
 end