isodoc 2.0.4 → 2.0.5.2

data/lib/isodoc/word_function/postprocess.rb

@@ -165,9 +165,7 @@ module IsoDoc
         xpath.each do |list|
           (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |l|
             l.xpath("./p | ./div | ./table").each_with_index do |p, i|
-              next if i.zero?
-
-              p.wrap(%{<div class="ListContLevel#{lvl}"/>})
+              i.zero? or p.wrap(%{<div class="ListContLevel#{lvl}"/>})
             end
             list_add(l.xpath(".//ul") - l.xpath(".//ul//ul | .//ol//ul"),
                      lvl + 1)
@@ -212,10 +210,10 @@ module IsoDoc
       def word_remove_pb_before_annex(docxml)
         docxml.xpath("//div[p/br]").each do |d|
           /^WordSection\d+_\d+$/.match(d["class"]) or next
-          d.elements[0].name == "p" && !d.elements[0].elements.empty? or next
-          d.elements[0].elements[0].name == "br" &&
+          (d.elements[0].name == "p" && !d.elements[0].elements.empty?) or next
+          (d.elements[0].elements[0].name == "br" &&
             d.elements[0].elements[0]["style"] ==
-              "mso-special-character:line-break;page-break-before:always" or next
+              "mso-special-character:line-break;page-break-before:always") or next
           d.elements[0].remove
         end
       end

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -24,7 +24,12 @@ module IsoDoc
       end
 
       def insert_toc(intro, docxml, level)
-        intro.sub(/WORDTOC/, make_WordToC(docxml, level))
+        toc = ""
+        toc += make_WordToC(docxml, level)
+        toc += make_TableWordToC(docxml)
+        toc += make_FigureWordToC(docxml)
+        toc += make_RecommendationWordToC(docxml)
+        intro.sub(/WORDTOC/, toc)
       end
 
       def word_toc_entry(toclevel, heading)
@@ -77,6 +82,82 @@ module IsoDoc
                 %{\\1#{word_toc_preface(level)}}) + WORD_TOC_SUFFIX1
       end
 
+      WORD_TOC_RECOMMENDATION_PREFACE1 = <<~TOC.freeze
+        <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle&quot;
+        <span style='mso-element:field-separator'></span></span>
+      TOC
+
+      WORD_TOC_TABLE_PREFACE1 = <<~TOC.freeze
+        <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
+        style='mso-element:field-separator'></span></span>
+      TOC
+
+      WORD_TOC_FIGURE_PREFACE1 = <<~TOC.freeze
+        <span lang="EN-GB"><span
+        style='mso-element:field-begin'></span><span
+        style='mso-spacerun:yes'>&#xA0;</span>TOC
+        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
+        style='mso-element:field-separator'></span></span>
+      TOC
+
+      def make_TableWordToC(docxml)
+        (docxml.at("//p[@class = 'TableTitle']") && @toctablestitle) or
+          return ""
+        toc = %{<p class="TOCTitle">#{@toctablestitle}</p>}
+        docxml.xpath("//p[@class = 'TableTitle']").each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_TABLE_PREFACE1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def make_FigureWordToC(docxml)
+        (docxml.at("//p[@class = 'FigureTitle']") && @tocfigurestitle) or
+          return ""
+        toc = %{<p class="TOCTitle">#{@tocfigurestitle}</p>}
+        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_FIGURE_PREFACE1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def make_RecommendationWordToC(docxml)
+        (docxml.at("//p[@class = 'RecommendationTitle']") &&
+          @tocrecommendationstitle) or return ""
+        toc = %{<p class="TOCTitle">#{@tocrecommendationstitle}</p>}
+        docxml.xpath("//p[@class = 'RecommendationTitle' or @class = 'RecommendationTestTitle']").sort_by do |h|
+          recommmendation_sort_key(h.text)
+        end.each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{WORD_TOC_RECOMMENDATION_PREFACE1}}) + WORD_TOC_SUFFIX1
+      end
+
+      def recommmendation_sort_key(header)
+        m = /^([^0-9]+) (\d+)/.match(header) || /^([^:]+)/.match(header)
+        m ||= [header, nil]
+        ret = "#{recommmendation_sort_key1(m[1])}::"
+        m[2] and ret += ("%04d" % m[2].to_i).to_s
+        ret
+      end
+
+      def recommmendation_sort_key1(type)
+        case type&.downcase
+        when "requirement" then "04"
+        when "recommendation" then "05"
+        when "permission" then "06"
+        else type
+        end
+      end
+
       def authority_cleanup1(docxml, klass)
         dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
         auth = docxml.at("//div[@id = 'boilerplate-#{klass}' "\

data/lib/isodoc/xref/xref_anchor.rb

@@ -54,6 +54,7 @@ module IsoDoc
         ret[:xref].gsub!(/ $/, "")
         ret[:container] = @klass.get_clause_id(container) unless container.nil?
         ret[:type] = type
+        ret[:elem] = elem
         ret[:value] = anchor_struct_value(lbl, elem)
         ret
       end

data/lib/isodoc/xref/xref_gen.rb

@@ -48,7 +48,8 @@ module IsoDoc
           t.xpath(ns("./termnote")).reject { |n| blank?(n["id"]) }.each do |n|
             c.increment(n)
             @anchors[n["id"]] =
-              { label: termnote_label(c.print), type: "termnote", value: c.print,
+              { label: termnote_label(c.print), type: "termnote",
+                value: c.print, elem: @labels["termnote"],
                 xref: l10n("#{anchor(t['id'], :xref)}, "\
                            "#{@labels['note_xref']} #{c.print}") }
           end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -49,7 +49,7 @@ module IsoDoc
 
         @anchors[clause["id"]] =
           { label: nil, level: 1, xref: preface_clause_name(clause),
-            type: "clause" }
+            type: "clause", elem: @labels["clause"] }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names1(c, c.at(ns("./title"))&.text,
                          "#{preface_clause_name(clause)}, #{i + 1}", 2)
@@ -58,8 +58,8 @@ module IsoDoc
 
       def preface_names1(clause, title, parent_title, level)
         label = title || parent_title
-        @anchors[clause["id"]] =
-          { label: nil, level: level, xref: label, type: "clause" }
+        @anchors[clause["id"]] = { label: nil, level: level, xref: label,
+                                   type: "clause", elem: @labels["clause"] }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i + 1}",
                          level + 1)
@@ -86,7 +86,7 @@ module IsoDoc
         num.increment(clause)
         @anchors[clause["id"]] =
           { label: num.print, xref: l10n("#{@labels['clause']} #{num.print}"),
-            level: lvl, type: "clause" }
+            level: lvl, type: "clause", elem: @labels["clause"] }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           section_names1(c, "#{num.print}.#{i.increment(c).print}", lvl + 1)
@@ -97,7 +97,7 @@ module IsoDoc
       def section_names1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level, xref: l10n("#{@labels['clause']} #{num}"),
-            type: "clause" }
+            type: "clause", elem: @labels["clause"] }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           section_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
@@ -121,10 +121,15 @@ module IsoDoc
         a[0]
       end
 
+      def annex_name_anchors(clause, num)
+        { label: annex_name_lbl(clause, num),
+          elem: @labels["annex"],
+          type: "clause", value: num.to_s, level: 1,
+          xref: "#{@labels['annex']} #{num}" }
+      end
+
       def annex_names(clause, num)
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                   type: "clause", value: num.to_s, level: 1,
-                                   xref: "#{@labels['annex']} #{num}" }
+        @anchors[clause["id"]] = annex_name_anchors(clause, num)
         if a = single_annex_special_section(clause)
           annex_names1(a, num.to_s, 1)
         else
@@ -138,6 +143,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { xref: "#{@labels['annex']} #{num}",
+                                   elem: @labels["annex"],
                                    label: num, level: level, type: "clause" }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|

data/lib/isodoc/xslfo_convert.rb

@@ -2,8 +2,21 @@ require "metanorma"
 
 module IsoDoc
   class XslfoPdfConvert < ::IsoDoc::Convert
-    MN2PDF_OPTIONS = :mn2pdf
+    # MN2PDF_OPTIONS = :mn2pdf
     MN2PDF_FONT_MANIFEST = :font_manifest
+    MN2PDF_OPTIONS = { pdfencryptionlength: "--encryption-length",
+                       pdfownerpassword: "--owner-password",
+                       pdfuserpassword: "--user-password",
+                       pdfallowprint: "--allow-print",
+                       pdfallowcopycontent: "--allow-copy-content",
+                       pdfalloweditcontent: "--allow-edit-content",
+                       pdfalloweditannotations: "--allow-edit-annotations",
+                       pdfallowfillinforms: "--allow-fill-in-forms",
+                       pdfallowaccesscontent: "--allow-access-content",
+                       pdfallowassembledocument: "--allow-assemble-document",
+                       pdfallowprinthq: "--allow-print-hq",
+                       pdfencryptmetadata: "--encrypt-metadata" }.freeze
+    MN2PDF_DEFAULT_ARGS = { "--syntax-highlight": nil }.freeze
 
     def initialize(options)
       @format = :pdf
@@ -13,22 +26,10 @@ module IsoDoc
     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 = MN2PDF_DEFAULT_ARGS.dup
+      MN2PDF_OPTIONS.each do |key, opt|
+        value = options[key] and ret[opt] = value
+      end
       ret
     end
 
@@ -42,8 +43,7 @@ module IsoDoc
 
     def pdf_options(_docxml)
       ret = {}
-      font_manifest = @options.dig(MN2PDF_OPTIONS,
-                                   MN2PDF_FONT_MANIFEST) and
+      font_manifest = @options[MN2PDF_FONT_MANIFEST] and
         ret[MN2PDF_FONT_MANIFEST] = font_manifest
       @aligncrosselements && !@aligncrosselements.empty? and
         ret["--param align-cross-elements="] =

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

@@ -30,6 +30,14 @@ external_terms_boilerplate: |
 internal_external_terms_boilerplate: |
   <p>لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.</p>
 term_defined_in: "[المصطلح المحدد في %]"
+binary_and: "%1 و %2"
+multiple_and: "%1, و %2"
+binary_or: "%1 او %2"
+multiple_or: "%1, او %2"
+chain_and: "%1 و %2"
+chain_or: "%1 او %2"
+chain_from: "%1 %من 2"
+chain_to: "من %1 إلى %2"
 note: ملاحظة
 note_xref: ملاحظة
 termnote: ملاحظة % للقيد
@@ -55,6 +63,9 @@ deprecated: مهمل
 source: مصدر
 and: و
 all_parts: كل الأجزاء
+toc_figures: جدول الأرقام
+toc_tables: جدول الجداول
+toc_recommendations: جدول التوصيات
 month_january: يناير
 month_february: فبراير
 month_march: مارس

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

@@ -32,6 +32,14 @@ external_terms_boilerplate: |
 internal_external_terms_boilerplate: |
           <p>Für die Zwecke dieses Dokuments gelten die in % und im Folgenden aufgeführten Begriffe und Definitionen.</p>
 term_defined_in: "[Begriff definiert in %]"
+binary_and: "%1 und %2"
+multiple_and: "%1, und %2"
+binary_or: "%1 oder %2"
+multiple_or: "%1, oder %2"
+chain_and: "%1 und %2"
+chain_or: "%1 oder %2"
+chain_from: "%1 von %2"
+chain_to: "%1 bis %2"
 note: HINWEIS
 note_xref: Hinweis
 termnote: Hinweis % zum Eintrag
@@ -57,6 +65,9 @@ deprecated: DEPRECATED
 source: QUELLE
 and: und
 all_parts: Alle Teile
+toc_figures: Abbildungsverzeichnis
+toc_tables: Tabellenverzeichnis
+toc_recommendations: Empfehlungenverzeichnis
 month_january: Januar
 month_february: Februar
 month_march: März

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

@@ -38,6 +38,14 @@ internal_external_terms_boilerplate: |
           <p>For the purposes of this document, the terms and definitions 
             given in % and the following apply.</p>
 term_defined_in: "[term defined in %]"
+binary_and: "%1 and %2"
+multiple_and: "%1, and %2"
+binary_or: "%1 or %2"
+multiple_or: "%1, or %2"
+chain_and: "%1 and %2"
+chain_or: "%1 or %2"
+chain_from: "%1 from %2"
+chain_to: "%1 to %2"
 note: NOTE
 note_xref: Note
 termnote: Note % to entry
@@ -63,6 +71,9 @@ deprecated: DEPRECATED
 source: SOURCE
 and: and
 all_parts: All Parts
+toc_figures: List of figures
+toc_tables: List of tables
+toc_recommendations: List of recommendations
 month_january: January
 month_february: February
 month_march: March

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

@@ -34,6 +34,14 @@ external_terms_boilerplate: |
 internal_external_terms_boilerplate: |
           <p>Para los propósitos de este documento, se aplican los términos y definiciones dados en % y los siguientes.</p>
 term_defined_in: "[término definido en %]"
+binary_and: "%1 y %2"
+multiple_and: "%1, y %2"
+binary_or: "%1 o %2"
+multiple_or: "%1, o %2"
+chain_and: "%1 y %2"
+chain_or: "%1 o %2"
+chain_from: "%1 del %2"
+chain_to: "%1 al %2"
 note: NOTA
 note_xref: Nota
 termnote: Nota % a la entrada
@@ -59,6 +67,9 @@ deprecated: OBSOLETO
 source: FUENTE
 and: y
 all_parts: Todas las partes
+toc_figures: Table de figuras
+toc_tables: Tabla de tablas
+toc_recommendations: Tabla de recomendaciones
 month_january: Enero
 month_february: Febrero
 month_march: Marzo

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

@@ -31,6 +31,14 @@ external_terms_boilerplate: |
 internal_external_terms_boilerplate: |
           <p>Pour les besoins du présent document, les termes et définitions de % ainsi que les suivants, s’appliquent.</p>
 term_defined_in: "[terme défini dans %]"
+binary_and: "%1 et %2"
+multiple_and: "%1, et %2"
+binary_or: "%1 ou %2"
+multiple_or: "%1, ou %2"
+chain_and: "%1 et %2"
+chain_or: "%1 ou %2"
+chain_from: "%1 de %2"
+chain_to: "%1 à %2"
 note: NOTE
 note_xref: Note
 termnote: Note % à l’article
@@ -56,6 +64,9 @@ deprecated: DÉCONSEILLÉ
 source: SOURCE
 and: et
 all_parts: toutes les parties
+toc_figures: Table des figures
+toc_tables: Table des tableaux
+toc_recommendations: Table de recommandations
 month_january: Janvier
 month_february: Février
 month_march: Mars

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

@@ -37,6 +37,14 @@ internal_external_terms_boilerplate: |
           <p>Для целей этого документа применяются 
             термины и определения, данные в % и следующие.</p>
 term_defined_in: "[термин, определенный в %]"
+binary_and: "%1 и %2"
+multiple_and: "%1, и %2"
+binary_or: "%1 или %2"
+multiple_or: "%1, или %2"
+chain_and: "%1 и %2"
+chain_or: "%1 или %2"
+chain_from: "%1 от %2"
+chain_to: "%1 до %2"
 note: ПРИМЕЧАНИЕ
 note_xref: Примечание
 termnote: Примечание % к определению
@@ -62,6 +70,9 @@ deprecated: НЕ РЕКОМЕНДУЕТСЯ
 source: ИСТОЧНИК
 and: и
 all_parts: Все части
+toc_figures: Таблица фигур
+toc_tables: Таблица таблиц
+toc_recommendations: Таблица рекомендаций
 month_january: Январь
 month_february: Февраль
 month_march: Март

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

@@ -33,6 +33,14 @@ external_terms_boilerplate: |
 internal_external_terms_boilerplate: |
           <p>% 界定的以及下列术语和定义适用于本文件。</p>
 term_defined_in: "〖术语于%中定义〗"
+binary_and: "%1和%2"
+multiple_and: "%1和%2"
+binary_or: "%1或%2"
+multiple_or: "%1或%2"
+chain_and: "%1和%2"
+chain_or: "%1或%2"
+chain_from: "%1从%2"
+chain_to: "%1到%2"
 note: 注
 note_xref: 注
 termnote: 注%
@@ -58,6 +66,9 @@ deprecated: 被取代
 source: 定义
 and: 和
 all_parts: 所有部分
+toc_figures: 数字列表
+toc_tables: 表列表
+toc_recommendations: 建议清单
 month_january: 一月
 month_february: 二月
 month_march: 三月

data/spec/isodoc/blocks_spec.rb

@@ -1529,7 +1529,7 @@ RSpec.describe IsoDoc do
 
 
         <p id="_d4fd0a61-f300-4285-abe6-602707590e53">This International Standard gives the minimum specifications for rice (<i>Oryza sativa</i> L.) which is subject to international trade. It is applicable to the following types: husked rice and milled rice, parboiled or not, intended for direct human consumption. It is neither applicable to other products derived from rice, nor to waxy rice (glutinous rice).</p>
-      <p class="QuoteAttribution">&#8212; ISO, <a href="#ISO7301">ISO 7301:2011, Clause 1</a></p></div>
+      <p class="QuoteAttribution">&#8212; ISO, ISO 7301:2011, Clause 1</p></div>
               </div>
               <p class="zzSTDTitle1"/>
             </div>