isodoc 1.6.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17e14b978b65a7667074ab1dff17bd5dc76a58e6baf7ace593407dc921ddf558
-  data.tar.gz: 3622549bc44570ec6e8de62fb55a62af937e32306ccc444bfaf0a1063caae511
+  metadata.gz: 69357a32a0ea52a4575c37f79a94d8c0108a9a2f84654ce4dcbd58a472020b80
+  data.tar.gz: 02605ddddc513099f73d724c0afffe084cbd6de3ad13cf4267d23772697f839d
 SHA512:
-  metadata.gz: 2cffca2a878c9bc3e05d26b85edb21be9ff27a75b8fd6e9ab7b31cdb861915b41baeb9e4b4027fb5f8f5e751879143dd55ea7cc35d46d6feb507d2a83632ff2b
-  data.tar.gz: 5146c2a8457a5f41232b6176acb3bf5fd77bfb75941b9030f6c015463cfe7646e6a3df153423229a3c9a17e0aa6c02529062bffdd1e98ad116fb91f1d61f6306
+  metadata.gz: 4b35bc0f9b1fda5a62971decf1106655c8b7170dde78a8609b93cfeeafa800feceba3575fb4ed220eb117bf763d04de43786ea6843182bfda1b41b4fc271ae90
+  data.tar.gz: 9a904c7285684c64b387654397d29a64db4e24604e68bb7a07a5c86c853eb89607b515aa47a8f59f5d6c4e08b0ffcf5f9381ae95e8a219060edd0c021cbe822a

data/isodoc.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc", "~> 1.1.1"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "liquid", "~> 4"
-  spec.add_dependency "metanorma", ">= 1.2.0"
+  #spec.add_dependency "metanorma", ">= 1.2.0"
   spec.add_dependency "nokogiri", "~> 1.11.0"
   spec.add_dependency "relaton-cli"
   spec.add_dependency "roman-numerals"

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.rb

@@ -23,6 +23,7 @@ require "isodoc/headlesshtml_convert"
 require "isodoc/presentation_xml_convert"
 require "isodoc/xref"
 require "isodoc/i18n"
+require "metanorma/output"
 
 module IsoDoc
 end

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/css.rb

@@ -39,7 +39,7 @@ module IsoDoc
       {
         bodyfont: "Arial",
         headerfont: "Arial",
-        monospacefont: "Courier",
+        monospacefont: "Courier New",
       }
     end
 
@@ -53,7 +53,7 @@ module IsoDoc
       {
         "bodyfont" => options[:bodyfont] || "Arial",
         "headerfont" => options[:headerfont] || "Arial",
-        "monospacefont" => options[:monospacefont] || "Courier",
+        "monospacefont" => options[:monospacefont] || "Courier New",
         "normalfontsize" => options[:normalfontsize],
         "monospacefontsize" => options[:monospacefontsize],
         "smallerfontsize" => options[:smallerfontsize],
@@ -64,7 +64,7 @@ module IsoDoc
     def scss_fontheader(is_html_css)
       b = options[:bodyfont] || "Arial"
       h = options[:headerfont] || "Arial"
-      m = options[:monospacefont] || "Courier"
+      m = options[:monospacefont] || "Courier New"
       ns = options[:normalfontsize] || (is_html_css ? "1.0em" : "12.0pt")
       ms = options[:monospacefontsize] || (is_html_css ? "0.8em" : "11.0pt")
       ss = options[:smallerfontsize] || (is_html_css ? "0.9em" : "10.0pt")

data/lib/isodoc/function/blocks.rb

@@ -1,231 +1,243 @@
 require_relative "blocks_example_note"
 
-module IsoDoc::Function
-  module Blocks
-    @annotation = false
+module IsoDoc
+  module Function
+    module Blocks
+      @annotation = false
 
-    def middle_title(_isoxml, out)
-      out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
-    end
+      def middle_title(_isoxml, out)
+        out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
+      end
 
-    def middle_admonitions(isoxml, out)
-      isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
-        parse(x, out)
+      def middle_admonitions(isoxml, out)
+        isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
+          parse(x, out)
+        end
       end
-    end
 
-    def figure_name_parse(_node, div, name)
-      return if name.nil?
+      def figure_name_parse(_node, div, name)
+        return if name.nil?
 
-      div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
-        name.children.each { |n| parse(n, p) }
+        div.p **{ class: "FigureTitle", style: "text-align:center;" } do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def figure_key(out)
-      out.p **{ style: "page-break-after:avoid;"} do |p|
-        p.b { |b| b << @i18n.key }
+      def figure_key(out)
+        out.p **{ style: "page-break-after:avoid;" } do |p|
+          p.b { |b| b << @i18n.key }
+        end
       end
-    end
 
-    def figure_attrs(node)
-      attr_code(id: node["id"], class: "figure", style: keep_style(node))
-    end
+      def figure_attrs(node)
+        attr_code(id: node["id"], class: "figure", style: keep_style(node))
+      end
 
-    def figure_parse(node, out)
-      return pseudocode_parse(node, out) if node["class"] == "pseudocode" ||
-        node["type"] == "pseudocode"
+      def figure_parse(node, out)
+        return pseudocode_parse(node, out) if node["class"] == "pseudocode" ||
+          node["type"] == "pseudocode"
+
+        @in_figure = true
+        figure_parse1(node, out)
+        @in_figure = false
+      end
 
-      @in_figure = true
-      out.div **figure_attrs(node) do |div|
-        node.children.each do |n|
-          figure_key(out) if n.name == "dl"
-          parse(n, div) unless n.name == "name"
+      def figure_parse1(node, out)
+        out.div **figure_attrs(node) do |div|
+          node.children.each do |n|
+            figure_key(out) if n.name == "dl"
+            parse(n, div) unless n.name == "name"
+          end
+          figure_name_parse(node, div, node.at(ns("./name")))
         end
-        figure_name_parse(node, div, node.at(ns("./name")))
       end
-      @in_figure = false
-    end
 
-    def pseudocode_attrs(node)
-      attr_code(id: node["id"], class: "pseudocode", style: keep_style(node))
-    end
+      def pseudocode_attrs(node)
+        attr_code(id: node["id"], class: "pseudocode", style: keep_style(node))
+      end
 
-    def pseudocode_parse(node, out)
-      @in_figure = true
-      name = node.at(ns("./name"))
-      out.div **pseudocode_attrs(node) do |div|
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
-        sourcecode_name_parse(node, div, name)
+      def pseudocode_parse(node, out)
+        @in_figure = true
+        name = node.at(ns("./name"))
+        out.div **pseudocode_attrs(node) do |div|
+          node.children.each { |n| parse(n, div) unless n.name == "name" }
+          sourcecode_name_parse(node, div, name)
+        end
+        @in_figure = false
       end
-      @in_figure = false
-    end
 
-    def sourcecode_name_parse(node, div, name)
-      return if name.nil?
+      def sourcecode_name_parse(_node, div, name)
+        return if name.nil?
 
-      div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
-        name.children.each { |n| parse(n, p) }
+        div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def admonition_name_parse(_node, div, name)
-      div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
-        name.children.each { |n| parse(n, p) }
+      def admonition_name_parse(_node, div, name)
+        div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
+          name.children.each { |n| parse(n, p) }
+        end
       end
-    end
 
-    def sourcecode_attrs(node)
-      attr_code(id: node["id"], class: "Sourcecode", style: keep_style(node))
-    end
+      def sourcecode_attrs(node)
+        attr_code(id: node["id"], class: "Sourcecode", style: keep_style(node))
+      end
 
-    def sourcecode_parse(node, out)
-      name = node.at(ns("./name"))
-      out.p **sourcecode_attrs(node) do |div|
-        @sourcecode = true
-        node.children.each { |n| parse(n, div) unless n.name == "name" }
-        @sourcecode = false
+      def sourcecode_parse(node, out)
+        name = node.at(ns("./name"))
+        out.p **sourcecode_attrs(node) do |div|
+          @sourcecode = true
+          node.children.each { |n| parse(n, div) unless n.name == "name" }
+          @sourcecode = false
+        end
+        sourcecode_name_parse(node, out, name)
       end
-      sourcecode_name_parse(node, out, name)
-    end
 
-    def pre_parse(node, out)
-      out.pre node.text, **attr_code(id: node["id"])
-    end
+      def pre_parse(node, out)
+        out.pre node.text, **attr_code(id: node["id"])
+      end
 
-    def annotation_parse(node, out)
-      @sourcecode = false
-      @annotation = true
-      node.at("./preceding-sibling::*[local-name() = 'annotation']") or
-        out << "<br/>"
-      callout = node.at(ns("//callout[@target='#{node['id']}']"))
-      out << "<br/>&lt;#{callout.text}&gt; "
-      out << node&.children&.text&.strip
-      @annotation = false
-    end
+      def annotation_parse(node, out)
+        @sourcecode = false
+        @annotation = true
+        node.at("./preceding-sibling::*[local-name() = 'annotation']") or
+          out << "<br/>"
+        callout = node.at(ns("//callout[@target='#{node['id']}']"))
+        out << "<br/>&lt;#{callout.text}&gt; "
+        out << node&.children&.text&.strip
+        @annotation = false
+      end
 
-    def admonition_class(_node)
-      "Admonition"
-    end
+      def admonition_class(_node)
+        "Admonition"
+      end
 
-    def admonition_name(node, type)
-      name = node&.at(ns("./name")) and return name
-      name = Nokogiri::XML::Node.new("name", node.document)
-      return unless type && @i18n.admonition[type]
+      def admonition_name(node, type)
+        name = node&.at(ns("./name")) and return name
+        name = Nokogiri::XML::Node.new("name", node.document)
+        return unless type && @i18n.admonition[type]
 
-      name << @i18n.admonition[type]&.upcase
-      name
-    end
+        name << @i18n.admonition[type]&.upcase
+        name
+      end
 
-    def admonition_attrs(node)
-      attr_code(id: node["id"], class: admonition_class(node),
-                style: keep_style(node))
-    end
+      def admonition_attrs(node)
+        attr_code(id: node["id"], class: admonition_class(node),
+                  style: keep_style(node))
+      end
 
-    def admonition_parse(node, out)
-      type = node["type"]
-      name = admonition_name(node, type)
-      out.div **admonition_attrs(node) do |t|
-        admonition_name_parse(node, t, name) if name
-        node.children.each { |n| parse(n, t) unless n.name == "name" }
+      def admonition_parse(node, out)
+        type = node["type"]
+        name = admonition_name(node, type)
+        out.div **admonition_attrs(node) do |t|
+          admonition_name_parse(node, t, name) if name
+          node.children.each { |n| parse(n, t) unless n.name == "name" }
+        end
       end
-    end
 
-    def formula_where(dl, out)
-      return unless dl
+      def formula_where(dlist, out)
+        return unless dlist
 
-      out.p **{ style: "page-break-after:avoid;" } do |p|
-        p << @i18n.where
+        out.p **{ style: "page-break-after:avoid;" } do |p|
+          p << @i18n.where
+        end
+        parse(dlist, out)
+        out.parent.at("./dl")["class"] = "formula_dl"
       end
-      parse(dl, out)
-      out.parent.at("./dl")["class"] = "formula_dl"
-    end
 
-    def formula_parse1(node, out)
-      out.div **attr_code(class: "formula") do |div|
-        div.p do |p|
-          parse(node.at(ns("./stem")), div)
-          if lbl = node&.at(ns("./name"))&.text
-            insert_tab(div, 1)
-            div << "(#{lbl})"
+      def formula_parse1(node, out)
+        out.div **attr_code(class: "formula") do |div|
+          div.p do |_p|
+            parse(node.at(ns("./stem")), div)
+            if lbl = node&.at(ns("./name"))&.text
+              insert_tab(div, 1)
+              div << "(#{lbl})"
+            end
           end
         end
       end
-    end
 
-    def formula_attrs(node)
-      attr_code(id: node["id"], style: keep_style(node))
-    end
+      def formula_attrs(node)
+        attr_code(id: node["id"], style: keep_style(node))
+      end
 
-    def formula_parse(node, out)
-      out.div **formula_attrs(node) do |div|
-        formula_parse1(node, div)
-        formula_where(node.at(ns("./dl")), div)
-        node.children.each do |n|
-          next if %w(stem dl name).include? n.name
+      def formula_parse(node, out)
+        out.div **formula_attrs(node) do |div|
+          formula_parse1(node, div)
+          formula_where(node.at(ns("./dl")), div)
+          node.children.each do |n|
+            next if %w(stem dl name).include? n.name
 
-          parse(n, div)
+            parse(n, div)
+          end
         end
       end
-    end
 
-    def para_class(_node)
-      classtype = nil
-      classtype = "MsoCommentText" if in_comment
-      classtype = "Sourcecode" if @annotation
-      classtype
-    end
+      def para_class(_node)
+        classtype = nil
+        classtype = "MsoCommentText" if in_comment
+        classtype = "Sourcecode" if @annotation
+        classtype
+      end
 
-    def para_attrs(node)
-      attrs = { class: para_class(node), id: node["id"] }
-      s = node["align"].nil? ? "" : "text-align:#{node['align']};"
-      s = "#{s}#{keep_style(node)}"
-      attrs[:style] = s unless s.empty?
-      attrs
-    end
+      def para_attrs(node)
+        attrs = { class: para_class(node), id: node["id"] }
+        s = node["align"].nil? ? "" : "text-align:#{node['align']};"
+        s = "#{s}#{keep_style(node)}"
+        attrs[:style] = s unless s.empty?
+        attrs
+      end
 
-    def para_parse(node, out)
-      out.p **attr_code(para_attrs(node)) do |p|
-        unless @termdomain.empty?
-          p << "&lt;#{@termdomain}&gt; "
-          @termdomain = ""
+      def para_parse(node, out)
+        out.p **attr_code(para_attrs(node)) do |p|
+          unless @termdomain.empty?
+            p << "&lt;#{@termdomain}&gt; "
+            @termdomain = ""
+          end
+          node.children.each { |n| parse(n, p) }
         end
-        node.children.each { |n| parse(n, p) }
       end
-    end
 
-    def quote_attribution(node, out)
-      author = node.at(ns("./author"))
-      source = node.at(ns("./source"))
-      return if author.nil? && source.nil?
+      def quote_attribution(node, out)
+        author = node.at(ns("./author"))
+        source = node.at(ns("./source"))
+        return if author.nil? && source.nil?
 
-      out.p **{ class: "QuoteAttribution" } do |p|
-        p << "&mdash; #{author.text}" if author
-        p << ", " if author && source
-        eref_parse(source, p) if source
+        out.p **{ class: "QuoteAttribution" } do |p|
+          p << "&mdash; #{author.text}" if author
+          p << ", " if author && source
+          eref_parse(source, p) if source
+        end
       end
-    end
 
-    def quote_parse(node, out)
-      attrs = para_attrs(node)
-      attrs[:class] = "Quote"
-      out.div **attr_code(attrs) do |p|
-        node.children.each do |n|
-          parse(n, p) unless ["author", "source"].include? n.name
+      def quote_parse(node, out)
+        attrs = para_attrs(node)
+        attrs[:class] = "Quote"
+        out.div **attr_code(attrs) do |p|
+          node.children.each do |n|
+            parse(n, p) unless %w(author source).include? n.name
+          end
+          quote_attribution(node, out)
         end
-        quote_attribution(node, out)
       end
-    end
 
-    def passthrough_parse(node, out)
-      return if node["format"] &&
-        !(node["format"].split(/,/).include? @format.to_s)
+      def passthrough_parse(node, out)
+        return if node["format"] &&
+          !(node["format"].split(",").include? @format.to_s)
 
-      out.passthrough node.text
-    end
+        out.passthrough node.text
+      end
 
-    def svg_parse(node, out)
-      out << node.to_xml
+      def svg_parse(node, out)
+        out.parent.add_child(node)
+      end
+
+      def toc_parse(node, out)
+        out.div **{ class: "toc" } do |div|
+          node.children.each { |n| parse(n, div) }
+        end
+      end
     end
   end
 end