isodoc 1.2.6 → 1.2.7

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.6".freeze
+  VERSION = "1.2.7".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -183,7 +183,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def generate_header(filename, _dir)
       return nil unless @header
       template = IsoDoc::Common.liquid(File.read(@header, encoding: "UTF-8"))
-      meta = @meta.get
+      meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {})
       meta[:filename] = filename
       params = meta.map { |k, v| [k.to_s, v] }.to_h
       Tempfile.open(%w(header html), :encoding => "utf-8") do |f|

data/spec/assets/i18n.yaml

@@ -11,15 +11,22 @@ normref: Normaj citaĵoj
 bibliography: Bibliografio
 inform_annex: informa
 all_parts: ĉiuj partoj
+norm_annex: normative
 locality: {
   table: Tabelo
-  }
+}
 doctype_dict: {
-  brochure: broŝuro
-  }
+  brochure: broŝuro,
+  conference proceedings: konferencaktoj
+}
 stage_dict: {
   published: publikigita
 }
 substage_dict: {
   withdrawn: fortirita
-  }
+}
+array:
+    - elem1
+    - elem2
+    - {elem3: elem4, elem5: elem6}
+void:

data/spec/isodoc/blocks_spec.rb

@@ -87,32 +87,18 @@ RSpec.describe IsoDoc do
     <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation">
             <bibdata type="standard">
               <title language="en" format="text/plain">Document title</title>
-              <language>en</language>
-              <script>Latn</script>
+              <language current="true">en</language>
+              <script current="true">Latn</script>
               <status>
-                <stage>published</stage>
+                <stage language="">published</stage>
               </status>
               <copyright>
                 <from>2020</from>
               </copyright>
               <ext>
-                <doctype>article</doctype>
+                <doctype language="">article</doctype>
               </ext>
             </bibdata>
-            <local_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>2020</from>
-  </copyright>
-  <ext>
-    <doctype>article</doctype>
-  </ext>
-</local_bibdata>
             <sections>
               <clause id="A" inline-header="false" obligation="normative">
                 <title depth="1">1.<tab/>Change Clause</title>
@@ -248,7 +234,7 @@ RSpec.describe IsoDoc do
          </body>
        </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    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", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
@@ -2240,8 +2226,8 @@ end
     OUTPUT
   end
 
-   it "processes requirements in French (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+   it "processes requirements in French" do
+   input = <<~INPUT
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>
     <language>fr</language>
@@ -2295,133 +2281,63 @@ end
     </foreword></preface>
     </iso-standard>
     INPUT
-    <?xml version='1.0'?>
-       <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-         <bibdata>
-           <language>fr</language>
-           <script>Latn</script>
-         </bibdata>
-         <local_bibdata>
-  <language>fr</language>
-  <script>Latn</script>
-</local_bibdata>
-         <preface>
-           <foreword>
-             <requirement id='A' unnumbered='true'>
-               <name>Exigence</name>
-               <title>A New Requirement</title>
-               <label>/ogc/recommendation/wfs/2</label>
-               <inherit>/ss/584/2015/level/1</inherit>
-               <subject>user</subject>
-               <description>
-                 <p id='_'>
-                   I recommend
-                   <em>this</em>
-                   .
-                 </p>
-               </description>
-               <specification exclude='true' type='tabular'>
-                 <p id='_'>This is the object of the recommendation:</p>
-                 <table id='_'>
-                   <tbody>
-                     <tr>
-                       <td style='text-align:left;'>Object</td>
-                       <td style='text-align:left;'>Value</td>
-                     </tr>
-                     <tr>
-                       <td style='text-align:left;'>Mission</td>
-                       <td style='text-align:left;'>Accomplished</td>
-                     </tr>
-                   </tbody>
-                 </table>
-               </specification>
-               <description>
-                 <p id='_'>As for the measurement targets,</p>
-               </description>
-               <measurement-target exclude='false'>
-                 <p id='_'>The measurement target shall be measured as:</p>
-                 <formula id='B'>
-                   <name>1</name>
-                   <stem type='AsciiMath'>r/1 = 0</stem>
-                 </formula>
-               </measurement-target>
-               <verification exclude='false'>
-                 <p id='_'>The following code will be run for verification:</p>
-                 <sourcecode id='_'>
-                   CoreRoot(success): HttpResponse if (success) recommendation(label:
-                   success-response) end
-                 </sourcecode>
-               </verification>
-               <import exclude='true'>
-                 <sourcecode id='_'>success-response()</sourcecode>
-               </import>
-             </requirement>
-           </foreword>
-         </preface>
-         </iso-standard>
+
+    presxml = <<~OUTPUT
+    <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+           <bibdata>
+           <language current="true">fr</language>
+           <script current="true">Latn</script>
+           </bibdata>
+           <preface><foreword>
+           <requirement id="A" unnumbered="true"><name>Exigence</name>
+         <title>A New Requirement</title>
+         <label>/ogc/recommendation/wfs/2</label>
+         <inherit>/ss/584/2015/level/1</inherit>
+         <subject>user</subject>
+         <description>
+           <p id="_">I recommend <em>this</em>.</p>
+         </description>
+         <specification exclude="true" type="tabular">
+           <p id="_">This is the object of the recommendation:</p>
+           <table id="_">
+             <tbody>
+               <tr>
+                 <td style="text-align:left;">Object</td>
+                 <td style="text-align:left;">Value</td>
+               </tr>
+               <tr>
+                 <td style="text-align:left;">Mission</td>
+                 <td style="text-align:left;">Accomplished</td>
+               </tr>
+             </tbody>
+           </table>
+         </specification>
+         <description>
+           <p id="_">As for the measurement targets,</p>
+         </description>
+         <measurement-target exclude="false">
+           <p id="_">The measurement target shall be measured as:</p>
+           <formula id="B"><name>1</name>
+             <stem type="AsciiMath">r/1 = 0</stem>
+           </formula>
+         </measurement-target>
+         <verification exclude="false">
+           <p id="_">The following code will be run for verification:</p>
+<sourcecode id="_">CoreRoot(success): HttpResponse
+  if (success)
+  recommendation(label: success-response)
+  end
+</sourcecode>
+         </verification>
+         <import exclude="true">
+           <sourcecode id="_">success-response()</sourcecode>
+         </import>
+       </requirement>
+           </foreword></preface>
+           </iso-standard>
 OUTPUT
-end
 
-   it "processes requirements in French (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-    <iso-standard xmlns="http://riboseinc.com/isoxml">
-    <bibdata>
-    <language>fr</language>
-    <script>Latn</script>
-    </bibdata>
-    <local_bibdata>
-  <language>fr</language>
-  <script>Latn</script>
-</local_bibdata>
-    <preface><foreword>
-    <requirement id="A" unnumbered="true">
-    <name>Exigence</name>
-  <title>A New Requirement</title>
-  <label>/ogc/recommendation/wfs/2</label>
-  <inherit>/ss/584/2015/level/1</inherit>
-  <subject>user</subject>
-  <description>
-    <p id="_">I recommend <em>this</em>.</p>
-  </description>
-  <specification exclude="true" type="tabular">
-    <p id="_">This is the object of the recommendation:</p>
-    <table id="_">
-      <tbody>
-        <tr>
-          <td style="text-align:left;">Object</td>
-          <td style="text-align:left;">Value</td>
-        </tr>
-        <tr>
-          <td style="text-align:left;">Mission</td>
-          <td style="text-align:left;">Accomplished</td>
-        </tr>
-      </tbody>
-    </table>
-  </specification>
-  <description>
-    <p id="_">As for the measurement targets,</p>
-  </description>
-  <measurement-target exclude="false">
-    <p id="_">The measurement target shall be measured as:</p>
-    <formula id="B">
-      <stem type="AsciiMath">r/1 = 0</stem>
-    </formula>
-  </measurement-target>
-  <verification exclude="false">
-    <p id="_">The following code will be run for verification:</p>
-    <sourcecode id="_">CoreRoot(success): HttpResponse
-      if (success)
-      recommendation(label: success-response)
-      end
-    </sourcecode>
-  </verification>
-  <import exclude="true">
-    <sourcecode id="_">success-response()</sourcecode>
-  </import>
-</requirement>
-    </foreword></preface>
-    </iso-standard>
-    INPUT
+html = <<~OUTPUT
 #{HTML_HDR.gsub(/"en"/, '"fr"')}
              <br/>
              <div>
@@ -2454,6 +2370,7 @@ end
                    <div id='B'><div class='formula'>
                      <p>
                        <span class='stem'>(#(r/1 = 0)#)</span>
+                       &#160; (1)
                      </p>
                      </div>
                    </div>
@@ -2463,14 +2380,12 @@ end
                    <pre id='_' class='prettyprint '>
                      CoreRoot(success): HttpResponse
                      <br/>
-                     &#160;&#160;&#160;&#160;&#160; if (success)
+                     &#160; if (success)
                      <br/>
-                     &#160;&#160;&#160;&#160;&#160; recommendation(label:
-                     success-response)
+                     &#160; recommendation(label: success-response)
                      <br/>
-                     &#160;&#160;&#160;&#160;&#160; end
+                     &#160; end
                      <br/>
-                     &#160;&#160;&#160;
                    </pre>
                  </div>
                </div>
@@ -2480,6 +2395,8 @@ end
          </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", presxml, true))).to be_equivalent_to xmlpp(html)
 end
 
  it "processes recommendation (Presentation XML)" do
@@ -2686,8 +2603,8 @@ end
     OUTPUT
   end
 
-  it "processes pseudocode (Presentation XML)" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+  it "processes pseudocode" do
+    input = <<~INPUT
 <itu-standard xmlns="http://riboseinc.com/isoxml">
     <bibdata>
     <language>en</language>
@@ -2698,65 +2615,22 @@ end
 <p id="_">  <em>C</em></p></figure>
 </preface></itu-standard>
 INPUT
-<?xml version='1.0'?>
-<itu-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
-  <bibdata>
-    <language>en</language>
-  </bibdata>
-  <local_bibdata>
-  <language>en</language>
-</local_bibdata>
-  <preface>
-    <foreword>
-      <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
-        <name>Figure 1&#xA0;&#x2014; Label</name>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <strong>A</strong>
-          <br/>
-           &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
-          <smallcap>B</smallcap>
-        </p>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <em>C</em>
-        </p>
-      </figure>
-    </foreword>
-  </preface>
-</itu-standard>
+
+presxml = <<~OUTPUT
+       <itu-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+           <bibdata>
+           <language current="true">en</language>
+           </bibdata>
+               <preface><foreword>
+         <figure id="_" class="pseudocode" keep-with-next="true" keep-lines-together="true"><name>Figure 1&#xA0;&#x2014; Label</name><p id="_">&#xA0;&#xA0;<strong>A</strong><br/>
+       &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;<smallcap>B</smallcap></p>
+       <p id="_">&#xA0;&#xA0;<em>C</em></p></figure>
+       </foreword></preface>
+       </itu-standard>
+
 OUTPUT
-end
 
- it "processes pseudocode (HTML)" do
-    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-<itu-standard xmlns='http://riboseinc.com/isoxml'>
-  <bibdata>
-    <language>en</language>
-  </bibdata>
-  <local_bibdata>
-  <language>en</language>
-</local_bibdata>
-  <preface>
-    <foreword>
-      <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
-        <name>Figure 1&#xA0;&#x2014; Label</name>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <strong>A</strong>
-          <br/>
-           &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
-          <smallcap>B</smallcap>
-        </p>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <em>C</em>
-        </p>
-      </figure>
-    </foreword>
-  </preface>
-</itu-standard>
-INPUT
+html = <<~OUTPUT
     #{HTML_HDR}
              <br/>
              <div>
@@ -2770,38 +2644,11 @@ INPUT
          </body>
 </html>
 OUTPUT
-  end
 
-  it "processes pseudocode (Word)" do
     FileUtils.rm_f "test.doc"
-    IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", false)
-    <itu-standard xmlns='http://riboseinc.com/isoxml'>
-  <bibdata>
-    <language>en</language>
-  </bibdata>
-  <local_bibdata>
-  <language>en</language>
-</local_bibdata>
-  <preface>
-    <foreword>
-      <figure id='_' class='pseudocode' keep-with-next='true' keep-lines-together='true'>
-        <name>Figure 1&#xA0;&#x2014; Label</name>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <strong>A</strong>
-          <br/>
-           &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;
-          <smallcap>B</smallcap>
-        </p>
-        <p id='_'>
-          &#xA0;&#xA0;
-          <em>C</em>
-        </p>
-      </figure>
-    </foreword>
-  </preface>
-</itu-standard>
-INPUT
+    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", presxml, true))).to be_equivalent_to xmlpp(html)
+    IsoDoc::WordConvert.new({}).convert("test", presxml, false)
     expect(xmlpp( File.read("test.doc").gsub(%r{^.*<h1 class="ForewordTitle">Foreword</h1>}m, "").gsub(%r{</div>.*}m, "</div>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
             <div class="pseudocode"  style='page-break-after: avoid;page-break-inside: avoid;'><a name="_" id="_"></a><p class="pseudocode"><a name="_" id="_"></a>&#xA0;&#xA0;<b>A</b><br/>
        &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;<span style="font-variant:small-caps;">B</span></p>