isodoc 1.8.2.1 → 1.8.3.2

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -4,8 +4,7 @@ module IsoDoc
       def back_anchor_names(docxml)
         i = Counter.new("@")
         docxml.xpath(ns("//annex")).each do |c|
-          i.increment(c)
-          annex_names(c, i.print)
+          annex_names(c, i.increment(c).print)
         end
         docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
           preface_names(b)
@@ -86,8 +85,7 @@ module IsoDoc
             level: lvl, type: "clause" }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          i.increment(c)
-          section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
+          section_names1(c, "#{num.print}.#{i.increment(c).print}", lvl + 1)
         end
         num
       end
@@ -98,8 +96,7 @@ module IsoDoc
             type: "clause" }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          i.increment(c)
-          section_names1(c, "#{num}.#{i.print}", level + 1)
+          section_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
         end
       end
 
@@ -129,8 +126,7 @@ module IsoDoc
         else
           i = Counter.new
           clause.xpath(ns(SUBCLAUSES)).each do |c|
-            i.increment(c)
-            annex_names1(c, "#{num}.#{i.print}", 2)
+            annex_names1(c, "#{num}.#{i.increment(c).print}", 2)
           end
         end
         hierarchical_asset_names(clause, num)
@@ -141,8 +137,7 @@ module IsoDoc
                                    label: num, level: level, type: "clause" }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", level + 1)
+          annex_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
         end
       end
 

data/lib/isodoc/xref.rb

@@ -4,12 +4,14 @@ require_relative "xref/xref_gen_seq"
 require_relative "xref/xref_gen"
 require_relative "xref/xref_sect_gen"
 require_relative "class_utils"
+require_relative "function/utils"
 
 module IsoDoc
   class Xref
     include XrefGen::Anchor
     include XrefGen::Blocks
     include XrefGen::Sections
+    include Function::Utils
 
     attr_reader :klass
 

data/lib/isodoc/xslfo_convert.rb

@@ -8,7 +8,31 @@ module IsoDoc
     def initialize(options)
       @format = :pdf
       @suffix = "pdf"
+      @pdf_cmd_options = extract_cmd_options(options)
       super
+      %i(bodyfont headerfont monospacefont).each do |x|
+        @options.delete(x)
+      end
+    end
+
+    def extract_cmd_options(options)
+      ret = {}
+      a = options[:pdfencryptionlength] and ret["--encryption-length"] = a
+      a = options[:pdfownerpassword] and ret["--owner-password"] = a
+      a = options[:pdfuserpassword] and ret["--user-password"] = a
+      a = options[:pdfallowprint] and ret["--allow-print"] = a
+      a = options[:pdfallowcopycontent] and ret["--allow-copy-content"] = a
+      a = options[:pdfalloweditcontent] and ret["--allow-edit-content"] = a
+      a = options[:pdfalloweditannotations] and
+        ret["--allow-edit-annotations"] = a
+      a = options[:pdfallowfillinforms] and ret["--allow-fill-in-forms"] = a
+      a = options[:pdfallowaccesscontent] and
+        ret["--allow-access-content"] = a
+      a = options[:pdfallowassembledocument] and
+        ret["--allow-assemble-document"] = a
+      a = options[:pdfallowprinthq] and ret["--allow-print-hq"] = a
+      a = options[:pdfencryptmetadata] and ret["--encrypt-metadata"] = a
+      ret
     end
 
     def tmpimagedir_suffix
@@ -29,7 +53,7 @@ module IsoDoc
           @aligncrosselements.gsub(/,/, " ")
       @baseassetpath and
         ret["--param baseassetpath="] = @baseassetpath
-      ret
+      ret.merge(@pdf_cmd_options)
     end
 
     def convert(input_filename, file = nil, debug = false,
@@ -37,6 +61,7 @@ module IsoDoc
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
       input_filename, docxml, filename = input_xml_path(input_filename,
                                                         file, debug)
+      warn pdf_options(docxml).merge(@options)
       ::Metanorma::Output::XslfoPdf.new.convert(
         input_filename,
         output_filename || "#{filename}.#{@suffix}",

data/spec/isodoc/cleanup_spec.rb

@@ -1053,133 +1053,4 @@ RSpec.describe IsoDoc do
       </html>
     OUTPUT
   end
-
-  it "cleans up term sources" do
-    c = IsoDoc::HtmlConvert.new({ i18nyaml: "spec/assets/i18n.yaml" })
-    c.i18n_init("en", "Latn")
-    expect(xmlpp(c.textcleanup(<<~"INPUT").to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-               #{HTML_HDR}
-                     <p class="zzSTDTitle1"/>
-                     <div id="_terms_and_definitions"><h1>1.&#160; 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 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"><p class="example-title">EXAMPLE 1</p>
-               <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
-               <ul>
-               <li>A</li>
-               </ul>
-             </div>
-             <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f894" class="example"><p class="example-title">EXAMPLE 2</p>
-               <ul>
-               <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] Termbase IEV, term ID xyz [/TERMREF]</p>
-      <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION] [/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>
-             <p class="AltTerms" style="text-align:left;">rough rice</p>
-             <p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
-             <p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
-             <div id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><p class="example-title">EXAMPLE</p>
-               <ul>
-               <li>A</li>
-               </ul>
-             </div>
-             <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
-             <div class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
-             <p>[TERMREF]
-               <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>
-             [/TERMREF]</p></div>
-                   </div>
-                 </body>
-             </html>
-    INPUT
-      <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
-        <head/>
-        <body lang='en'>
-          <div class='title-section'>
-            <p>&#160;</p>
-          </div>
-          <br/>
-          <div class='prefatory-section'>
-            <p>&#160;</p>
-          </div>
-          <br/>
-          <div class='main-section'>
-            <p class='zzSTDTitle1'/>
-            <div id='_terms_and_definitions'>
-              <h1>1.&#160; 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 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'>
-                <p class='example-title'>EXAMPLE 1</p>
-                <p id='_65c9a509-9a89-4b54-a890-274126aeb55c'>Foreign seeds, husks, bran, sand, dust.</p>
-                <ul>
-                  <li>A</li>
-                </ul>
-              </div>
-              <div id='_bd57bbf1-f948-4bae-b0ce-73c00431f894' class='example'>
-                <p class='example-title'>EXAMPLE 2</p>
-                <ul>
-                  <li>A</li>
-                </ul>
-              </div>
-              <p>
-                [SOURCE:
-                <a href='#ISO7301'>ISO 7301:2011, Clause 3.1</a>
-                , modified &mdash; The term "cargo rice" is shown as deprecated, and
-                Note 1 to entry is not included here; Termbase IEV, term ID xyz;
-                Termbase IEV, term ID xyz, modified; Termbase IEV, term ID xyz,
-      modified &mdash; with adjustments]
-              </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>
-              <p class='AltTerms' style='text-align:left;'>rough rice</p>
-              <p class='DeprecatedTerms' style='text-align:left;'>DEPRECATED: cargo rice</p>
-              <p id='_eb29b35e-123e-4d1c-b50b-2714d41e747f'>rice retaining its husk after threshing</p>
-              <div id='_bd57bbf1-f948-4bae-b0ce-73c00431f893' class='example'>
-                <p class='example-title'>EXAMPLE</p>
-                <ul>
-                  <li>A</li>
-                </ul>
-              </div>
-              <div class='Note'>
-                <p>
-                  Note 1 to entry: The starch of waxy rice consists almost entirely of
-                  amylopectin. The kernels have a tendency to stick together after
-                  cooking.
-                </p>
-              </div>
-              <div class='Note'>
-                <p>
-                  Note 2 to entry:
-                  <ul>
-                    <li>A</li>
-                  </ul>
-                  <p id='_19830f33-e46c-42cc-94ca-a5ef101132d5'>
-                    The starch of waxy rice consists almost entirely of amylopectin.
-                    The kernels have a tendency to stick together after cooking.
-                  </p>
-                </p>
-              </div>
-              <p>
-                [SOURCE:
-                <a href='#ISO7301'>ISO 7301:2011, Clause 3.1</a>
-                ]
-              </p>
-            </div>
-          </div>
-        </body>
-      </html>
-    OUTPUT
-  end
 end

data/spec/isodoc/i18n_spec.rb

@@ -1082,6 +1082,44 @@ RSpec.describe IsoDoc do
       .to be_equivalent_to xmlpp(output)
   end
 
+  it "processes LTR within RTL" do
+    c = IsoDoc::Convert.new({})
+    c.convert_init(<<~"INPUT", "test", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata type="standard">
+      <language>fa</language>
+      <script>Arab</script>
+      </bibdata>
+      </iso-standard>
+    INPUT
+    expect(c.i18n.l10n("hello!", "en", "Latn")).to eq "&#x200e;hello!&#x200e;"
+  end
+
+  it "processes Hebrew RTL within LTR" do
+    c = IsoDoc::Convert.new({})
+    c.convert_init(<<~"INPUT", "test", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata type="standard">
+      <language>en</language>
+      </bibdata>
+      </iso-standard>
+    INPUT
+    expect(c.i18n.l10n("hello!", "he", "Hebr")).to eq "&#x200f;hello!&#x200f;"
+  end
+
+  it "processes Arabic RTL within LTR" do
+    c = IsoDoc::Convert.new({})
+    c.convert_init(<<~"INPUT", "test", false)
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata type="standard">
+      <language>en</language>
+      </bibdata>
+      </iso-standard>
+    INPUT
+    expect(c.i18n.l10n("hello!", "fa", "Arab")).to eq "&#x61c;hello!&#x61c;"
+  end
+
+
   private
 
   def mock_i18n

data/spec/isodoc/inline_spec.rb

@@ -671,7 +671,7 @@ RSpec.describe IsoDoc do
             <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>
+              <preferred><strong>Second Term</strong>, &#x3c;Field, Usage Info 1&#x3e;</preferred>
               <definition>Definition 1</definition>
             </term>
             <term id='C'>

data/spec/isodoc/postproc_spec.rb

@@ -446,42 +446,6 @@ RSpec.describe IsoDoc do
     OUTPUT
   end
 
-  it "populates Word template with terms reference labels" do
-    FileUtils.rm_f "test.doc"
-    FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new(
-      { wordstylesheet: "spec/assets/word.css",
-        htmlstylesheet: "spec/assets/html.scss" },
-    ).convert("test", <<~"INPUT", false)
-              <iso-standard xmlns="http://riboseinc.com/isoxml">
-          <sections>
-          <terms id="_terms_and_definitions" obligation="normative"><title>1.<tab/>Terms and Definitions</title>
-      <term id="paddy1"><name>1.1.</name><preferred>paddy</preferred>
-      <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
-      <termsource status="modified">
-        <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011">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></term>
-      </terms>
-      </sections>
-      </iso-standard>
-    INPUT
-    word = File.read("test.doc")
-      .sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">')
-      .sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
-    expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-          <div class="WordSection3">
-              <p class="zzSTDTitle1"></p>
-              <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and Definitions</h1>
-      <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
-      <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
-      <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified &#x2014; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
-            </div>
-    OUTPUT
-  end
-
   it "populates Word header" do
     FileUtils.rm_f "test.doc"
     IsoDoc::WordConvert.new(
@@ -1220,43 +1184,6 @@ RSpec.describe IsoDoc do
     expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2\.</h2>})
   end
 
-  it "processes empty term modifications" do
-    FileUtils.rm_f "test.html"
-    FileUtils.rm_f "test.doc"
-    IsoDoc::HtmlConvert.new(options)
-      .convert("test", <<~"INPUT", false)
-            <iso-standard xmlns="http://riboseinc.com/isoxml">
-            <sections>
-            <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
-        <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>
-        <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
-          <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="modified">
-          <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011">ISO 7301:2011, Clause 3.1</origin>
-            <modification>
-            <p id="_e73a417d-ad39-417d-a4c8-20e4e2529489"/>
-          </modification>
-        </termsource></term>
-        </terms>
-        </sections>
-        </iso-standard>
-      INPUT
-    expect(File.exist?("test.html")).to be true
-    html = File.read("test.html")
-    expect(html).to include '[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified]'
-  end
-
   it "creates continuation styles for multiparagraph list items in Word" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"