isodoc 1.0.23 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 709ee937cab542be14ef994074c62d60df2e26ad5d858fbfd9dc9966f100a9be
-  data.tar.gz: 809faa2a70a8d982909f15794928b19981f5e3aee33da0afdc9fc81d8a4d030b
+  metadata.gz: 6d2aca20ce5f2e96df3da6fbb1a8e675e3b2393f51720bac2bdc760e6e9c09a5
+  data.tar.gz: 6f83efeb115dbbb30f928d99e8f8c6da4172fc2a17d1792607d2cd38d6b5833c
 SHA512:
-  metadata.gz: 3b3a2e409e96f3f4e79723b06ebce456559280855c384ede05cbc15d5f9e217b7673228190190f1df84cc298ed5c89dd08e22a4eb89df5f1ff95fc978bba91e6
-  data.tar.gz: 9d26571df295d108788bd45d527e2a9ac8ef4d8f6cc6b7ec1aabc18c508d505e88a09c909f96b1d252274f293dac1950fba9b52359c30625a4c185658a9536a2
+  metadata.gz: f3e63f2f2f04dea86c5b716be19385eec4273bdd57870ee1215f441e2b6494ea25c8c52c3edf40b8b657ed8d081667356b003e68ded049605f2985450e903649
+  data.tar.gz: a1f408ba884174786963f38a5912ec128a94223b5f9f66fb28662398a6785bb2b54a42554fc3c2bb004230d443a6a38b8d771a1cdf64ec12447ea4e132b46a2c

data/.github/workflows/macos.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/ubuntu.yml
+      - .github/workflows/windows.yml
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby
@@ -29,10 +37,10 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/windows.yml
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby
@@ -29,15 +37,17 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          sudo apt-get update
+          sudo apt-get install libgbm1
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake
       - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
         env:
           GH_USERNAME: ${{ secrets.PAT_USERNAME }}
           GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}

data/.github/workflows/windows.yml

@@ -6,15 +6,23 @@ on:
   push:
     branches: [ master ]
   pull_request:
+    paths-ignore:
+      - .github/workflows/macos.yml
+      - .github/workflows/ubuntu.yml
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
+        experimental: [false]
+        include:
+          - ruby: '2.7'
+            experimental: true
     steps:
       - uses: actions/checkout@master
       - name: Use Ruby
@@ -31,10 +39,10 @@ jobs:
       - name: Use Node
         uses: actions/setup-node@v1
         with:
-          node-version: '8'
+          node-version: '12'
       - name: Install Puppeteer
         run: |
-          npm install -g puppeteer
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/isodoc.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc", "~> 1.0.0"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
-  spec.add_dependency "sassc", "~> 2.2.1"
+  spec.add_dependency "sassc", "~> 2.4.0"
   spec.add_dependency "metanorma", "~> 1.0.0"
   spec.add_dependency "rake", "~> 12.0"
 

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

@@ -6,7 +6,9 @@ introduction: Introduction
 foreword: Foreword
 abstract: Abstract
 termsdef: Terms and definitions
-termsdefsymbols: Terms, definitions, symbols and abbreviated terms
+termsdefsymbolsabbrev: Terms, definitions, symbols and abbreviated terms
+termsdefsymbols: Terms, definitions and symbols
+termsdefabbrev: Terms, definitions and abbreviated terms
 normref: Normative references
 bibliography: Bibliography
 clause: Clause

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

@@ -6,7 +6,9 @@ introduction: Introduction
 foreword: Avant-propos
 abstract: Résumé
 termsdef: Terms et définitions
-termsdefsymbols: Terms, définitions, symboles et termes abrégés
+termsdefsymbolsabbrev: Terms, définitions, symboles et termes abrégés
+termsdefsymbols: Terms, définitions et symboles
+termsdefabbrev: Terms, définitions et termes abrégés
 normref: Références normatives
 bibliography: Bibliographie
 clause: Article

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

@@ -6,7 +6,9 @@ introduction: 引言
 foreword: 前言
 abstract: 摘要
 termsdef: 术语和定义
-termsdefsymbols: 术语、定义、符号、代号和缩略语
+termsdefsymbolsabbrev: 术语、定义、符号、代号和缩略语
+termsdefsymbols: 术语、定义、符号和代号
+termsdefabbrev: 术语、定义、符号和缩略语
 normref: 规范性引用文件
 bibliography: 参考文献
 clause: 条

data/lib/isodoc/base_style/reset.scss

@@ -125,5 +125,5 @@ b, strong {
 }
 
 div.document-stage-band, div.document-type-band {
-  background-color: #000000;
+  background-color: #333333;
 }

data/lib/isodoc/convert.rb

@@ -48,6 +48,7 @@ module IsoDoc
       @olstyle = options[:olstyle]
       @datauriimage = options[:datauriimage]
       @suppressheadingnumbers = options[:suppressheadingnumbers]
+      @break_up_urls_in_tables = options[:break_up_urls_in_tables] == "true"
       @termdomain = ""
       @termexample = false
       @note = false

data/lib/isodoc/function/blocks.rb

@@ -141,7 +141,7 @@ module IsoDoc::Function
     def admonition_parse(node, out)
       type = node["type"]
       name = admonition_name(node, type)
-      out.div **{ class: admonition_class(node) } do |t|
+      out.div **{ id: node["id"], class: admonition_class(node) } do |t|
         admonition_name_parse(node, t, name) if name
         node.children.each { |n| parse(n, t) unless n.name == "name" }
       end
@@ -222,5 +222,10 @@ module IsoDoc::Function
         quote_attribution(node, out)
       end
     end
+
+    def passthrough_parse(node, out)
+      return if node["format"] and !(node["format"].split(/,/).include? @format.to_s)
+      out.passthrough node.text
+    end
   end
 end

data/lib/isodoc/function/cleanup.rb

@@ -1,13 +1,25 @@
 module IsoDoc::Function
   module Cleanup
     def textcleanup(docxml)
+      docxml = termref_cleanup(passthrough_cleanup(docxml))
+    end
+
+    def termref_cleanup(docxml)
       docxml.
+        gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ").
         gsub(/\[TERMREF\]\s*/, l10n("[#{@source_lbl}: ")).
         gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@modified_lbl} [/TERMREF]")).
-        gsub(/\s*\[\/TERMREF\]\s*/, l10n("]")).
+        gsub(%r{\s*\[\/TERMREF\]\s*}, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@modified_lbl} &mdash; "))
     end
 
+    def passthrough_cleanup(docxml)
+      docxml.split(%r{(<passthrough>|</passthrough>)}).each_slice(4).map do |a|
+        a.size > 2 and a[2] = HTMLEntities.new.decode(a[2])
+        [a[0], a[2]]
+      end.join
+    end
+
     def cleanup(docxml)
       comment_cleanup(docxml)
       footnote_cleanup(docxml)
@@ -20,6 +32,7 @@ module IsoDoc::Function
     end
 
     def table_long_strings_cleanup(docxml)
+      return unless @break_up_urls_in_tables == true
       docxml.xpath("//td | //th").each do |d|
         d.traverse do |n|
           next unless n.text?
@@ -30,6 +43,7 @@ module IsoDoc::Function
     end
 
     def break_up_long_strings(t)
+      return t if t.match(/^\s*$/)
       t.split(/(?=\s)/).map do |w|
         (/^\s*$/.match(t) or w.size < 30) ? w :
           w.scan(/.{,30}/).map do |w1|
@@ -116,7 +130,7 @@ module IsoDoc::Function
     end
 
     def footnote_cleanup(docxml)
-      docxml.xpath('//a[@epub:type = "footnote"]/sup').each_with_index do |x, i|
+      docxml.xpath('//a[@class = "FootnoteRef"]/sup').each_with_index do |x, i|
         x.content = (i + 1).to_s
       end
       docxml

data/lib/isodoc/function/i18n.rb

@@ -77,8 +77,8 @@ module IsoDoc::Function
     end
 
     # TODO: move to localization file
-    def eref_localities1_zh(target, type, from, to)
-      ret = ", 第#{from.text}" if from
+    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}"
@@ -86,9 +86,9 @@ module IsoDoc::Function
     end
 
     # TODO: move to localization file
-    def eref_localities1(target, type, from, to, lang = "en")
-      return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
-      ret = ","
+    def eref_localities1(target, type, from, to, delim, lang = "en")
+      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

data/lib/isodoc/function/inline.rb

@@ -1,28 +1,7 @@
+require_relative "inline_simple"
+
 module IsoDoc::Function
   module Inline
-    def section_break(body)
-      body.br
-    end
-
-    def page_break(out)
-      out.br
-    end
-
-    def pagebreak_parse(_node, out)
-      out.br
-    end
-
-    def hr_parse(node, out)
-      out.hr
-    end
-
-    def br_parse(node, out)
-      out.br
-    end
-
-    def index_parse(node, out)
-    end
-
     def link_parse(node, out)
       out.a **attr_code(href: node["target"], title: node["alt"]) do |l|
         if node.text.empty?
@@ -50,17 +29,39 @@ module IsoDoc::Function
         (container && get_note_container_id(node) != container &&
          @anchors[node["target"]]) &&
         linkend = prefix_container(container, linkend, node["target"])
+        linkend = capitalise_xref(node, linkend)
       end
       linkend || "???"
     end
 
+    def capitalise_xref(node, linkend)
+      return linkend unless %w(Latn Cyrl Grek).include? @script
+      return linkend&.capitalize if node["case"] == "capital"
+      return linkend&.downcase if node["case"] == "lowercase"
+      return linkend if linkend[0,1].match(/\p{Upper}/)
+      prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
+        node.xpath("./preceding::text()")
+      (prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map { |p| p.text }.join)) ?
+        linkend&.capitalize : linkend
+    end
+
+    def nearest_block_parent(node)
+      until %w(p title td th name formula 
+        li dt dd sourcecode pre).include?(node.name)
+        node = node.parent
+      end
+      node
+    end
+
     def get_linkend(node)
-      contents = node.children.select { |c| c.name != "locality" }.
-        select { |c| !c.text? || /\S/.match(c) }
+      contents = node.children.select do |c|
+        !%w{locality localityStack}.include? c.name 
+      end.select { |c| !c.text? || /\S/.match(c) }
       !contents.empty? and
         return Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
       link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link + eref_localities(node.xpath(ns("./locality")), link)
+      link + eref_localities(node.xpath(ns("./locality | ./localityStack")),
+                             link)
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
       # <locality type="section"><reference>3.1</reference></locality></origin>
     end
@@ -73,16 +74,29 @@ module IsoDoc::Function
 
     def eref_localities(refs, target)
       ret = ""
-      refs.each do |r|
-        ret += if r["type"] == "whole" then l10n(", #{@whole_of_text}")
-               else
-                 eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
-                                  r.at(ns("./referenceTo")), @lang)
-               end
+      refs.each_with_index do |r, i|
+        delim = ","
+        delim = ";" if r.name == "localityStack" && i>0
+        if r.name == "localityStack"
+          r.elements.each_with_index do |rr, j|
+            ret += eref_localities0(rr, j, target, delim)
+            delim = ","
+          end
+        else
+          ret += eref_localities0(r, i, target, delim)
+        end
       end
       ret
     end
 
+    def eref_localities0(r, i, target, delim)
+      if r["type"] == "whole" then l10n("#{delim} #{@whole_of_text}")
+      else
+        eref_localities1(target, r["type"], r.at(ns("./referenceFrom")),
+                         r.at(ns("./referenceTo")), delim, @lang)
+      end
+    end
+
     def eref_parse(node, out)
       linkend = get_linkend(node)
       if node["type"] == "footnote"
@@ -94,13 +108,22 @@ module IsoDoc::Function
       end
     end
 
+    def origin_parse(node, out)
+      if t = node.at(ns("./termref"))
+        termrefelem_parse(t, out)
+      else
+        eref_parse(node, out)
+      end
+    end
+
     def termrefelem_parse(node, out)
       out << "Termbase #{node['base']}, term ID #{node['target']}"
     end
 
     def concept_parse(node, out)
-      content = node.first_element_child.children.select { |c| c.name != "locality" }.
-        select { |c| !c.text? || /\S/.match(c) }
+      content = node.first_element_child.children.select do |c|
+        !%w{locality localityStack}.include? c.name 
+      end.select { |c| !c.text? || /\S/.match(c) }
       if content.empty?
         out << "[Term defined in "
         parse(node.first_element_child, out)
@@ -112,7 +135,8 @@ module IsoDoc::Function
 
     def stem_parse(node, out)
       ooml = if node["type"] == "AsciiMath"
-               "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}#{@closemathdelim}"
+               "#{@openmathdelim}#{HTMLEntities.new.encode(node.text)}"\
+                 "#{@closemathdelim}"
              elsif node["type"] == "MathML" then node.first_element_child.to_s
              else
                HTMLEntities.new.encode(node.text)
@@ -154,57 +178,31 @@ module IsoDoc::Function
       out << text
     end
 
-    def bookmark_parse(node, out)
-      out.a **attr_code(id: node["id"])
-    end
-
-    def keyword_parse(node, out)
-      out.span **{ class: "keyword" } do |s|
-        node.children.each { |n| parse(n, s) }
-      end
-    end
-
-    def em_parse(node, out)
-      out.i do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def strong_parse(node, out)
-      out.b do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def sup_parse(node, out)
-      out.sup do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def sub_parse(node, out)
-      out.sub do |e|
-        node.children.each { |n| parse(n, e) }
-      end
-    end
-
-    def tt_parse(node, out)
-      out.tt do |e|
-        node.children.each { |n| parse(n, e) }
+    def error_parse(node, out)
+      text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+      out.para do |p|
+        p.b(**{ role: "strong" }) { |e| e << text }
       end
     end
 
-    def strike_parse(node, out)
-      out.s do |e|
-        node.children.each { |n| parse(n, e) }
+    def variant_parse(node, out)
+      if node["lang"] == @lang && node["script"] == @script
+        node.children.each { |n| parse(n, out) }
+      else
+        return if found_matching_variant_sibling(node)
+        return unless !node.at("./preceding-sibling::xmlns:variant")
+        node.children.each { |n| parse(n, out) }
       end
     end
 
-    def error_parse(node, out)
-      text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      out.para do |p|
-        p.b(**{ role: "strong" }) { |e| e << text }
+    def found_matching_variant_sibling(node)
+      prev = node.xpath("./preceding-sibling::xmlns:variant")
+      foll = node.xpath("./following-sibling::xmlns:variant")
+      found = false
+      (prev + foll).each do |n|
+        found = true if n["lang"] == @lang && n["script"] == @script
       end
+      found
     end
   end
 end