isodoc 1.7.7 → 1.8.2.1

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

@@ -93,6 +93,29 @@ locality: {
   note: Hinweis,
   formula: Formel
 }
+grammar_abbrevs:
+  masculine: mask
+  feminine: fem
+  neuter: neutr
+  common: gemein
+  singular: Sg
+  dual: Dual
+  plural: Pl
+  isPreposition: Präp
+  isParticiple: Part
+  isAdjective: Adj
+  isAdverb: Adv
+  isNoun: Subs
+  isVerb: V
+relatedterms:
+  deprecates: veraltet
+  supersedes: ersetzt
+  narrower: enger
+  broader: breiter
+  equivalent: entspricht
+  compare: vergleiche
+  contrast: dagegen
+  see: siehe
 inflection:
   Klausel:
     sg: Klausel

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

@@ -99,6 +99,29 @@ locality: {
                       note: Note,
                       formula: Formula
                     }
+grammar_abbrevs:
+  masculine: m
+  feminine: f
+  neuter: n
+  common: common
+  singular: sg
+  dual: dual
+  pl: pl
+  isPreposition: prep
+  isParticiple: part
+  isAdjective: adj
+  isAdverb: adv
+  isNoun: noun
+  isVerb: verb
+relatedterms:
+  deprecates: deprecates
+  supersedes: supersedes
+  narrower: narrower
+  broader: broader
+  equivalent: equivalent
+  compare: compare
+  contrast: contrast
+  see: see
 inflection:
   Clause:
     sg: Clause

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

@@ -95,6 +95,29 @@ locality: {
                       note: Nota,
                       formula: Fórmula
                     }
+grammar_abbrevs:
+  masculine: masc
+  feminine: fem
+  neuter: neut
+  common: epicen@
+  singular: sg
+  dual: dual
+  plural: pl
+  isPreposition: prep
+  isParticiple: part
+  isAdjective: adj
+  isAdverb: adv
+  isNoun: sust
+  isVerb: v
+relatedterms:
+  deprecates: obsoleto
+  supersedes: reemplaza
+  narrower: incluye
+  broader: extiende
+  equivalent: equivalente
+  compare: relacionado
+  contrast: difiere
+  see: véase
 inflection:
   Cláusula:
     sg: Cláusula

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

@@ -92,6 +92,29 @@ locality: {
                       note: Note,
                       formula: Formule
                     }
+grammar_abbrevs:
+  masculine: masc
+  feminine: fem
+  neuter: neut
+  common: épicène
+  singular: sg
+  dual: duel
+  plural: pl
+  isPreposition: prép
+  isParticiple: part
+  isAdjective: adj
+  isAdverb: adv
+  isNoun: subst
+  isVerb: vb
+relatedterms:
+  deprecates: déprécie
+  supersedes: remplace
+  narrower: plus étroit
+  broader: plus large
+  equivalent: équivalent
+  compare: comparez
+  contrast: contrastez
+  see: voir
 inflection:
   Clause:
     sg: Article

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

@@ -97,7 +97,30 @@ locality: {
                       example: Пример,
                       note: Примечание,
                       formula: Формула
-                    }
+}
+grammar_abbrevs:
+  masculine: муж
+  feminine: жен
+  neuter: ср
+  common: общего рода
+  singular: ед
+  dual: дв
+  plural: мн
+  isPreposition: предл
+  isParticiple: прич
+  isAdjective: прил
+  isAdverb: нар
+  isNoun: сущ
+  isVerb: глаг
+relatedterms:
+  deprecates: устаревший
+  supersedes: заменяет
+  narrower: более узкий
+  broader: более широкий
+  equivalent: эквивалент
+  compare: наравне
+  contrast: противоположный
+  see: см.
 inflection:
   Пункт:
     sg: Пункт

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

@@ -93,3 +93,27 @@ locality: {
   example: 示例,
   note: 注
 }
+grammar_abbrevs:
+  masculine: 男性性别
+  feminine: 阴性
+  neuter: 中性的
+  common: 通性
+  singular: 单数
+  dual: 双
+  plural: 复数
+  isPreposition: 介词
+  isParticiple: 分词
+  isAdjective: 形容词
+  isAdverb: 副词
+  isNoun: 名词
+  isVerb: 动词
+relatedterms:
+  deprecates: 旧词
+  supersedes: 取替
+  narrower: 狭义
+  broader: 广义
+  equivalent: 同义
+  compare: 比较
+  contrast: 对比
+  see: 见
+

data/lib/metanorma/output/xslfo.rb

@@ -1,21 +1,14 @@
-require 'mn2pdf'
-require_relative "./utils.rb"
+require "mn2pdf"
+require_relative "./utils"
 
 module Metanorma
   module Output
     class XslfoPdf < Base
-      def convert(url_path, output_path, xsl_stylesheet, options = "")
+      def convert(url_path, output_path, xsl_stylesheet, options = {})
         return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
 
-        Mn2pdf.convert(quote(url_path), quote(output_path), quote(xsl_stylesheet), options)
-      end
-
-      def quote(x)
-        return x if /^'.*'$/.match(x)
-        return x if /^".*"$/.match(x)
-        %("#{x}")
+        Mn2pdf.convert(url_path, output_path, xsl_stylesheet, options)
       end
     end
   end
 end
-

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

@@ -24,7 +24,7 @@ RSpec.describe IsoDoc do
        <clause 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">
@@ -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>
@@ -233,7 +233,7 @@ RSpec.describe IsoDoc do
        <clause 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">
@@ -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
@@ -361,7 +366,7 @@ RSpec.describe IsoDoc do
        <clause 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">
@@ -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>
@@ -570,7 +575,7 @@ RSpec.describe IsoDoc do
              <clause 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">
@@ -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>
@@ -812,7 +817,7 @@ RSpec.describe IsoDoc do
              <clause 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">
@@ -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

@@ -625,6 +625,74 @@ RSpec.describe IsoDoc do
       .convert("test", presxml, true))).to be_equivalent_to xmlpp(output)
   end
 
+  it "processes related terms" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <sections>
+      <terms id='A' obligation='normative'>
+            <title>Terms and definitions</title>
+            <term id='second'>
+        <preferred>
+          <expression>
+            <name>Second Term</name>
+          </expression>
+        <field-of-application>Field</field-of-application>
+        <usage-info>Usage Info 1</usage-info>
+        </preferred>
+        <definition><verbal-definition>Definition 1</verbal-definition></definition>
+      </term>
+      <term id="C">
+      <preferred language='fr' script='Latn' type='prefix'>
+                <expression>
+                  <name>First Designation</name>
+                  </expression></preferred>
+        <related type='contrast'>
+          <preferred>
+            <expression>
+              <name>Fifth Designation</name>
+              <grammar>
+                <gender>neuter</gender>
+              </grammar>
+            </expression>
+          </preferred>
+          <xref target='second'/>
+        </related>
+        <definition><verbal-definition>Definition 2</verbal-definition></definition>
+      </term>
+          </terms>
+        </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+       <?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, &lt;Field, Usage Info 1&gt;</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)
+  end
+
   it "processes embedded inline formatting" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -724,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>