isodoc 1.6.6 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e13114c8da44d9c17bde29fc00a863856d92f156179d0e17cb68fe44acf15c6
-  data.tar.gz: 48059fef1258601881461467f15ff9eddd2c3438569f4db009d4534df24705e0
+  metadata.gz: b64ad76ffcf7c9f1ced2c15c41a263e49e62cfa4294d31066ba2e358e613fb35
+  data.tar.gz: f35ca08d240ae7cdb7ba9aa0c9e071ec284d051f0d61c82542d461e101d0da38
 SHA512:
-  metadata.gz: 111193af048da068dbf1f6fe6e687d7ceb16f828d5f34a65c09cb5a4a12ea8fc9e8818a7df5f507bb8aea7f76dcb07b76463d59285aad3e6b185a6dc43208775
-  data.tar.gz: 6563bf3f6aa6693b8cea2bfb04962399bb5821d992f68cc981137a09a81bbc0c870a558b4f3de1c3c48ce4cb0a46b6e695af4f33c00ded7f0b29c334ca91077f
+  metadata.gz: 3062ddc15478efad6f25fb39e37689fecab84750b34c2496f5693af1b52c864053f50acf3af141d876e8cb8d2d19f89ecdd19e630ab1b1da9e953e897f2ab68a
+  data.tar.gz: 14d688526a710b92cf2256e49df75e4abcf5a67ed7de40e6593cedf1a99e96561ba5024398ae7c767d78a4e0d74e18df344423cfbc83dd75e2afa28beeea0006

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

@@ -18,29 +18,23 @@ clause: فقرة
 annex: ملحق
 appendix: تذييل
 no_terms_boilerplate: |
-  <p>No terms and definitions are listed in this document.</p>
+  <p>لم يتم سرد أي مصطلحات وتعريفات في هذا المستند.</p>
 internal_terms_boilerplate: |
-  <p>For the purposes of this document,
-            the following terms and definitions apply.</p>
+  <p>لأغراض هذا المستند، تنطبق المصطلحات والتعريفات التالية.</p>
 norm_with_refs_pref:
-  The following documents are referred to in the text in such a way
-      that some or all of their content constitutes requirements of this
-      document. For dated references, only the edition cited applies.
-      For undated references, the latest edition of the referenced
-      document (including any amendments) applies.
+  تتم الإشارة إلى المستندات التالية في النص بحيث يشكل بعض أو كل محتوياتها متطلبات هذا المستند. للحصول على مراجع مؤرخة، تطبق النسخة المشار إليها فقط. بالنسبة للمراجع غير المؤرخة ، تنطبق أحدث طبعة من الوثيقة المشار إليها (بما في ذلك أي تعديلات).
 norm_empty_pref:
-  There are no normative references in this document.
+  لا توجد مراجع معيارية في هذه الوثيقة.
 external_terms_boilerplate: |
-  <p>For the purposes of this document,
-    the terms and definitions given in % apply.</p>
+  <p> لأغراض هذا المستند ، تنطبق المصطلحات والتعريفات الواردة في%. </ p>
 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 %]"
+  <p>لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.</p>
+term_defined_in: "[المصطلح المحدد في %]"
 note: ملاحظة
 note_xref: ملاحظة
-termnote: Note % to entry
+termnote: ملاحظة % للقيد
 list: قائمة
+deflist: قائمة تعريف
 figure: شكل
 formula: معادلة
 inequality: عدم مساواة
@@ -48,16 +42,16 @@ table: جدول
 requirement: مطلب
 recommendation: توصية
 permission: إذن
-key: Key
+key: مفتاح
 example: مثال
 example_xref: مثال
 where: حيث
 wholeoftext: كامل النص
-draft_label: draft
-inform_annex: informative
-norm_annex: normative
+draft_label: مسودة
+inform_annex: إخباري
+norm_annex: مقياسي
 modified: معدلة
-deprecated: DEPRECATED
+deprecated: مهمل
 source: مصدر
 and: و
 all_parts: كل الأجزاء
@@ -78,8 +72,8 @@ subject: موضوع
 inherits: يرث
 admonition:
   danger: خطر
-  warning: Warning
-  caution: Caution
+  warning: تحذير
+  caution: حذر
   important: مهم
   safety precautions: احتياطات السلامة
 locality:
@@ -108,9 +102,9 @@ inflection:
   ملاحظة:
     sg: ملاحظة
     pl: ملاحظات
-  "Note % to entry":
-    sg: Note % to entry
-    pl: Notes % to entry
+  "ملاحظة % للقيد":
+    sg: ملاحظة % للقيد
+    pl: ملاحظات % للقيد
   قائمة:
     sg: قائمة
     pl: قوائم

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

@@ -36,6 +36,7 @@ note: HINWEIS
 note_xref: Hinweis
 termnote: Hinweis % zum Eintrag
 list: Liste
+deflist: Definitionsliste
 figure: Abbildung
 formula: Formel
 inequality: Formel

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

@@ -42,6 +42,7 @@ note: NOTE
 note_xref: Note
 termnote: Note % to entry
 list: List
+deflist: Definition List
 figure: Figure
 formula: Formula
 inequality: Formula

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

@@ -38,6 +38,7 @@ note: NOTA
 note_xref: Nota
 termnote: Nota % a la entrada
 list: Lista
+deflist: Lista de definiciones
 figure: Figura
 formula: Fórmula
 inequality: Fórmula

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

@@ -38,6 +38,7 @@ figure: Figure
 formula: Formule
 inequality: Formule
 list: Liste
+deflist: Liste de définitions
 table: Tableau
 requirement: Exigence
 recommendation: Recommandation

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

@@ -41,6 +41,7 @@ note: ПРИМЕЧАНИЕ
 note_xref: Примечание
 termnote: Примечание % к определению
 list: Список
+deflist: Список определений
 figure: Рисунок
 formula: Формула
 inequality: Формула

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

@@ -40,6 +40,7 @@ figure: 图
 formula: 公式
 inequality: 公式
 list: 列项
+deflist: 定义列表
 table: 表
 requirement: 要求
 recommendation: 建议

data/lib/isodoc/convert.rb

@@ -145,7 +145,7 @@ module IsoDoc
     end
 
     def convert_init(file, input_filename, debug)
-      docxml = Nokogiri::XML(file)
+      docxml = Nokogiri::XML(file) { |config| config.huge }
       filename, dir = init_file(input_filename, debug)
       docxml.root.default_namespace = ""
       lang = docxml&.at(ns("//bibdata/language"))&.text and @lang = lang

data/lib/isodoc/function/blocks.rb

@@ -23,7 +23,7 @@ module IsoDoc::Function
     end
 
     def figure_key(out)
-      out.p **{ style: "page-break-after:avoid;"} do |p|
+      out.p **{ style: "page-break-after:avoid;" } do |p|
         p.b { |b| b << @i18n.key }
       end
     end
@@ -61,7 +61,7 @@ module IsoDoc::Function
       @in_figure = false
     end
 
-    def sourcecode_name_parse(node, div, name)
+    def sourcecode_name_parse(_node, div, name)
       return if name.nil?
 
       div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
@@ -143,7 +143,7 @@ module IsoDoc::Function
 
     def formula_parse1(node, out)
       out.div **attr_code(class: "formula") do |div|
-        div.p do |p|
+        div.p do |_p|
           parse(node.at(ns("./stem")), div)
           if lbl = node&.at(ns("./name"))&.text
             insert_tab(div, 1)
@@ -219,13 +219,13 @@ module IsoDoc::Function
 
     def passthrough_parse(node, out)
       return if node["format"] &&
-        !(node["format"].split(/,/).include? @format.to_s)
+        !(node["format"].split(",").include? @format.to_s)
 
       out.passthrough node.text
     end
 
     def svg_parse(node, out)
-      out << node.to_xml
+      out.parent.add_child(node)
     end
   end
 end

data/lib/isodoc/function/form.rb

@@ -1,48 +1,51 @@
-module IsoDoc::Function
-  module Form
-    def form_parse(node, out)
-      node.children.each do |n|
-        parse(n, out)
+module IsoDoc
+  module Function
+    module Form
+      def form_parse(node, out)
+        out.div **attr_code(class: node["class"],
+                            id: node["id"]) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
+        end
       end
-    end
 
-    def input_parse(node, out)
-      case node["type"]
-      when "button" then out << "[#{node['value'] || 'BUTTON'}]"
-      when "checkbox" then out << "&#x2610; "
-      when "date" then text_input(out)
-      when "file" then text_input(out)
-      when "password" then text_input(out)
-      when "radio" then out << "&#x25CE; "
-      when "submit" # nop
-      when "text" then text_input(out, node["maxlength"])
+      def input_parse(node, out)
+        case node["type"]
+        when "button" then out << "[#{node['value'] || 'BUTTON'}]"
+        when "checkbox" then out << "&#x2610; "
+        when "date", "file", "password" then text_input(out)
+        when "radio" then out << "&#x25CE; "
+        when "submit" # nop
+        when "text" then text_input(out, node["maxlength"])
+        end
       end
-    end
 
-    def text_input(out, length = 10)
-      length ||= 10
-      length = length.to_i
-      length.zero? and length = 10
-      out << "_" * length
-      out << " "
-    end
+      def text_input(out, length = 10)
+        length ||= 10
+        length = length.to_i
+        length.zero? and length = 10
+        out << "_" * length
+        out << " "
+      end
 
-    def select_parse(node, out)
-      text_input(out, node["size"] || 10)
-    end
+      def select_parse(node, out)
+        text_input(out, node["size"] || 10)
+      end
 
-    def label_parse(node, out)
-      node.children.each do |n|
-        parse(n, out)
+      def label_parse(node, out)
+        node.children.each do |n|
+          parse(n, out)
+        end
       end
-    end
 
-    def option_parse(node, out); end
+      def option_parse(node, out); end
 
-    def textarea_parse(_node, out)
-      out.table **{ border: 1, width: "50%" } do |t|
-        t.tr do |tr|
-          tr.td do |td|
+      def textarea_parse(_node, out)
+        out.table **{ border: 1, width: "50%" } do |t|
+          t.tr do |tr|
+            tr.td do |td|
+            end
           end
         end
       end

data/lib/isodoc/function/inline.rb

@@ -71,7 +71,11 @@ module IsoDoc::Function
     end
 
     def termrefelem_parse(node, out)
-      out << "Termbase #{node['base']}, term ID #{node['target']}"
+      if node.text.strip.empty?
+        out << "Termbase #{node['base']}, term ID #{node['target']}"
+      else
+        node.children.each { |n| parse(n, out) }
+      end
     end
 
     def stem_parse(node, out)

data/lib/isodoc/function/references.rb

@@ -58,7 +58,7 @@ module IsoDoc::Function
                     "@type = 'ISBN']"))
       return [id, id1, id2] if id || id1 || id2
 
-      id = Nokogiri::XML::Node.new("docidentifier", b.document)
+      id = Nokogiri::XML::Node.new("docidentifier", bib.document)
       id << "(NO ID)"
       [nil, id, nil]
     end

data/lib/isodoc/html_function/form.rb

@@ -1,61 +1,64 @@
-module IsoDoc::HtmlFunction
-  module Form
-    def form_parse(node, out)
-      out.form **attr_code(id: node["id"], name: node["name"],
-                           action: node["action"]) do |div|
-        node.children.each do |n|
-          parse(n, div)
+module IsoDoc
+  module HtmlFunction
+    module Form
+      def form_parse(node, out)
+        out.form **attr_code(id: node["id"], name: node["name"],
+                             class: node["class"],
+                             action: node["action"]) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
         end
       end
-    end
 
-    def input_parse(node, out)
-      out.input nil, **attr_code(
-        id: node["id"], name: node["name"], type: node["type"],
-        value: node["value"], disabled: node["disabled"],
-        readonly: node["readonly"], checked: node["checked"],
-        maxlength: node["maxlength"], minlength: node["minlength"]
-      )
-    end
+      def input_parse(node, out)
+        out.input nil, **attr_code(
+          id: node["id"], name: node["name"], type: node["type"],
+          value: node["value"], disabled: node["disabled"],
+          readonly: node["readonly"], checked: node["checked"],
+          maxlength: node["maxlength"], minlength: node["minlength"]
+        )
+      end
 
-    def select_parse(node, out)
-      selected = node.at(ns("./option[@value = '#{node['value']}']"))
-      selected and selected["selected"] = true
-      out.select **attr_code(
-        id: node["id"], name: node["name"], size: node["size"],
-        disabled: node["disabled"], multiple: node["multiple"]
-      ) do |div|
-        node.children.each do |n|
-          parse(n, div)
+      def select_parse(node, out)
+        selected = node.at(ns("./option[@value = '#{node['value']}']"))
+        selected and selected["selected"] = true
+        out.select **attr_code(
+          id: node["id"], name: node["name"], size: node["size"],
+          disabled: node["disabled"], multiple: node["multiple"]
+        ) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
         end
       end
-    end
 
-    def label_parse(node, out)
-      out.label **attr_code(for: node["for"]) do |div|
-        node.children.each do |n|
-          parse(n, div)
+      def label_parse(node, out)
+        out.label **attr_code(for: node["for"]) do |div|
+          node.children.each do |n|
+            parse(n, div)
+          end
         end
       end
-    end
 
-    def option_parse(node, out)
-      out.option **attr_code(
-        disabled: node["disabled"], selected: node["selected"],
-        value: node["value"]
-      ) do |o|
-        node.children.each do |n|
-          parse(n, o)
+      def option_parse(node, out)
+        out.option **attr_code(
+          disabled: node["disabled"], selected: node["selected"],
+          value: node["value"]
+        ) do |o|
+          node.children.each do |n|
+            parse(n, o)
+          end
         end
       end
-    end
 
-    def textarea_parse(node, out)
-      out.textarea **attr_code(
-        id: node["id"], name: node["name"], rows: node["rows"],
-        cols: node["cols"]
-      ) do |div|
-        node["value"] and div << node["value"]
+      def textarea_parse(node, out)
+        out.textarea **attr_code(
+          id: node["id"], name: node["name"], rows: node["rows"],
+          cols: node["cols"]
+        ) do |div|
+          node["value"] and div << node["value"]
+        end
       end
     end
   end

data/lib/isodoc/html_function/html.rb

@@ -74,6 +74,8 @@ module IsoDoc::HtmlFunction
     end
 
     def html_button
+      return "" if @bare
+
       '<button onclick="topFunction()" id="myBtn" '\
         'title="Go to top">Top</button>'.freeze
     end

data/lib/isodoc/html_function/postprocess.rb

@@ -19,7 +19,6 @@ module IsoDoc
 
       def toHTML(result, filename)
         result = from_xhtml(html_cleanup(to_xhtml(result)))
-        # result = populate_template(result, :html)
         result = from_xhtml(move_images(to_xhtml(result)))
         result = html5(script_cdata(inject_script(result)))
         File.open(filename, "w:UTF-8") { |f| f.write(result) }
@@ -33,7 +32,14 @@ module IsoDoc
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
         html = footnote_format(footnote_backlinks(html_toc(html)))
-        mathml(html_list_clean(html))
+        mathml(html_list_clean(remove_placeholder_paras(html)))
+      end
+
+      def remove_placeholder_paras(html)
+        %w(title-section prefatory-section).each do |s|
+          html&.at("//div[@class = '#{s}']/p[last()]")&.remove
+        end
+        html
       end
 
       def html_list_clean(html)
@@ -68,6 +74,7 @@ module IsoDoc
         head = docxml.at("//*[local-name() = 'head']")
         head << htmlstylesheet(@htmlstylesheet)
         s = htmlstylesheet(@htmlstylesheet_override) and head << s
+        @bare and head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
         docxml
       end
 
@@ -99,7 +106,6 @@ module IsoDoc
       def html_cover(docxml)
         doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="title-section"]')
-        # d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
         d.children.first.add_previous_sibling(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )
@@ -108,7 +114,6 @@ module IsoDoc
       def html_intro(docxml)
         doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="prefatory-section"]')
-        # d.children.first.add_previous_sibling doc.to_xml(encoding: "US-ASCII")
         d.children.first.add_previous_sibling(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )