isodoc 1.1.3.pre.alpha3 → 1.2.2

data/lib/isodoc/function/references.rb

@@ -5,7 +5,7 @@ module IsoDoc::Function
     # references anyway; keeping here instead of in IsoDoc::Iso for now
     def docid_l10n(x)
       return x if x.nil?
-      x.gsub(/All Parts/i, @all_parts_lbl.downcase) if @all_parts_lbl
+      x.gsub(/All Parts/i, @i18n.all_parts.downcase) if @i18n.all_parts
       x
     end
 
@@ -155,14 +155,14 @@ module IsoDoc::Function
 
     def norm_ref_xpath
       "//bibliography/references[@normative = 'true'] | "\
-      "//bibliography/clause[.//references[@normative = 'true']]"
+        "//bibliography/clause[.//references[@normative = 'true']]"
     end
 
     def norm_ref(isoxml, out, num)
       f = isoxml.at(ns(norm_ref_xpath)) or return num
       out.div do |div|
         num = num + 1
-        clause_name(num, @normref_lbl, div, nil)
+        clause_name(num, f.at(ns("./title")), div, nil)
         if f.name == "clause"
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
         else
@@ -174,15 +174,18 @@ module IsoDoc::Function
 
     def bibliography_xpath 
       "//bibliography/clause[.//references]"\
-      "[not(.//references[@normative = 'true'])] | "\
-      "//bibliography/references[@normative = 'false']"
+        "[not(.//references[@normative = 'true'])] | "\
+        "//bibliography/references[@normative = 'false']"
     end
 
     def bibliography(isoxml, out)
       f = isoxml.at(ns(bibliography_xpath)) || return
       page_break(out)
       out.div do |div|
-        div.h1 @bibliography_lbl, **{ class: "Section3" }
+        #div.h1 @bibliography_lbl, **{ class: "Section3" }
+        div.h1 **{class: "Section3"} do |h1|
+          f&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+        end
         biblio_list(f, div, true)
       end
     end
@@ -190,9 +193,7 @@ module IsoDoc::Function
     def bibliography_parse(node, out)
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
-        @xrefs.anchor(node['id'], :label, false) and
-          clause_parse_title(node, div, node.at(ns("./title")), out) or
-          div.h2 title, **{ class: "Section3" }
+        clause_parse_title(node, div, node.at(ns("./title")), out, { class: "Section3" })
         biblio_list(node, div, true)
       end
     end

data/lib/isodoc/function/reqt.rb

@@ -1,14 +1,14 @@
 module IsoDoc::Function
   module Blocks
     def recommendation_labels(node)
-      [node.at(ns("./label")), node.at(ns("./title")), 
-       @xrefs.anchor(node['id'], :label, false)]
+      [node.at(ns("./label")), node.at(ns("./title")), node.at(ns("./name"))]
     end
 
-    def recommendation_name(node, out, type)
+    def recommendation_name(node, out, _type)
       label, title, lbl = recommendation_labels(node)
       out.p **{ class: "RecommendationTitle" }  do |b|
-        b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
+        lbl and lbl.children.each { |n| parse(n, b) }
+        b << l10n(":")
         if label || title
           b.br
           label and label.children.each { |n| parse(n,b) }
@@ -21,11 +21,11 @@ module IsoDoc::Function
     def recommendation_attributes1(node) 
       out = [] 
       oblig = node["obligation"] and
-        out << l10n("#{@labels['obligation']}: #{oblig}")
+        out << l10n("#{@i18n.obligation}: #{oblig}")
       subj = node&.at(ns("./subject"))&.text and
-        out << l10n("#{@labels['subject']}: #{subj}")
+        out << l10n("#{@i18n.subject}: #{subj}")
       node.xpath(ns("./inherit")).each do |i|
-        out << recommendation_attr_parse(i, @labels["inherits"])
+        out << recommendation_attr_parse(i, @i18n.inherits)
       end
       node.xpath(ns("./classification")).each do |c|
         line = recommendation_attr_keyvalue(c, "tag", "value") and out << line
@@ -57,7 +57,8 @@ module IsoDoc::Function
     end
 
     def reqt_metadata_node(n)
-      %w(label title subject classification tag value inherit).include? n.name
+      %w(label title subject classification tag value 
+      inherit name).include? n.name
     end
 
     def reqt_attrs(node, klass)
@@ -66,7 +67,7 @@ module IsoDoc::Function
 
     def recommendation_parse(node, out)
       out.div **reqt_attrs(node, "recommend") do |t|
-        recommendation_name(node, t, @recommendation_lbl)
+        recommendation_name(node, t, @i18n.recommendation)
         recommendation_attributes(node, out)
         node.children.each do |n|
           parse(n, t) unless reqt_metadata_node(n)
@@ -76,7 +77,7 @@ module IsoDoc::Function
 
     def requirement_parse(node, out)
       out.div **reqt_attrs(node, "require") do |t|
-        recommendation_name(node, t, @requirement_lbl)
+        recommendation_name(node, t, @i18n.requirement)
         recommendation_attributes(node, out)
         node.children.each do |n|
           parse(n, t) unless reqt_metadata_node(n)
@@ -86,7 +87,7 @@ module IsoDoc::Function
 
     def permission_parse(node, out)
       out.div **reqt_attrs(node, "permission") do |t|
-        recommendation_name(node, t, @permission_lbl)
+        recommendation_name(node, t, @i18n.permission)
         recommendation_attributes(node, out)
         node.children.each do |n|
           parse(n, t) unless reqt_metadata_node(n)

data/lib/isodoc/function/section.rb

@@ -8,36 +8,37 @@ module IsoDoc::Function
       insert_tab(out, 1)
     end
 
-    def inline_header_title(out, node, c1)
+    def inline_header_title(out, node, title)
       out.span **{ class: "zzMoveToFollowing" } do |s|
         s.b do |b|
-          if @xrefs.anchor(node['id'], :label, false) && !@suppressheadingnumbers
-            b << "#{@xrefs.anchor(node['id'], :label)}#{clausedelim}"
-            clausedelimspace(out)
-          end
-          c1&.children&.each { |c2| parse(c2, b) }
-          clausedelimspace(out) if /\S/.match(c1&.text)
+          title&.children&.each { |c2| parse(c2, b) }
+          clausedelimspace(out) if /\S/.match(title&.text)
         end
       end
     end
 
     # used for subclauses
-    def clause_parse_title(node, div, c1, out)
+    def clause_parse_title(node, div, title, out, header_class = {})
+      return if title.nil?
       if node["inline-header"] == "true"
-        inline_header_title(out, node, c1)
+        inline_header_title(out, node, title)
       else
-        div.send "h#{@xrefs.anchor(node['id'], :level, false) || '1'}" do |h|
-          lbl = @xrefs.anchor(node['id'], :label, false)
-          h << "#{lbl}#{clausedelim}" if lbl && !@suppressheadingnumbers
-          clausedelimspace(out) if lbl && !@suppressheadingnumbers
-          c1&.children&.each { |c2| parse(c2, h) }
+        depth = (title && title["depth"]) ? title["depth"] :
+          node.ancestors("clause, annex, terms, references, definitions, "\
+                        "acknowledgements, introduction, foreword").size + 1
+        div.send "h#{depth}", **attr_code(header_class) do |h|
+          title&.children&.each { |c2| parse(c2, h) }
         end
       end
     end
 
+    def clause_attrs(node)
+      { id: node["id"] }
+    end
+
     # used for subclauses
     def clause_parse(node, out)
-      out.div **attr_code(id: node["id"]) do |div|
+      out.div **attr_code(clause_attrs(node)) do |div|
         clause_parse_title(node, div, node.at(ns("./title")), out)
         node.children.reject { |c1| c1.name == "title" }.each do |c1|
           parse(c1, div)
@@ -45,13 +46,9 @@ module IsoDoc::Function
       end
     end
 
-    def clause_name(num, title, div, header_class)
+    def clause_name(_num, title, div, header_class)
       header_class = {} if header_class.nil?
       div.h1 **attr_code(header_class) do |h1|
-        if num && !@suppressheadingnumbers
-          h1 << "#{num}#{clausedelim}"
-          clausedelimspace(h1)
-        end
         title.is_a?(String) ? h1 << title :
           title&.children&.each { |c2| parse(c2, h1) }
       end
@@ -60,9 +57,8 @@ module IsoDoc::Function
 
     def clause(isoxml, out)
       isoxml.xpath(ns(middle_clause)).each do |c|
-        out.div **attr_code(id: c["id"]) do |s|
-          clause_name(@xrefs.anchor(c['id'], :label),
-                      c&.at(ns("./title")), s, nil)
+        out.div **attr_code(clause_attrs(c)) do |s|
+          clause_name(nil, c&.at(ns("./title")), s, nil)
           c.elements.reject { |c1| c1.name == "title" }.each do |c1|
             parse(c1, s)
           end
@@ -71,19 +67,20 @@ module IsoDoc::Function
     end
 
     def annex_name(annex, name, div)
+      return if name.nil?
       div.h1 **{ class: "Annex" } do |t|
-        t << "#{@xrefs.anchor(annex['id'], :label)}<br/><br/>"
-        t.b do |b|
-          name&.children&.each { |c2| parse(c2, b) }
-        end
+        name.children.each { |c2| parse(c2, t) }
       end
     end
 
+    def annex_attrs(node)
+      { id: node["id"], class: "Section3" }
+    end
+
     def annex(isoxml, out)
       isoxml.xpath(ns("//annex")).each do |c|
         page_break(out)
-        out.div **attr_code(id: c["id"], class: "Section3") do |s|
-          annex_name(c, nil, s) unless c.at(ns("./title"))
+        out.div **attr_code(annex_attrs(c)) do |s|
           c.elements.each do |c1|
             if c1.name == "title" then annex_name(c, c1, s)
             else
@@ -95,10 +92,10 @@ module IsoDoc::Function
     end
 
     def scope(isoxml, out, num)
-      f = isoxml.at(ns("//clause[title = 'Scope']")) or return num
+      f = isoxml.at(ns("//clause[@type = 'scope']")) or return num
       out.div **attr_code(id: f["id"]) do |div|
         num = num + 1
-        clause_name(num, @scope_lbl, div, nil)
+        clause_name(num, f&.at(ns("./title")), div, nil)
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
         end
@@ -109,26 +106,11 @@ module IsoDoc::Function
     TERM_CLAUSE = "//sections/terms | "\
       "//sections/clause[descendant::terms]".freeze
 
-    def term_def_title(title)
-      case title&.text
-      when "Terms, definitions, symbols and abbreviated terms"
-        @labels["termsdefsymbolsabbrev"]
-      when "Terms, definitions and symbols"
-        @labels["termsdefsymbols"]
-      when "Terms, definitions and abbreviated terms"
-        @labels["termsdefabbrev"]
-      when "Terms and definitions"
-        @labels["termsdef"]
-      else
-        title
-      end
-    end
-
     def terms_defs(isoxml, out, num)
       f = isoxml.at(ns(TERM_CLAUSE)) or return num
       out.div **attr_code(id: f["id"]) do |div|
         num = num + 1
-        clause_name(num, term_def_title(f&.at(ns("./title"))), div, nil)
+        clause_name(num, f&.at(ns("./title")), div, nil)
         f.elements.each do |e|
           parse(e, div) unless %w{title source}.include? e.name
         end
@@ -145,7 +127,7 @@ module IsoDoc::Function
       f = isoxml.at(ns("//sections/definitions")) or return num
       out.div **attr_code(id: f["id"], class: "Symbols") do |div|
         num = num + 1
-        clause_name(num, f&.at(ns("./title")) || @symbols_lbl, div, nil)
+        clause_name(num, f&.at(ns("./title")) || @i18n.symbols, div, nil)
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
         end
@@ -156,7 +138,7 @@ module IsoDoc::Function
     # subclause
     def symbols_parse(isoxml, out)
       isoxml.at(ns("./title")) or
-        isoxml.children.first.previous = "<title>#{@symbols_lbl}</title>"
+        isoxml.children.first.previous = "<title>#{@i18n.symbols}</title>"
       clause_parse(isoxml, out)
     end
 
@@ -165,7 +147,7 @@ module IsoDoc::Function
       title_attr = { class: "IntroTitle" }
       page_break(out)
       out.div **{ class: "Section3", id: f["id"] } do |div|
-        clause_name(nil, @introduction_lbl, div, title_attr)
+        clause_name(nil, f.at(ns("./title")), div, { class: "IntroTitle" })
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
         end
@@ -176,7 +158,9 @@ module IsoDoc::Function
       f = isoxml.at(ns("//foreword")) || return
       page_break(out)
       out.div **attr_code(id: f["id"]) do |s|
-        s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @foreword_lbl }
+        clause_name(nil, f.at(ns("./title")) || @i18n.foreword, s,
+                    { class: "ForewordTitle" })
+        #s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end
@@ -197,15 +181,16 @@ module IsoDoc::Function
       f = isoxml.at(ns("//preface/abstract")) || return
       page_break(out)
       out.div **attr_code(id: f["id"]) do |s|
-        s.h1(**{ class: "AbstractTitle" }) { |h1| h1 << @abstract_lbl }
+        clause_name(nil, f.at(ns("./title")), s, { class: "AbstractTitle" })
+        #s.h1(**{ class: "AbstractTitle" }) { |h1| h1 << @i18n.abstract }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end
 
     def preface(isoxml, out)
       title_attr = { class: "IntroTitle" }
-      isoxml.xpath(ns("//preface/clause | //preface/terms | //preface/definitions | "\
-                      "//preface/references")).each do |f|
+      isoxml.xpath(ns("//preface/clause | //preface/references | "\
+                      "//preface/definitions | //preface/terms")).each do |f|
         page_break(out)
         out.div **{ class: "Section3", id: f["id"] } do |div|
           clause_name(nil, f&.at(ns("./title")), div, title_attr)

data/lib/isodoc/function/table.rb

@@ -2,13 +2,8 @@ module IsoDoc::Function
   module Table
 
     def table_title_parse(node, out)
-      name = node.at(ns("./name"))
-      lbl = @xrefs.anchor(node['id'], :label, false)
-      lbl = nil if labelled_ancestor(node)
-      return if name.nil? && lbl.nil?
+      name = node.at(ns("./name")) or return
       out.p **{ class: "TableTitle", style: "text-align:center;" } do |p|
-        lbl.nil? or p << l10n("#{@table_lbl} #{lbl}")
-        name and !lbl.nil? and p << l10n("&nbsp;&mdash; ")
         name and name.children.each { |n| parse(n, p) }
       end
     end

data/lib/isodoc/function/terms.rb

@@ -1,6 +1,5 @@
 module IsoDoc::Function
   module Terms
-
     def definition_parse(node, out)
       node.children.each { |n| parse(n, out) }
     end
@@ -13,7 +12,7 @@ module IsoDoc::Function
 
     def deprecated_term_parse(node, out)
       out.p **{ class: "DeprecatedTerms", style:"text-align:left;" } do |p|
-        p << l10n("#{@deprecated_lbl}: ")
+        p << l10n("#{@i18n.deprecated}: ")
         node.children.each { |c| parse(c, p) }
       end
     end
@@ -39,12 +38,19 @@ module IsoDoc::Function
       end
     end
 
+    def termnote_delim
+      l10n(": ")
+    end
+
     def termnote_parse(node, out)
+      name = node&.at(ns("./name"))&.remove
       out.div **note_attrs(node) do |div|
-        first = node.first_element_child
         div.p do |p|
-          p << "#{@xrefs.anchor(node['id'], :label) || '???'}: "
-          para_then_remainder(first, node, p, div)
+          if name
+            name.children.each { |n| parse(n, p) }
+            p << termnote_delim
+          end
+          para_then_remainder(node.first_element_child, node, p, div)
         end
       end
     end
@@ -58,8 +64,9 @@ module IsoDoc::Function
     end
 
     def termdef_parse(node, out)
+      name = node&.at(ns("./name"))&.remove
       out.p **{ class: "TermNum", id: node["id"] } do |p|
-        p << "#{@xrefs.get[node["id"]][:label]}#{clausedelim}"
+        name&.children&.each { |n| parse(n, p) }
       end
       set_termdomain("")
       node.children.each { |n| parse(n, out) }

data/lib/isodoc/function/to_word_html.rb

@@ -220,6 +220,7 @@ module IsoDoc::Function
         when "feedback-statement" then feedback_parse(node, out)
         when "passthrough" then passthrough_parse(node, out)
         when "variant" then variant_parse(node, out)
+        when "tab" then clausedelimspace(out) # in Presentation XML only
         else
           error_parse(node, out)
         end

data/lib/isodoc/function/utils.rb

@@ -11,7 +11,8 @@ module IsoDoc::Function
     end
 
     def insert_tab(out, n)
-      [1..n].each { out << '&nbsp; ' }
+      tab = %w(Hans Hant).include?(@script) ? "&#x3000;" : "&nbsp; "
+      [1..n].each { out << tab }
     end
 
     # add namespaces for Word fragments
@@ -99,8 +100,8 @@ module IsoDoc::Function
       return '' if array.nil? || array.empty?
       if array.length == 1 then array[0]
       else
-        IsoDoc::Function::I18n::l10n("#{array[0..-2].join(', ')} "\
-                                     "#{@and_lbl} #{array.last}",
+        @i18n.l10n("#{array[0..-2].join(', ')} "\
+                   "#{@i18n.and} #{array.last}",
                                      @lang, @script)
       end
     end
@@ -153,7 +154,7 @@ module IsoDoc::Function
              .get
              .merge(@labels || {})
              .merge(@meta.labels || {})
-             .merge(@meta.fonts_options || {})
+             .merge(fonts_options || {})
       template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
               .gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;')

data/lib/isodoc/html_function/html.rb

@@ -4,7 +4,6 @@ require "base64"
 module IsoDoc::HtmlFunction
   module Html
     def convert1(docxml, filename, dir)
-      @xrefs.parse docxml
       noko do |xml|
         xml.html **{ lang: "#{@lang}" } do |html|
           info docxml, nil

data/lib/isodoc/{function/i18n.rb → i18n.rb}

@@ -1,29 +1,49 @@
 require "yaml"
 
 # TODO: Cleanup and generalize
-module IsoDoc::Function
-  module I18n
-    def load_yaml(lang, script)
-      if @i18nyaml then YAML.load_file(@i18nyaml)
-      elsif lang == "en"
+module IsoDoc
+  class I18n
+    def load_yaml(lang, script, i18nyaml = nil)
+      ret = load_yaml1(lang, script)
+      return ret.merge(YAML.load_file(i18nyaml)) if i18nyaml
+      ret
+    end
+
+    def load_yaml1(lang, script)
+      if lang == "en"
         YAML.load_file(File.join(File.dirname(__FILE__),
-                                 "../../isodoc-yaml/i18n-en.yaml"))
+                                 "../isodoc-yaml/i18n-en.yaml"))
       elsif lang == "fr"
         YAML.load_file(File.join(File.dirname(__FILE__),
-                                 "../../isodoc-yaml/i18n-fr.yaml"))
+                                 "../isodoc-yaml/i18n-fr.yaml"))
       elsif lang == "zh" && script == "Hans"
         YAML.load_file(File.join(File.dirname(__FILE__),
-                                 "../../isodoc-yaml/i18n-zh-Hans.yaml"))
+                                 "../isodoc-yaml/i18n-zh-Hans.yaml"))
       else
         YAML.load_file(File.join(File.dirname(__FILE__),
-                                 "../../isodoc-yaml/i18n-en.yaml"))
+                                 "../isodoc-yaml/i18n-en.yaml"))
       end
     end
 
-    def i18n_init(lang, script)
+    def get
+      @labels
+    end
+
+    def set(x, y)
+      @labels[x] = y
+    end
+
+    def initialize(lang, script, i18nyaml = nil)
       @lang = lang
       @script = script
-      y = load_yaml(lang, script)
+      y = load_yaml(lang, script, i18nyaml)
+      @labels = y
+      @labels["language"] = @lang
+      @labels["script"] = @script
+      @labels.each do |k, v|
+        self.class.send(:define_method, k.downcase) { v }
+      end
+=begin
       @term_def_boilerplate = y["term_def_boilerplate"]
       @scope_lbl = y["scope"]
       @symbols_lbl = y["symbols"]
@@ -71,30 +91,11 @@ module IsoDoc::Function
       @requirement_lbl = y["requirement"]
       @locality = y["locality"]
       @admonition = y["admonition"]
-      @labels = y
-      @labels["language"] = @lang
-      @labels["script"] = @script
+=end
     end
 
-    # TODO: move to localization file
-    def eref_localities1_zh(target, type, from, to, delim)
-      ret = "#{delim} 第#{from.text}" if from
-      ret += "–#{to}" if to
-      loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
-      ret += " #{loc}"
-      ret
-    end
-
-    # TODO: move to localization file
-    def eref_localities1(target, type, from, to, delim, lang = "en")
-      return "" if type == "anchor"
-      return l10n(eref_localities1_zh(target, type, from, to, delim)) if lang == "zh"
-      ret = delim
-      loc = @locality[type] || type.sub(/^locality:/, "").capitalize
-      ret += " #{loc}"
-      ret += " #{from.text}" if from
-      ret += "–#{to.text}" if to
-      l10n(ret)
+    def self.l10n(x, lang = @lang, script = @script)
+      l10n(x, lang, script)
     end
 
     # TODO: move to localization file
@@ -106,8 +107,8 @@ module IsoDoc::Function
         xml.traverse do |n|
           next unless n.text?
           n.replace(n.text.gsub(/ /, "").gsub(/:/, "：").gsub(/,/, "、").
-            gsub(/\(/, "（").gsub(/\)/, "）").
-            gsub(/\[/, "【").gsub(/\]/, "】"))
+                    gsub(/\(/, "（").gsub(/\)/, "）").
+                    gsub(/\[/, "【").gsub(/\]/, "】"))
         end
         xml.to_xml.gsub(/<b>/, "").gsub("</b>", "").gsub(/<\?[^>]+>/, "")
       else
@@ -115,7 +116,7 @@ module IsoDoc::Function
       end
     end
 
-    module_function :l10n
+    #module_function :l10n
 
   end
 end