isodoc 1.7.7 → 1.8.0

data/spec/isodoc/terms_spec.rb

@@ -7,9 +7,16 @@ RSpec.describe IsoDoc do
           <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>
+      <term id="paddy1"><preferred><expression><name>paddy</name></expression>
+            <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>
+      </preferred>
       <domain>rice</domain>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></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>
@@ -21,12 +28,6 @@ RSpec.describe IsoDoc do
         <li>A</li>
         </ul>
       </termexample>
-      <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>
       <termsource status='identical'>
           <origin citeas=''>
             <termref base='IEV' target='xyz'>t1</termref>
@@ -41,10 +42,11 @@ RSpec.describe IsoDoc do
           </modification>
         </termsource>
       </term>
-      <term id="paddy"><preferred>paddy</preferred><admitted>paddy rice</admitted>
-      <admitted>rough rice</admitted>
-      <deprecates>cargo rice</deprecates>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
+      <term id="paddy"><preferred><expression><name>paddy</name></expression></preferred>
+      <admitted><letter-symbol><name>paddy rice</name></letter-symbol></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>
       <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f893">
         <ul>
         <li>A</li>
@@ -78,6 +80,17 @@ RSpec.describe IsoDoc do
                    <p>For the purposes of this document, the following terms and definitions apply.</p>
                    <term id='paddy1'><name>1.1.</name>
                      <preferred>paddy</preferred>
+                                          <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>
                      <domain>rice</domain>
                      <definition>
                        <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
@@ -95,17 +108,6 @@ RSpec.describe IsoDoc do
                          <li>A</li>
                        </ul>
                      </termexample>
-                     <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>
                      <termsource status='identical'>
                        <origin citeas=''>
                          <termref base='IEV' target='xyz'>t1</termref>
@@ -173,6 +175,10 @@ RSpec.describe IsoDoc do
               <p>For the purposes of this document,
                  the following terms and definitions apply.</p>
              <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
+                          <p>[TERMREF]
+               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
+                 [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+             [/TERMREF]</p>
              <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
              <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"  style='page-break-after: avoid;page-break-inside: avoid;'><p class="example-title">EXAMPLE 1</p>
                <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
@@ -185,10 +191,6 @@ RSpec.describe IsoDoc do
                <li>A</li>
                </ul>
              </div>
-             <p>[TERMREF]
-               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
-                 [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-             [/TERMREF]</p>
              <p>[TERMREF] t1 [/TERMREF]</p>
       <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
       <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
@@ -217,6 +219,10 @@ RSpec.describe IsoDoc do
                    <div id="_terms_and_definitions"><h1>1.<span style="mso-tab-count:1">&#160; </span>Terms and Definitions</h1><p>For the purposes of this document,
                  the following terms and definitions apply.</p>
              <p class="TermNum" id="paddy1">1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
+                          <p>[TERMREF]
+               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
+                 [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
+             [/TERMREF]</p>
              <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">&lt;rice&gt; rice retaining its husk after threshing</p>
              <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"  style='page-break-after: avoid;page-break-inside: avoid;'><p class="example-title">EXAMPLE 1</p>
                <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
@@ -229,10 +235,6 @@ RSpec.describe IsoDoc do
                <li>A</li>
                </ul>
              </div>
-             <p>[TERMREF]
-               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
-                 [MODIFICATION] The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
-             [/TERMREF]</p>
              <p>[TERMREF] t1 [/TERMREF]</p>
       <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
       <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
@@ -268,16 +270,17 @@ RSpec.describe IsoDoc do
           <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>
+      <term id="paddy1"><preferred><expression><name>paddy</name></expression></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>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+      <definition><verbaldefinition><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>
+      </verbaldefinition>
       </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>
@@ -377,4 +380,321 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
   end
+
+  it "processes IsoXML term with multiple preferred terms" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+      <term id="paddy1">
+      <preferred><expression><name>paddy</name></expression></preferred>
+      <preferred><expression><name>muddy rice</name></expression></preferred>
+      <domain>rice</domain>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+      </term>
+                </terms>
+        </sections>
+      </iso-standard>
+    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>
+            <term id='paddy1'>
+              <name>1.1.</name>
+              <preferred>paddy; muddy rice</preferred>
+              <domain>rice</domain>
+              <definition>
+                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+              </definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "processes IsoXML term with grammatical information" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+      <term id="paddy1">
+      <preferred><expression><name>paddy</name>
+                  <grammar>
+              <gender>masculine</gender>
+              <gender>feminine</gender>
+              <isPreposition>false</isPreposition>
+              <isNoun>true</isNoun>
+              <grammarValue>irregular declension</grammarValue>
+            </grammar>
+      </expression></preferred>
+      <preferred><expression><name>muddy rice</name>
+                        <grammar>
+              <gender>neuter</gender>
+              <isNoun>true</isNoun>
+              <grammarValue>irregular declension</grammarValue>
+            </grammar>
+      </expression></preferred>
+      <domain>rice</domain>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+      </term>
+                </terms>
+        </sections>
+      </iso-standard>
+    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>
+            <term id='paddy1'>
+              <name>1.1.</name>
+              <preferred>paddy masc, fem, n; muddy rice neut, n</preferred>
+              <domain>rice</domain>
+              <definition>
+                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+              </definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "processes IsoXML term with empty or graphical designations" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <sections>
+          <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
+      <term id="paddy1">
+      <preferred><expression><name/></expression></preferred>
+      <preferred isInternational='true'><graphical-symbol><figure id='_'><pre id='_'>&lt;LITERAL&gt; FIGURATIVE</pre></figure>
+                 </graphical-symbol>
+               </preferred>
+      <domain>rice</domain>
+      <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
+      </term>
+                </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    presxml = <<~PRESXML
+      <?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>; <figure id='_'>
+                  <name>Figure 1</name>
+                  <pre id='_'>&lt;LITERAL&gt; FIGURATIVE</pre>
+                </figure>
+              </preferred>
+              <domain>rice</domain>
+              <definition>
+                <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
+              </definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    PRESXML
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(presxml)
+  end
+
+  it "processes IsoXML term with nonverbal definitions" do
+    input = <<~"INPUT"
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+                    <sections>
+            <terms id='A' obligation='normative'>
+              <title>Terms and definitions</title>
+              <p id='B'>For the purposes of this document, the following terms and definitions apply.</p>
+              <term id='term-term'>
+                <preferred>
+                  <expression>
+                    <name>Term</name>
+                  </expression>
+                </preferred>
+                <definition>
+                  <verbaldefinition>
+                    <p id='C'>Definition</p>
+                    <termsource status='identical' type='authoritative'>
+                      <origin bibitemid='ISO2191' type='inline' citeas=''>
+                        <localityStack>
+                          <locality type='section'>
+                            <referenceFrom>1</referenceFrom>
+                          </locality>
+                        </localityStack>
+                      </origin>
+                    </termsource>
+                  </verbaldefinition>
+                  <nonverbalrepresentation>
+                    <table id='D'>
+                      <thead>
+                        <tr>
+                          <th valign='top' align='left'>A</th>
+                          <th valign='top' align='left'>B</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr>
+                          <td valign='top' align='left'>C</td>
+                          <td valign='top' align='left'>D</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </nonverbalrepresentation>
+                </definition>
+                <termsource status='identical' type='authoritative'>
+                  <origin bibitemid='ISO2191' type='inline' citeas=''>
+                    <localityStack>
+                      <locality type='section'>
+                        <referenceFrom>2</referenceFrom>
+                      </locality>
+                    </localityStack>
+                  </origin>
+                </termsource>
+              </term>
+              <term id='term-term-2'>
+                <preferred>
+                  <expression>
+                    <name>Term 2</name>
+                  </expression>
+                </preferred>
+                <definition>
+                  <nonverbalrepresentation>
+                    <figure id='E'>
+                      <pre id='F'>Literal</pre>
+                    </figure>
+                    <formula id='G'>
+                      <stem type='MathML'>
+                        <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                          <mi>x</mi>
+                          <mo>=</mo>
+                          <mi>y</mi>
+                        </math>
+                      </stem>
+                    </formula>
+                    <termsource status='identical' type='authoritative'>
+                      <origin bibitemid='ISO2191' type='inline' citeas=''>
+                        <localityStack>
+                          <locality type='section'>
+                            <referenceFrom>3</referenceFrom>
+                          </locality>
+                        </localityStack>
+                      </origin>
+                    </termsource>
+                  </nonverbalrepresentation>
+                </definition>
+              </term>
+            </terms>
+          </sections>
+      </iso-standard>
+    INPUT
+presxml = <<~PRESXML
+       <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <sections>
+           <terms id='A' obligation='normative' displayorder='1'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Terms and definitions
+             </title>
+             <p id='B'>For the purposes of this document, the following terms and definitions apply.</p>
+             <term id='term-term'>
+               <name>1.1.</name>
+               <preferred>Term</preferred>
+               <definition>
+                 <p id='C'>Definition</p>
+                 <termsource status='identical' type='authoritative'>
+                   <origin bibitemid='ISO2191' type='inline' citeas=''>
+                     <localityStack>
+                       <locality type='section'>
+                         <referenceFrom>1</referenceFrom>
+                       </locality>
+                     </localityStack>
+                     , Section 1
+                   </origin>
+                 </termsource>
+                 <table id='D'>
+                   <name>Table 1</name>
+                   <thead>
+                     <tr>
+                       <th valign='top' align='left'>A</th>
+                       <th valign='top' align='left'>B</th>
+                     </tr>
+                   </thead>
+                   <tbody>
+                     <tr>
+                       <td valign='top' align='left'>C</td>
+                       <td valign='top' align='left'>D</td>
+                     </tr>
+                   </tbody>
+                 </table>
+               </definition>
+               <termsource status='identical' type='authoritative'>
+                 <origin bibitemid='ISO2191' type='inline' citeas=''>
+                   <localityStack>
+                     <locality type='section'>
+                       <referenceFrom>2</referenceFrom>
+                     </locality>
+                   </localityStack>
+                   , Section 2
+                 </origin>
+               </termsource>
+             </term>
+             <term id='term-term-2'>
+               <name>1.2.</name>
+               <preferred>Term 2</preferred>
+               <definition>
+                 <figure id='E'>
+                   <name>Figure 1</name>
+                   <pre id='F'>Literal</pre>
+                 </figure>
+                 <formula id='G'>
+                   <name>1</name>
+                   <stem type='MathML'>
+                     <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                       <mi>x</mi>
+                       <mo>=</mo>
+                       <mi>y</mi>
+                     </math>
+                     <!-- x = y -->
+                   </stem>
+                 </formula>
+                 <termsource status='identical' type='authoritative'>
+                   <origin bibitemid='ISO2191' type='inline' citeas=''>
+                     <localityStack>
+                       <locality type='section'>
+                         <referenceFrom>3</referenceFrom>
+                       </locality>
+                     </localityStack>
+                     , Section 3
+                   </origin>
+                 </termsource>
+               </definition>
+             </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/xref_spec.rb

@@ -1831,11 +1831,11 @@ RSpec.describe IsoDoc do
           <clause id="scope" type="scope"><title>Scope</title>
           </clause>
           <terms id="terms">
-      <term id="_waxy_rice"><preferred>waxy rice</preferred>
+      <term id="_waxy_rice"><preferred><expression><name>waxy rice</name></expression></preferred>
       <termnote id="note1">
         <p id="_b0cb3dfd-78fc-47dd-a339-84070d947463">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
       </termnote></term>
-      <term id="_nonwaxy_rice"><preferred>nonwaxy rice</preferred>
+      <term id="_nonwaxy_rice"><preferred><expression><name>nonwaxy rice</name></expression></preferred>
       <termnote id="note2">
         <p id="_b0cb3dfd-78fc-47dd-a339-84070d947463">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
       </termnote>
@@ -1945,7 +1945,7 @@ RSpec.describe IsoDoc do
        <terms id="H" obligation="normative"><title>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title>Normal Terms</title>
          <term id="J">
-         <preferred>Term2</preferred>
+         <preferred><expression><name>Term2</name></expression></preferred>
        </term>
        </terms>
        <definitions id="K">
@@ -2779,7 +2779,7 @@ RSpec.describe IsoDoc do
                  <title>Terms and definitions</title>
                  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
                  <term id='S4' number='4bis'>
-                   <preferred>Term1</preferred>
+                   <preferred><expression><name>Term1</name></expression></preferred>
                  </term>
                </terms>
                <definitions id='S12' number='12bis' type='abbreviated_terms' obligation='normative'>

data/spec/isodoc/xslfo_convert_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe IsoDoc do
       },
     )
 
-    expect(convert.pdf_options(nil)).to eq("")
+    expect(convert.pdf_options(nil)).to eq({})
   end
 
   it "test empty pdf_options for nil font_manifest_file" do
@@ -21,20 +21,21 @@ RSpec.describe IsoDoc do
       },
     )
 
-    expect(convert.pdf_options(nil)).to eq("")
+    expect(convert.pdf_options(nil)).to eq({})
   end
 
   it "test --font-manifest pdf_options" do
+    mn2pdf_opts = {
+      IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => "/tmp/manifest.yml",
+    }
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-        IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
-          IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => "/tmp/manifest.yml",
-        },
+        IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => mn2pdf_opts,
       },
     )
 
-    expect(convert.pdf_options(nil)).to eq(" --font-manifest /tmp/manifest.yml")
+    expect(convert.pdf_options(nil)).to eq(mn2pdf_opts)
   end
 
   it "test --param align-cross-elements pdf_options" do
@@ -46,6 +47,18 @@ RSpec.describe IsoDoc do
     )
 
     expect(convert.pdf_options(nil))
-      .to eq(" --param align-cross-elements = \"clause table note\"")
+      .to eq({ "--param align-cross-elements=" => "clause table note" })
+  end
+
+  it "test --baseassetpath pdf_options" do
+    convert = IsoDoc::XslfoPdfConvert.new(
+      {
+        datauriimage: false,
+        baseassetpath: "ABC",
+      },
+    )
+
+    expect(convert.pdf_options(nil))
+      .to eq({ "--param baseassetpath=" => "ABC" })
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.8.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-11 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -446,11 +446,11 @@ 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
+- lib/isodoc/presentation_function/terms.rb
 - lib/isodoc/presentation_xml_convert.rb
 - lib/isodoc/sassc_importer.rb
 - lib/isodoc/version.rb
@@ -531,7 +531,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.