isodoc 1.0.24 → 1.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ac1215a8065519d1dbab07c61a8c4e84dbc90923300bef4f6e44e4b9a8a843
-  data.tar.gz: b89e80351f424c11fb7cb2b92c838a8b8b05f2791a1f91a1d531b14611632229
+  metadata.gz: 56ed930565ee3a3bbb9649d61e3b552f6a13de3bb66cbf6f0e134d341c457386
+  data.tar.gz: ee72443f7f96082b52b60bd525cb54d14088f0776c60bd88456bd5796de9d7a9
 SHA512:
-  metadata.gz: d5ca6cf434f62383545145ccb02adccc060cc9fc5b79478655a5eaa21ca03332f1032baa87abc670935a586fa2cd957f3b8c9358e40802f33dcbc978e8da4b0a
-  data.tar.gz: 01f839c290c1e557a162e2ae43aba2c8ecb291b86664759d72eeacd80b1f338734ce470827cd35485446b589f77b637a5cece6f3118b0855d2494f7537adc1e1
+  metadata.gz: 8effb0abf7faf7a63a40a3cee55465290e5d156be8af54f16b36283e191f52ff3cba4443cce54f95c6b38a86c951656d78179cb02b4010c98a6bea8d80c97501
+  data.tar.gz: 15c19b41ec493b97cc0ed06fbfe161f1d39f99e069f6d760a20858330f676c2bd35a60fe04f83b88569e6c61238090d0e2c336129f9665f6b695882fc75801d3

data/.github/workflows/macos.yml

@@ -1,20 +1,26 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
 name: macos
 
 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 +35,14 @@ 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: Install Inkscape
+        run: |
+          brew cask install inkscape
+          inkscape --version
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,20 +1,26 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
 name: ubuntu
 
 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 +35,23 @@ 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: Install Inkscape
+        run: |
+          sudo add-apt-repository ppa:inkscape.dev/stable
+          sudo apt update
+          sudo apt install inkscape
+          inkscape --version
       - 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

@@ -1,20 +1,26 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
 name: windows
 
 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 +37,14 @@ 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: Install Inkscape
+        run: |
+          choco install --no-progress -y inkscape
+          inkscape --version
       - 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/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

@@ -1,45 +1,9 @@
-require_relative "blocks_example"
+require_relative "blocks_example_note"
 
 module IsoDoc::Function
   module Blocks
     @annotation = false
 
-    def note_label(node)
-      n = get_anchors[node["id"]]
-      return @note_lbl if n.nil? || n[:label].nil? || n[:label].empty?
-      l10n("#{@note_lbl} #{n[:label]}")
-    end
-
-    def note_p_parse(node, div)
-      div.p do |p|
-        p.span **{ class: "note_label" } do |s|
-          s << note_label(node)
-        end
-        insert_tab(p, 1)
-        node.first_element_child.children.each { |n| parse(n, p) }
-      end
-      node.element_children[1..-1].each { |n| parse(n, div) }
-    end
-
-    def note_parse1(node, div)
-      div.p do |p|
-        p.span **{ class: "note_label" } do |s|
-          s << note_label(node)
-        end
-        insert_tab(p, 1)
-      end
-      node.children.each { |n| parse(n, div) }
-    end
-
-    def note_parse(node, out)
-      @note = true
-      out.div **{ id: node["id"], class: "Note" } do |div|
-        node.first_element_child.name == "p" ?
-          note_p_parse(node, div) : note_parse1(node, div)
-      end
-      @note = false
-    end
-
     def figure_name_parse(node, div, name)
       return if name.nil? && node.at(ns("./figure"))
       lbl = anchor(node['id'], :label, false)
@@ -58,11 +22,15 @@ module IsoDoc::Function
       end
     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"
       @in_figure = true
-      out.div **attr_code(id: node["id"], class: "figure") do |div|
+      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"
@@ -72,10 +40,14 @@ module IsoDoc::Function
       @in_figure = false
     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 **attr_code(id: node["id"], class: "pseudocode") do |div|
+      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
@@ -101,9 +73,13 @@ module IsoDoc::Function
       end
     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 **attr_code(id: node["id"], class: "Sourcecode") do |div|
+      out.p **sourcecode_attrs(node) do |div|
         @sourcecode = true
         node.children.each { |n| parse(n, div) unless n.name == "name" }
         @sourcecode = false
@@ -138,10 +114,15 @@ module IsoDoc::Function
       name
     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 **{ class: admonition_class(node) } do |t|
+      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
@@ -157,7 +138,7 @@ module IsoDoc::Function
     end
 
     def formula_parse1(node, out)
-      out.div **attr_code(id: node["id"], class: "formula") do |div|
+      out.div **attr_code(class: "formula") do |div|
         div.p do |p|
           parse(node.at(ns("./stem")), div)
           lbl = anchor(node['id'], :label, false)
@@ -169,12 +150,18 @@ module IsoDoc::Function
       end
     end
 
+    def formula_attrs(node)
+      attr_code(id: node["id"], style: keep_style(node))
+    end
+
     def formula_parse(node, out)
-      formula_parse1(node, out)
-      formula_where(node.at(ns("./dl")), out)
-      node.children.each do |n|
-        next if %w(stem dl).include? n.name
-        parse(n, 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).include? n.name
+          parse(n, div)
+        end
       end
     end
 
@@ -187,8 +174,9 @@ module IsoDoc::Function
 
     def para_attrs(node)
       attrs = { class: para_class(node), id: node["id"] }
-      node["align"].nil? or
-        attrs[:style] = "text-align:#{node['align']};"
+      s = node["align"].nil? ? "" : "text-align:#{node['align']};"
+      s = "#{s}#{keep_style(node)}"
+      attrs[:style] = s unless s.empty?
       attrs
     end
 
@@ -222,5 +210,11 @@ 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/{blocks_example.rb → blocks_example_note.rb}

@@ -15,9 +15,13 @@ module IsoDoc::Function
       { class: "example_label", style: "width:82.8pt;padding:0 0 0 0;\
         margin-left:0pt;vertical-align:top;" }.freeze
 
+    def example_div_attr(node)
+      attr_code(id: node["id"], class: "example", style: keep_style(node))
+    end
+
     # used if we are boxing examples
     def example_div_parse(node, out)
-      out.div **attr_code(id: node["id"], class: "example") do |div|
+      out.div **example_div_attr(node) do |div|
         example_label(node, div, node.at(ns("./name")))
         node.children.each do |n|
           parse(n, div) unless n.name == "name"
@@ -27,7 +31,8 @@ module IsoDoc::Function
 
     def example_table_attr(node)
       attr_code(id: node["id"], class: "example",
-                style: "border-collapse:collapse;border-spacing:0;" )
+                style: "border-collapse:collapse;border-spacing:0;"\
+                "#{keep_style(node)}" )
     end
 
     EXAMPLE_TD_ATTR =
@@ -49,5 +54,55 @@ module IsoDoc::Function
     def example_parse(node, out)
       example_div_parse(node, out)
     end
+
+    def note_label(node)
+      n = get_anchors[node["id"]]
+      return @note_lbl if n.nil? || n[:label].nil? || n[:label].empty?
+      l10n("#{@note_lbl} #{n[:label]}")
+    end
+
+    def note_p_parse(node, div)
+      div.p do |p|
+        p.span **{ class: "note_label" } do |s|
+          s << note_label(node)
+        end
+        insert_tab(p, 1)
+        node.first_element_child.children.each { |n| parse(n, p) }
+      end
+      node.element_children[1..-1].each { |n| parse(n, div) }
+    end
+
+    def note_parse1(node, div)
+      div.p do |p|
+        p.span **{ class: "note_label" } do |s|
+          s << note_label(node)
+        end
+        insert_tab(p, 1)
+      end
+      node.children.each { |n| parse(n, div) }
+    end
+
+    def keep_style(node)
+      ret = ""
+      node["keep-with-next"] == "true" and
+        ret += "page-break-after: avoid;"
+      node["keep-lines-together"] == "true" and
+        ret += "page-break-inside: avoid;"
+      return nil if ret.empty?
+      ret
+    end
+
+    def note_attrs(node)
+      attr_code(id: node["id"], class: "Note", style: keep_style(node))
+    end
+
+    def note_parse(node, out)
+      @note = true
+      out.div **note_attrs(node) do |div|
+        node.first_element_child.name == "p" ?
+          note_p_parse(node, div) : note_parse1(node, div)
+      end
+      @note = false
+    end
   end
 end