isodoc 1.7.4 → 1.7.7

data/spec/isodoc/section_spec.rb

@@ -1778,4 +1778,129 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::HtmlConvert.new({})
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
+
+    it "processes annexes containing one, or more than one special sections" do
+    input = <<~INPUT
+           <iso-standard xmlns="http://riboseinc.com/isoxml">
+                    <annex id='PP' obligation='normative'>
+        <title>Glossary</title>
+        <terms id='PP1' obligation='normative'>
+          <term id='term-glossary'>
+            <preferred>Glossary</preferred>
+          </term>
+        </terms>
+      </annex>
+            <annex id='QQ' obligation='normative'>
+                 <title>Glossary</title>
+                   <terms id='QQ1' obligation='normative'>
+                     <title>Term Collection</title>
+                     <term id='term-term-1'>
+                       <preferred>Term</preferred>
+                     </term>
+                   </terms>
+                   <terms id='QQ2' obligation='normative'>
+                     <title>Term Collection 2</title>
+                     <term id='term-term-2'>
+                       <preferred>Term</preferred>
+                     </term>
+                   </terms>
+               </annex>
+                 <annex id='RR' obligation='normative'>
+                 <title>Glossary</title>
+                   <terms id='RR1' obligation='normative'>
+                     <title>Term Collection</title>
+                     <term id='term-term-3'>
+                       <preferred>Term</preferred>
+                     </term>
+                   </terms>
+                   <references id='RR2' obligation='normative'>
+                     <title>References</title>
+                   </terms>
+               </annex>
+      </iso-standard>
+    INPUT
+    presxml = <<~OUTPUT
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <annex id='PP' obligation='normative' displayorder='1'>
+           <title>
+             <strong>Annex A</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Glossary</strong>
+           </title>
+           <terms id='PP1' obligation='normative'>
+             <title>A.</title>
+             <term id='term-glossary'>
+               <name>A.1.</name>
+               <preferred>Glossary</preferred>
+             </term>
+           </terms>
+         </annex>
+         <annex id='QQ' obligation='normative' displayorder='2'>
+           <title>
+             <strong>Annex B</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Glossary</strong>
+           </title>
+           <terms id='QQ1' obligation='normative'>
+             <title depth='2'>
+               B.1.
+               <tab/>
+               Term Collection
+             </title>
+             <term id='term-term-1'>
+               <name>B.1.1.</name>
+               <preferred>Term</preferred>
+             </term>
+           </terms>
+           <terms id='QQ2' obligation='normative'>
+             <title depth='2'>
+               B.2.
+               <tab/>
+               Term Collection 2
+             </title>
+             <term id='term-term-2'>
+               <name>B.2.1.</name>
+               <preferred>Term</preferred>
+             </term>
+           </terms>
+         </annex>
+         <annex id='RR' obligation='normative' displayorder='3'>
+           <title>
+             <strong>Annex C</strong>
+             <br/>
+             (normative)
+             <br/>
+             <br/>
+             <strong>Glossary</strong>
+           </title>
+           <terms id='RR1' obligation='normative'>
+             <title depth='2'>
+               C.1.
+               <tab/>
+               Term Collection
+             </title>
+             <term id='term-term-3'>
+               <name>C.1.1.</name>
+               <preferred>Term</preferred>
+             </term>
+           </terms>
+           <references id='RR2' obligation='normative'>
+             <title depth='2'>
+               C.2.
+               <tab/>
+               References
+             </title>
+           </references>
+         </annex>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+    end
 end

data/spec/isodoc/terms_spec.rb

@@ -261,4 +261,120 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::WordConvert.new({})
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(word)
   end
+
+  it "processes IsoXML term with multiple definitions" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+          <p>For the purposes of this document, the following terms and definitions apply.</p>
+      <term id="paddy1"><preferred>paddy</preferred>
+      <domain>rice</domain>
+      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747e">rice retaining its husk after threshing, mark 2</p>
+      <termsource status="modified">
+        <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality></origin>
+          <modification>
+          <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489">The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here</p>
+        </modification>
+      </termsource>
+      </definition>
+      <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892"  keep-with-next="true" keep-lines-together="true">
+        <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
+        <ul>
+        <li>A</li>
+        </ul>
+      </termexample>
+      <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f894">
+        <ul>
+        <li>A</li>
+        </ul>
+      </termexample>
+      <termsource status='identical'>
+          <origin citeas=''>
+            <termref base='IEV' target='xyz'>t1</termref>
+          </origin>
+        </termsource>
+        <termsource status='modified'>
+          <origin citeas=''>
+            <termref base='IEV' target='xyz'/>
+          </origin>
+          <modification>
+            <p id='_'>with adjustments</p>
+          </modification>
+        </termsource>
+      </term>
+    INPUT
+    presxml = <<~PRESXML
+          <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>
+            <p>For the purposes of this document, the following terms and definitions apply.</p>
+            <term id='paddy1'>
+              <name>1.1.</name>
+              <preferred>paddy</preferred>
+              <domain>rice</domain>
+              <definition>
+                <ol>
+                  <li>
+                    <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+                  </li>
+                  <li>
+                    <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747e'>rice retaining its husk after threshing, mark 2</p>
+                    <termsource status='modified'>
+                      <origin bibitemid='ISO7301' type='inline' citeas='ISO 7301:2011'>
+                        <locality type='clause'>
+                          <referenceFrom>3.1</referenceFrom>
+                        </locality>
+                        ISO 7301:2011, Clause 3.1
+                      </origin>
+                      <modification>
+                        <p id='_e73a417d-ad39-417d-a4c8-20e4e2529489'>
+                          The term "cargo rice" is shown as deprecated, and Note 1 to
+                          entry is not included here
+                        </p>
+                      </modification>
+                    </termsource>
+                  </li>
+                </ol>
+              </definition>
+              <termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f892' keep-with-next='true' keep-lines-together='true'>
+                <name>EXAMPLE 1</name>
+                <p id='_65c9a509-9a89-4b54-a890-274126aeb55c'>Foreign seeds, husks, bran, sand, dust.</p>
+                <ul>
+                  <li>A</li>
+                </ul>
+              </termexample>
+              <termexample id='_bd57bbf1-f948-4bae-b0ce-73c00431f894'>
+                <name>EXAMPLE 2</name>
+                <ul>
+                  <li>A</li>
+                </ul>
+              </termexample>
+              <termsource status='identical'>
+                <origin citeas=''>
+                  <termref base='IEV' target='xyz'>t1</termref>
+                </origin>
+              </termsource>
+              <termsource status='modified'>
+                <origin citeas=''>
+                  <termref base='IEV' target='xyz'/>
+                </origin>
+                <modification>
+                  <p id='_'>with adjustments</p>
+                </modification>
+              </termsource>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
 end

data/spec/isodoc/xslfo_convert_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe IsoDoc do
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-      }
+      },
     )
 
     expect(convert.pdf_options(nil)).to eq("")
@@ -18,7 +18,7 @@ RSpec.describe IsoDoc do
         IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
           IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => nil,
         },
-      }
+      },
     )
 
     expect(convert.pdf_options(nil)).to eq("")
@@ -31,9 +31,21 @@ RSpec.describe IsoDoc do
         IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
           IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => "/tmp/manifest.yml",
         },
-      }
+      },
     )
 
-    expect(convert.pdf_options(nil)).to eq("--font-manifest /tmp/manifest.yml")
+    expect(convert.pdf_options(nil)).to eq(" --font-manifest /tmp/manifest.yml")
+  end
+
+  it "test --param align-cross-elements pdf_options" do
+    convert = IsoDoc::XslfoPdfConvert.new(
+      {
+        datauriimage: false,
+        aligncrosselements: "clause table note",
+      },
+    )
+
+    expect(convert.pdf_options(nil))
+      .to eq(" --param align-cross-elements = \"clause table note\"")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: emf2svg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: relaton-cli
+  name: mathml2asciimath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: roman-numerals
+  name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+- !ruby/object:Gem::Dependency
+  name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter_cldr
+  name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +165,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mathml2asciimath
+  name: twitter_cldr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.6.0
+- !ruby/object:Gem::Dependency
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -220,6 +248,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: metanorma-iso
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -304,20 +346,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: metanorma-iso
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -418,6 +446,8 @@ files:
 - lib/isodoc/pdf_convert.rb
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
+- lib/isodoc/presentation_function/concept.rb
+- lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/math.rb
 - lib/isodoc/presentation_function/section.rb