isodoc 0.7.0 → 0.7.1

data/lib/isodoc/iso/html/style-iso.scss

@@ -128,7 +128,7 @@ main {
     padding-right: 2em;
 }
 
-.WordSection1, .WordSection2 {
+.title-section, .prefatory-section {
     padding-left: 4em;
     padding-top: 2em;
 }
@@ -353,7 +353,7 @@ p.Terms {
         padding: 0;
     }
 
-    .WordSection1, .WordSection2 {
+    .title-section, .prefatory-section {
         padding-left: 0;
         padding-top: 0;
         width: 100%;

data/lib/isodoc/iso/html/wordstyle.scss

@@ -794,6 +794,33 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	mso-paper-source:0;}
 div.WordSection1
 	{page:WordSection1;}
+@page WordSection2
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-page-numbers:roman-lower;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-paper-source:0;}
+div.WordSection2
+        {page:WordSection2;}
+@page WordSection3
+        {size:595.3pt 841.9pt;
+        margin:39.7pt 53.85pt 1.0cm 53.85pt;
+        mso-header-margin:35.45pt;
+        mso-footer-margin:14.2pt;
+        mso-page-numbers:1;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-paper-source:0;}
+div.WordSection3
+        {page:WordSection3;}
+
   /* List Definitions */
 @list l0
 	{mso-list-id:145051656;

data/lib/isodoc/iso/wordconvert.rb

@@ -1,7 +1,6 @@
 module IsoDoc
   module Iso
-    class WordConvert < IsoDoc::Convert
-      include IsoDoc::WordConvertModule
+    class WordConvert < IsoDoc::WordConvert
 
       def default_fonts(options)
         b = options[:bodyfont] ||
@@ -29,6 +28,10 @@ module IsoDoc
         @olstyle = "l2"
       end
 
+      def implicit_reference(b)
+        isocode = b.at(ns("./docidentifier")).text
+        isocode == "IEV"
+      end
     end
   end
 end

data/lib/isodoc/iso2wordhtml.rb

@@ -1,7 +1,7 @@
 require "pp"
 
 module IsoDoc
-  class Convert
+  class Common
     def set_termdomain(termdomain)
       @termdomain = termdomain
     end
@@ -49,14 +49,14 @@ module IsoDoc
     end
 
     def make_body1(body, _docxml)
-      body.div **{ class: "WordSection1" } do |div1|
+      body.div **{ class: "title-section" } do |div1|
         div1.p { |p| p << "&nbsp;" } # placeholder
       end
       section_break(body)
     end
 
     def make_body2(body, docxml)
-      body.div **{ class: "WordSection2" } do |div2|
+      body.div **{ class: "prefatory-section" } do |div2|
         info docxml, div2
         div2.p { |p| p << "&nbsp;" } # placeholder
       end
@@ -64,7 +64,7 @@ module IsoDoc
     end
 
     def make_body3(body, docxml)
-      body.div **{ class: "WordSection3" } do |div3|
+      body.div **{ class: "main-section" } do |div3|
         foreword docxml, div3
         introduction docxml, div3
         middle docxml, div3
@@ -74,21 +74,20 @@ module IsoDoc
     end
 
     def info(isoxml, out)
-      title isoxml, out
-      subtitle isoxml, out
-      docstatus isoxml, out
-      docid isoxml, out
-      doctype isoxml, out
-      author isoxml, out
-      bibdate isoxml, out
-      relations isoxml, out
-      version isoxml, out
-      get_metadata
+      @meta.title isoxml, out
+      @meta.subtitle isoxml, out
+      @meta.docstatus isoxml, out
+      @meta.docid isoxml, out
+      @meta.doctype isoxml, out
+      @meta.author isoxml, out
+      @meta.bibdate isoxml, out
+      @meta.relations isoxml, out
+      @meta.version isoxml, out
+      @meta.get
     end
 
     def middle_title(out)
-      m = get_metadata
-      out.p **{ class: "zzSTDTitle1" } { |p| p << m[:doctitle] }
+      out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
     end
 
     def middle(isoxml, out)

data/lib/isodoc/lists.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  class Convert
+  class Common
     def ul_parse(node, out)
       out.ul do |ul|
         node.children.each { |n| parse(n, ul) }

data/lib/isodoc/metadata.rb

@@ -1,25 +1,33 @@
 require "htmlentities"
 
 module IsoDoc
-  class Convert
+  class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
     updated issued}.freeze
 
-    def init_metadata
-      @meta = { tc: "XXXX", sc: "XXXX", wg: "XXXX",
-                editorialgroup: [],
-                secretariat: "XXXX",
-                obsoletes: nil,
-                obsoletes_part: nil }
-      DATETYPES.each { |w| @meta["#{w}date".to_sym] = "XXX" }
+    def ns(xpath)
+      Common::ns(xpath)
     end
 
-    def get_metadata
-      @meta
+    def initialize(lang, script, labels)
+      @metadata = { tc: "XXXX", sc: "XXXX", wg: "XXXX",
+                    editorialgroup: [],
+                    secretariat: "XXXX",
+                    obsoletes: nil,
+                    obsoletes_part: nil }
+      DATETYPES.each { |w| @metadata["#{w}date".to_sym] = "XXX" }
+      @lang = lang
+      @script = script
+      @c = HTMLEntities.new
+      @labels = labels
     end
 
-    def set_metadata(key, value)
-      @meta[key] = value
+    def get
+      @metadata
+    end
+
+    def set(key, value)
+      @metadata[key] = value
     end
 
     def author(xml, _out)
@@ -36,8 +44,8 @@ module IsoDoc
         text || "TC"
       if tc_num
         tcid = "#{tc_type} #{tc_num.text}"
-        set_metadata(:tc,  tcid)
-        set_metadata(:editorialgroup, get_metadata[:editorialgroup] << tcid)
+        set(:tc,  tcid)
+        set(:editorialgroup, get[:editorialgroup] << tcid)
       end
     end
 
@@ -46,8 +54,8 @@ module IsoDoc
       sc_type = xml.at(ns("//editorialgroup/subcommittee/@type"))&.text || "SC"
       if sc_num
         scid = "#{sc_type} #{sc_num.text}"
-        set_metadata(:sc, scid)
-        set_metadata(:editorialgroup, get_metadata[:editorialgroup] << scid)
+        set(:sc, scid)
+        set(:editorialgroup, get[:editorialgroup] << scid)
       end
     end
 
@@ -56,29 +64,19 @@ module IsoDoc
       wg_type = xml.at(ns("//editorialgroup/workgroup/@type"))&.text || "WG"
       if wg_num
         wgid = "#{wg_type} #{wg_num.text}"
-        set_metadata(:wg, wgid)
-        set_metadata(:editorialgroup, get_metadata[:editorialgroup] << wgid)
+        set(:wg, wgid)
+        set(:editorialgroup, get[:editorialgroup] << wgid)
       end
     end
 
     def secretariat(xml)
       sec = xml.at(ns("//editorialgroup/secretariat"))
-      set_metadata(:secretariat, sec.text) if sec
-    end
-
-    def date_range(date)
-      from = date.at(ns("./from"))
-      to = date.at(ns("./to"))
-      on = date.at(ns("./on"))
-      return on.text if on
-      ret = "#{from.text}&ndash;"
-      ret += to.text if to
-      ret
+      set(:secretariat, sec.text) if sec
     end
 
     def bibdate(isoxml, _out)
       isoxml.xpath(ns("//bibdata/date")).each do |d|
-        set_metadata("#{d['type']}date".to_sym, date_range(d))
+        set("#{d['type']}date".to_sym, Common::date_range(d))
       end
     end
 
@@ -86,7 +84,7 @@ module IsoDoc
       b = isoxml.at(ns("//bibdata")) || return
       return unless b["type"]
       t = b["type"].split(/-/).map{ |w| w.capitalize }.join(" ")
-      set_metadata(:doctype, t)
+      set(:doctype, t)
     end
 
     def iso?(org)
@@ -105,7 +103,7 @@ module IsoDoc
         agency1 = abbrev || name
         agency = iso?(org) ?  "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
-      set_metadata(:agency, agency.sub(%r{/$}, ""))
+      set(:agency, agency.sub(%r{/$}, ""))
     end
 
     def docnumber(isoxml)
@@ -118,43 +116,62 @@ module IsoDoc
       dn
     end
 
+    STAGE_ABBRS = {
+      "00": "PWI",
+      "10": "NWIP",
+      "20": "WD",
+      "30": "CD",
+      "40": "DIS",
+      "50": "FDIS",
+      "60": "IS",
+      "90": "(Review)",
+      "95": "(Withdrawal)",
+    }.freeze
+
+    def stage_abbrev(stage, iter, draft)
+      stage = STAGE_ABBRS[stage.to_sym] || "??"
+      stage += iter.text if iter
+      stage = "Pre" + stage if draft&.text =~ /^0\./
+      stage
+    end
+
     def docstatus(isoxml, _out)
       docstatus = isoxml.at(ns("//status/stage"))
       if docstatus
-        set_metadata(:stage, docstatus.text)
+        set(:stage, docstatus.text)
         abbr = stage_abbrev(docstatus.text, isoxml.at(ns("//status/iteration")),
                             isoxml.at(ns("//version/draft")))
-        set_metadata(:stageabbr, abbr)
+        set(:stageabbr, abbr)
       end
     end
 
     def docid(isoxml, _out)
       dn = docnumber(isoxml)
-      docstatus = get_metadata[:stage]
+      docstatus = get[:stage]
       if docstatus
-        abbr = get_metadata[:stageabbr]
-        docstatus = get_metadata[:stage]
+        abbr = get[:stageabbr]
+        docstatus = get[:stage]
         (docstatus.to_i < 60) && dn = abbr + " " + dn
       end
-      set_metadata(:docnumber, dn)
+      set(:docnumber, dn)
     end
 
     def draftinfo(draft, revdate)
       draftinfo = ""
       if draft
-        draftinfo = " (#{@draft_lbl} #{draft}"
+        draftinfo = " (#{@labels["draft"]} #{draft}"
         draftinfo += ", #{revdate}" if revdate
         draftinfo += ")"
       end
-      l10n(draftinfo)
+      Common::l10n(draftinfo, @lang, @script)
     end
 
     def version(isoxml, _out)
-      set_metadata(:docyear, isoxml&.at(ns("//copyright/from"))&.text)
-      set_metadata(:draft, isoxml&.at(ns("//version/draft"))&.text)
-      set_metadata(:revdate, isoxml&.at(ns("//version/revision-date"))&.text)
-      set_metadata(:draftinfo,
-                   draftinfo(get_metadata[:draft], get_metadata[:revdate]))
+      set(:docyear, isoxml&.at(ns("//copyright/from"))&.text)
+      set(:draft, isoxml&.at(ns("//version/draft"))&.text)
+      set(:revdate, isoxml&.at(ns("//version/revision-date"))&.text)
+      set(:draftinfo,
+          draftinfo(get[:draft], get[:revdate]))
     end
 
     # we don't leave this to i18n.rb, because we have both English and
@@ -186,7 +203,7 @@ module IsoDoc
       partnumber = isoxml.at(ns("//project-number/@part"))
       subpartnumber = isoxml.at(ns("//project-number/@subpart"))
       main = compose_title(main, intro, part, partnumber, subpartnumber, "en")
-      set_metadata(:doctitle, main)
+      set(:doctitle, main)
     end
 
     def subtitle(isoxml, _out)
@@ -196,15 +213,15 @@ module IsoDoc
       partnumber = isoxml.at(ns("//project-number/@part"))
       subpartnumber = isoxml.at(ns("//project-number/@subpart"))
       main = compose_title(main, intro, part, partnumber, subpartnumber, "fr")
-      set_metadata(:docsubtitle, main)
+      set(:docsubtitle, main)
     end
 
     def relations(isoxml, _out)
       std = isoxml.at(ns("//bibdata/relation[@type = 'obsoletes']")) || return
       locality = std.at(ns(".//locality"))
       id = std.at(ns(".//docidentifier"))
-      set_metadata(:obsoletes, id.text) if id
-      set_metadata(:obsoletes_part, locality.text) if locality
+      set(:obsoletes, id.text) if id
+      set(:obsoletes_part, locality.text) if locality
     end
   end
 end

data/lib/isodoc/references.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  class Convert
+  class Common
     def docid_l10n(x)
       return x if x.nil?
       x.gsub(/All Parts/, @all_parts_lbl)
@@ -8,8 +8,10 @@ module IsoDoc
     def iso_bibitem_ref_code(b)
       isocode = b.at(ns("./docidentifier")).text
       isodate = b.at(ns("./date[@type = 'published']"))
+      iso_allparts = b.at(ns("./allParts"))
       reference = docid_l10n(isocode)
       reference += ": #{date_range(isodate)}" if isodate
+      reference += " (all parts)" if iso_allparts&.text == "true"
       reference
     end
 
@@ -31,12 +33,21 @@ module IsoDoc
       title.text
     end
 
+    # reference not to be rendered because it is deemed implicit
+    # in the standards environment
+    def implicit_reference(b)
+      false
+    end
+
+    def prefix_bracketed_ref(ref, text)
+      ref << "[#{text}]"
+      insert_tab(ref, 1)
+    end
+
     def iso_bibitem_entry(list, b, ordinal, biblio)
+      return if implicit_reference(b)
       list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
-        if biblio
-          ref << "[#{ordinal}]"
-          insert_tab(ref, 1)
-        end
+        prefix_bracketed_ref(ref, ordinal) if biblio
         ref << iso_bibitem_ref_code(b)
         date_note_process(b, ref)
         ref << ", "
@@ -46,12 +57,10 @@ module IsoDoc
 
     def ref_entry_code(r, ordinal, t)
       if /^\d+$/.match?(t)
-        r << "[#{t}]"
-        insert_tab(r, 1)
+        prefix_bracketed_ref(r, t)
       else
-        r << "[#{ordinal}]"
-        insert_tab(r, 1)
-        r << "#{t},"
+        prefix_bracketed_ref(r, ordinal)
+        r << "#{t}, "
       end
     end
 
@@ -115,7 +124,8 @@ module IsoDoc
     end
 
     def norm_ref(isoxml, out, num)
-      q = "//bibliography/references[title = 'Normative References']"
+      q = "//bibliography/references[title = 'Normative References' or "\
+        "title = 'Normative references']"
       f = isoxml.at(ns(q)) or return num
       out.div do |div|
         num = num + 1

data/lib/isodoc/section.rb

@@ -1,5 +1,5 @@
 module IsoDoc
-  class Convert
+  class Common
     def inline_header_title(out, node, c1)
       out.span **{ class: "zzMoveToFollowing" } do |s|
         s.b do |b|
@@ -166,7 +166,7 @@ module IsoDoc
     # subclause
     def symbols_parse(isoxml, out)
       isoxml.children.first.previous =
-        "<title>Symbols and Abbreviated Terms</title>"
+        "<title>#{@symbols_lbl}</title>"
       clause_parse(isoxml, out)
     end
 
@@ -192,7 +192,7 @@ module IsoDoc
       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 }
+        s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @foreword_lbl }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end