isodoc 1.8.0 → 1.8.2.2

data/lib/isodoc-yaml/i18n-en.yaml

@@ -100,16 +100,19 @@ locality: {
                       formula: Formula
                     }
 grammar_abbrevs:
-  masculine: masc
-  feminine: fem
-  neuter: neut
+  masculine: m
+  feminine: f
+  neuter: n
   common: common
+  singular: sg
+  dual: dual
+  pl: pl
   isPreposition: prep
   isParticiple: part
   isAdjective: adj
   isAdverb: adv
-  isNoun: n
-  isVerb: v
+  isNoun: noun
+  isVerb: verb
 relatedterms:
   deprecates: deprecates
   supersedes: supersedes

data/lib/isodoc-yaml/i18n-es.yaml

@@ -100,6 +100,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neut
   common: epicen@
+  singular: sg
+  dual: dual
+  plural: pl
   isPreposition: prep
   isParticiple: part
   isAdjective: adj

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -97,6 +97,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neut
   common: épicène
+  singular: sg
+  dual: duel
+  plural: pl
   isPreposition: prép
   isParticiple: part
   isAdjective: adj

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -103,6 +103,9 @@ grammar_abbrevs:
   feminine: жен
   neuter: ср
   common: общего рода
+  singular: ед
+  dual: дв
+  plural: мн
   isPreposition: предл
   isParticiple: прич
   isAdjective: прил

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -98,6 +98,9 @@ grammar_abbrevs:
   feminine: 阴性
   neuter: 中性的
   common: 通性
+  singular: 单数
+  dual: 双
+  plural: 复数
   isPreposition: 介词
   isParticiple: 分词
   isAdjective: 形容词

data/spec/isodoc/blocks_spec.rb

@@ -809,8 +809,11 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true)
       .gsub(/</, "<")
-    .gsub(%r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile')
-                )).to be_equivalent_to xmlpp(presxml.gsub(%r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile'))
+    .gsub(%r{data:application/x-msmetafile[^"']+},
+          "data:application/x-msmetafile")))
+      .to be_equivalent_to xmlpp(presxml
+      .gsub(%r{data:application/x-msmetafile[^"']+},
+            "data:application/x-msmetafile"))
     expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
       .convert("test", presxml, true)))).to be_equivalent_to xmlpp(html)
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
@@ -900,9 +903,11 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
      .convert("test", input, true)
      .gsub(/</, "<")
-    .gsub(%r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile')))
+    .gsub(%r{data:application/x-msmetafile[^"']+},
+          "data:application/x-msmetafile")))
       .to be_equivalent_to xmlpp(presxml
-      .gsub( %r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile'))
+      .gsub(%r{data:application/x-msmetafile[^"']+},
+            "data:application/x-msmetafile"))
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
       .convert("test", presxml, true)
       .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'")
@@ -991,9 +996,11 @@ RSpec.describe IsoDoc do
       expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
        .convert("test", input, true)
        .gsub(/&lt;/, "&#x3c;")
-        .gsub(%r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile')))
+        .gsub(%r{data:application/x-msmetafile[^"']+},
+              "data:application/x-msmetafile")))
         .to be_equivalent_to xmlpp(presxml
-        .gsub( %r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile'))
+        .gsub(%r{data:application/x-msmetafile[^"']+},
+              "data:application/x-msmetafile"))
       expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
         .convert("test", presxml, true)
         .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.svg['"]/, "'_.svg'")
@@ -2521,8 +2528,7 @@ RSpec.describe IsoDoc do
       .convert("test", input, true))
       .sub(%r{<localized-strings>.*</localized-strings>}m, "")
       .gsub(%r{"\.\\}, '"./')
-      .gsub(%r{'\.\\}, "'./")
-      )
+      .gsub(%r{'\.\\}, "'./"))
       .to be_equivalent_to xmlpp(output)
   end
 

data/spec/isodoc/i18n_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -159,7 +159,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                 <h2>3.1.&#160; Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1.</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div><div id="K"><h2>3.2.</h2>
                 <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
               </div></div>
@@ -211,7 +211,7 @@ RSpec.describe IsoDoc do
   end
 
   it "defaults to English" do
-    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{<localized-strings>.*</localized-strings>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <bibdata>
       <language>tlh</language>
@@ -275,6 +275,7 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     INPUT
+    output = <<~OUTPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
       <bibdata>
       <language current="true">tlh</language>
@@ -295,7 +296,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -336,6 +337,10 @@ RSpec.describe IsoDoc do
        </bibliography>
        </iso-standard>
     OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true)
+      .sub(%r{<localized-strings>.*</localized-strings>}m, "")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes French" do
@@ -425,7 +430,7 @@ RSpec.describe IsoDoc do
        <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
          <title depth="2">3.1.<tab/>Normal Terms</title>
          <term id="J"><name>3.1.1.</name>
-         <preferred>Term2</preferred>
+         <preferred><strong>Term2</strong></preferred>
        </term>
        </terms>
        <definitions id="K"><title>3.2.</title>
@@ -496,7 +501,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                 <h2>3.1.&#160; Normal Terms</h2>
                 <p class="TermNum" id="J">3.1.1.</p>
-                <p class="Terms" style="text-align:left;">Term2</p>
+                <p class="Terms" style="text-align:left;"><b>Term2</b></p>
               </div><div id="K"><h2>3.2.</h2>
                 <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
               </div></div>
@@ -644,7 +649,7 @@ RSpec.describe IsoDoc do
              <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title depth="2">3.1.<tab/>Normal Terms</title>
                <term id="J"><name>3.1.1.</name>
-               <preferred>Term2</preferred>
+               <preferred><strong>Term2</strong></preferred>
              </term>
              </terms>
              <definitions id="K"><title>3.2.</title>
@@ -728,7 +733,7 @@ RSpec.describe IsoDoc do
              <div id="I">
                       <h2>3.1.&#12288;Normal Terms</h2>
                       <p class="TermNum" id="J">3.1.1.</p>
-                      <p class="Terms" style="text-align:left;">Term2</p>
+                      <p class="Terms" style="text-align:left;"><b>Term2</b></p>
                     </div><div id="K"><h2>3.2.</h2>
                       <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
                     </div></div>
@@ -896,7 +901,7 @@ RSpec.describe IsoDoc do
              <clause id="H" obligation="normative" displayorder="5"><title depth="1">3.<tab/>Terms, definitions, symbols and abbreviated terms</title><terms id="I" obligation="normative">
                <title depth="2">3.1.<tab/>Normal Terms</title>
                <term id="J"><name>3.1.1.</name>
-               <preferred>Term2</preferred>
+               <preferred><strong>Term2</strong></preferred>
              </term>
              </terms>
              <definitions id="K"><title>3.2.</title>
@@ -1002,7 +1007,7 @@ RSpec.describe IsoDoc do
                      <div id='I'>
                        <h2>3.1.&#160; Normal Terms</h2>
                        <p class='TermNum' id='J'>3.1.1.</p>
-                       <p class='Terms' style='text-align:left;'>Term2</p>
+                       <p class='Terms' style='text-align:left;'><b>Term2</b></p>
                      </div>
                      <div id='K'>
                        <h2>3.2.</h2>

data/spec/isodoc/inline_spec.rb

@@ -636,11 +636,10 @@ RSpec.describe IsoDoc do
           <expression>
             <name>Second Term</name>
           </expression>
+        <field-of-application>Field</field-of-application>
+        <usage-info>Usage Info 1</usage-info>
         </preferred>
-        <usageinfo>
-          <p id='B'>Usage Info 1.</p>
-        </usageinfo>
-        <definition><verbaldefinition>Definition 1</verbaldefinition></definition>
+        <definition><verbal-definition>Definition 1</verbal-definition></definition>
       </term>
       <term id="C">
       <preferred language='fr' script='Latn' type='prefix'>
@@ -658,49 +657,40 @@ RSpec.describe IsoDoc do
           </preferred>
           <xref target='second'/>
         </related>
-        <definition><verbaldefinition>Definition 2</verbaldefinition></definition>
+        <definition><verbal-definition>Definition 2</verbal-definition></definition>
       </term>
           </terms>
         </sections>
       </iso-standard>
     INPUT
     output = <<~OUTPUT
-           <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>
-             <term id='second'>
-               <name>1.1.</name>
-               <preferred>Second Term</preferred>
-               <usageinfo>
-                 <p id='B'>Usage Info 1.</p>
-               </usageinfo>
-               <definition>Definition 1</definition>
-             </term>
-             <term id='C'>
-               <name>1.2.</name>
-               <preferred language='fr' script='Latn' type='prefix'>First Designation</preferred>
-               <p>
-                 <strong>CONTRAST:</strong>
-                 <em>
-                   <preferred>Fifth Designation neut</preferred>
-                 </em>
-                  (
-                 <xref target='second'>Clause 1.1</xref>
-                 )
-               </p>
-               <definition>Definition 2</definition>
-             </term>
-           </terms>
-         </sections>
-       </iso-standard>
+       <?xml version='1.0'?>
+          <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>
+            <term id='second'>
+              <name>1.1.</name>
+              <preferred><strong>Second Term, &#x3c;Field, Usage Info 1&#x3e;</strong></preferred>
+              <definition>Definition 1</definition>
+            </term>
+            <term id='C'>
+              <name>1.2.</name>
+              <preferred language='fr' script='Latn' type='prefix'><strong>First Designation</strong></preferred>
+              <p>
+                <strong>CONTRAST:</strong>
+                <em>
+                  <preferred><strong>Fifth Designation</strong>, n</preferred>
+                </em> (<xref target='second'>Clause 1.1</xref>)
+              </p>
+              <definition>Definition 2</definition>
+            </term>
+          </terms>
+        </sections>
+      </iso-standard>
     OUTPUT
-   expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
-      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 
   it "processes embedded inline formatting" do
@@ -802,9 +792,9 @@ RSpec.describe IsoDoc do
       <iso-standard xmlns="http://riboseinc.com/isoxml">
       <preface><foreword>
       <p>
-      <link updatetype="true" target="http://example.com"/>
-      <link updatetype="true" target="list.adoc">example</link>
-      <link updatetype="true" target="list" alt="tip">example</link>
+      <link update-type="true" target="http://example.com"/>
+      <link update-type="true" target="list.adoc">example</link>
+      <link update-type="true" target="list" alt="tip">example</link>
       </p>
       </foreword></preface>
       <sections>