isodoc 1.0.22 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889ed14c0177867afde418d7d947a4f5963dc533c3c61c0b2d4bd320a1bb02a3
-  data.tar.gz: 8f9a41c95de57470b68cba90e890d8753c49a36ea7f33658a72877177b5a8aa2
+  metadata.gz: 68d6f17f0d5291c6c067bfc6a3a476885b80f128bdc9c4e3e3d8356c6af30482
+  data.tar.gz: 2710c48aa2fb9eeee44b586107b07884d52802a53fec81d69c0f3fb68fa988ed
 SHA512:
-  metadata.gz: aee9f7048977dabef0312c23c94e7d41b242e7623f7ec5daa252db232250ff9bd150e7d4750ac0000aa8463f79a8a716910b0e7a6929a3949353bbfe268b7327
-  data.tar.gz: 0be841a473792658efd1221ee01a9011e1744cbe3e9fd4e2d0657ac057f41c057aba67f52d0f712326af915b5df802fc2d352338255fd688b31c1867d6ffac36
+  metadata.gz: 1c38cb43027aa1a056d465660449a4a58e1a5b78474a5f0184fca4164f2af2480720329e5a7181fcc1731151ef15db71019aa9fc34175b779de517006bf85fa6
+  data.tar.gz: '09503b88edfb1db0b3def003bca81c356b40790014953a9bc08de680af8db75222ded714f43a1f6820ec30dbaa2e3f83ac2a5e386f3c757f0d639f086e0b4b2c'

data/.github/workflows/macos.yml

@@ -1,21 +1,28 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
+    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
@@ -30,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

@@ -1,21 +1,28 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
+    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
@@ -25,15 +32,29 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler 
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - 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' && matrix.ruby == '2.6'
+        env:
+          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
+          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+        run: |
+          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
+          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
+          for repo in $DEPENDENT_REPOS
+          do
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+          done

data/.github/workflows/windows.yml

@@ -1,21 +1,28 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
 on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ '**' ]
+    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
@@ -26,17 +33,16 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler 
+          gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
       - 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/README.adoc

@@ -1,8 +1,9 @@
 = isodoc: Processor to generate HTML/Word from Metanorma XML
 
 image:https://img.shields.io/gem/v/isodoc.svg["Gem Version", link="https://rubygems.org/gems/isodoc"]
-image:https://travis-ci.com/metanorma/isodoc.svg["Build Status", link="https://travis-ci.com/metanorma/isodoc"]
-image:https://ci.appveyor.com/api/projects/status/f93bvu6qfwxij07x?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/isodoc"]
+image:https://github.com/metanorma/isodoc/workflows/ubuntu/badge.svg["Ubuntu Build Status", link="https://github.com/metanorma/isodoc/actions?query=workflow%3Aubuntu"]
+image:https://github.com/metanorma/isodoc/workflows/macos/badge.svg["OSX Build Status", link="https://github.com/metanorma/isodoc/actions?query=workflow%3Amacos"]
+image:https://github.com/metanorma/isodoc/workflows/windows/badge.svg["Windows Build Status", link="https://github.com/metanorma/isodoc/actions?query=workflow%3Awindows"]
 image:https://codeclimate.com/github/metanorma/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/isodoc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/isodoc.svg["Pull Requests", link="https://github.com/metanorma/isodoc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/isodoc/latest.svg["Commits since latest",link="https://github.com/metanorma/isodoc/releases"]

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
@@ -55,6 +57,21 @@ deprecated: DEPRECATED
 source: SOURCE
 and: and
 all_parts: All Parts
+month_january: January
+month_february: February
+month_march: March
+month_april: April
+month_may: May
+month_june: June
+month_july: July
+month_august: August
+month_september: September
+month_october: October
+month_november: November
+month_december: December
+obligation: Obligation
+subject: Subject
+inherits: Inherits
 admonition: {
   danger: Danger,
   warning: Warning,

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
@@ -48,6 +50,21 @@ deprecated: DÉCONSEILLÉ
 source: SOURCE
 and: et
 all_parts: toutes les parties
+month_january: Janvier
+month_february: Février
+month_march: Mars
+month_april: Avril
+month_may: Mai
+month_june: Juin
+month_july: Juillet
+month_august: Août
+month_september: Septembre
+month_october: Octobre
+month_november: Novembre
+month_december: Décembre
+obligation: Obligation
+subject: Sujet
+inherits: Hérite
 admonition: {
   danger: Danger,
   warning: Avertissement,

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

@@ -6,7 +6,9 @@ introduction: 引言
 foreword: 前言
 abstract: 摘要
 termsdef: 术语和定义
-termsdefsymbols: 术语、定义、符号、代号和缩略语
+termsdefsymbolsabbrev: 术语、定义、符号、代号和缩略语
+termsdefsymbols: 术语、定义、符号和代号
+termsdefabbrev: 术语、定义、符号和缩略语
 normref: 规范性引用文件
 bibliography: 参考文献
 clause: 条
@@ -50,6 +52,21 @@ deprecated: 被取代
 source: 定义
 and: 和
 all_parts: 所有部分
+month_january: 一月
+month_february: 二月
+month_march: 三月
+month_april: 四月
+month_may: 五月
+month_june: 六月
+month_july: 七月
+month_august: 八月
+month_september: 九月
+month_october: 十月
+month_november: 十一月
+month_december: 十二月
+obligation: 义务
+subject: 主体
+inherits: 继承自
 admonition: {
   danger: 危险,
   warning: 警告,

data/lib/isodoc/base_style/bands.scss

@@ -7,7 +7,10 @@
   }
 
   font-weight: $fontWeight;
-  height: $length;
+
+  @if $length {
+    height: $length;
+  }
 
   color: $color;
   text-transform: uppercase;
@@ -28,9 +31,9 @@
 
 @mixin docBand(
     $order,
-    $textLength,
+    $textLength: null,
     $offset: 0,
-	$color: white,
+	  $color: white,
     $fontWeight: 400,
     $fontFamily: null) {
 

data/lib/isodoc/base_style/reset.scss

@@ -125,5 +125,5 @@ b, strong {
 }
 
 div.document-stage-band, div.document-type-band {
-  background-color: #FFFFFF;
+  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

@@ -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,6 +1,7 @@
 module IsoDoc::Function
   module Cleanup
     def textcleanup(docxml)
+      docxml = passthrough_cleanup(docxml)
       docxml.
         gsub(/\[TERMREF\]\s*/, l10n("[#{@source_lbl}: ")).
         gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@modified_lbl} [/TERMREF]")).
@@ -8,6 +9,13 @@ module IsoDoc::Function
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@modified_lbl} — "))
     end
 
+    def passthrough_cleanup(docxml)
+      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,15 +28,18 @@ 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?
-          n.replace(break_up_long_strings(n.text))
+          n.replace(HTMLEntities.new.encode(
+            break_up_long_strings(n.text)))
         end
       end
     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|

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

@@ -55,12 +55,12 @@ module IsoDoc::Function
     end
 
     def get_linkend(node)
-      link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
-      link += eref_localities(node.xpath(ns("./locality")), link)
-      contents = node.children.select { |c| c.name != "locality" }.
+      contents = node.children.select { |c| !%w{locality localityStack}.include? c.name }.
         select { |c| !c.text? || /\S/.match(c) }
-      return link if contents.nil? || contents.empty?
-      Nokogiri::XML::NodeSet.new(node.document, contents).to_xml
+      !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 | ./localityStack")), link)
       # so not <origin bibitemid="ISO7301" citeas="ISO 7301">
       # <locality type="section"><reference>3.1</reference></locality></origin>
     end
@@ -73,16 +73,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,12 +107,20 @@ 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" }.
+      content = node.first_element_child.children.select { |c| !%w{locality localityStack}.include? c.name }.
         select { |c| !c.text? || /\S/.match(c) }
       if content.empty?
         out << "[Term defined in "
@@ -206,5 +227,19 @@ module IsoDoc::Function
         p.b(**{ role: "strong" }) { |e| e << text }
       end
     end
+
+    def variant_parse(node, out)
+      if node["lang"] == @lang && node["script"] == @script
+        node.children.each { |n| parse(n, out) }
+      else
+        prev = node.xpath("./preceding-sibling::xmlns:variant")
+        foll = node.xpath("./following-sibling::xmlns:variant")
+        found = false
+        (prev + foll).each { |n| found = true if n["lang"] == @lang && n["script"] == @script }
+        return if found
+        return unless prev.empty?
+        node.children.each { |n| parse(n, out) }
+      end
+    end
   end
 end