isodoc 2.0.5.2 → 2.0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '099aeb3456fabbcbd95076b6ccb9826997871b9d85ff079fc04aadf82a491a80'
-  data.tar.gz: 4002cee22c77b7a64f69864f3a67990cdfedddd458f95e86921ff132a804fe10
+  metadata.gz: 127ed935ef3052a904bd3d13f513b6e4772faf36defe3035317f4ea0586ec249
+  data.tar.gz: b2cb57af77963c233565bf0599d92f591b17167c80d76752473e83b768f1e260
 SHA512:
-  metadata.gz: 5342970e267f7a1b8c259d7c06c8cd27e5600cc0ff4d33033f5d8e5206d335050dd4d6f989f68220d8adc0966483f26c30e472b51cacbe93268ddbd24c42e1c7
-  data.tar.gz: 0f03dd6d85ada4c98a13b0a1bfe6c86b19d0dc5d02fc759a334d560eeed1ad7642a2c25c1442610187206d41a24aa058db3e16fb6f7a96d0e19ed6752a244290
+  metadata.gz: 143929b58729e90e51149b2db84c08fac0dbc5a4e358ab8759e8cdc2977e4c055ba556ca337173bfbd9fa4a3da118cb0c0b1aee9f9bbb61d8c1515621dc490fb
+  data.tar.gz: 61d77e9f87e6d6358beabb8a730cad9c35f79848ae4e31938f2b725aefbe044fb54d1a54006d710b1d235c3353e4cab7c9109bcb5d0c044e22d358e8ddb22475

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: metanorma/metanorma-build-scripts/.github/workflows/rubygems-release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+      event_name: ${{ github.event_name }}
+    secrets:
+      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+

data/lib/isodoc/html_function/postprocess_footnotes.rb

@@ -36,7 +36,7 @@ module IsoDoc::HtmlFunction
     def footnote_backlinks(docxml)
       seen = {}
       docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
-        seen[x["href"]] and next or seen[x["href"]] = true
+        (seen[x["href"]] and next) or seen[x["href"]] = true
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
         footnote_backlinks1(x, fn)
         x["id"] ||= "fnref:#{i + 1}"

data/lib/isodoc/metadata_contributor.rb

@@ -5,10 +5,9 @@ module IsoDoc
         if a.at(ns("./name/completename"))
           ret << a.at(ns("./name/completename")).text
         else
-          forenames = a.xpath(ns("./name/forename"))
-          fn = forenames.each_with_object([]) { |f, m| m << f.text }
-          surname = a&.at(ns("./name/surname"))&.text
-          ret << "#{fn.join(' ')} #{surname}"
+          fn = a.xpath(ns("./name/forename"))
+            .each_with_object([]) { |f, m| m << f.text }
+          ret << "#{fn.join(' ')} #{a&.at(ns('./name/surname'))&.text}"
         end
       end
     end

data/lib/isodoc/presentation_xml_convert.rb

@@ -13,7 +13,7 @@ module IsoDoc
       super
     end
 
-    def convert1(docxml, filename, dir)
+    def convert1(docxml, _filename, _dir)
       @xrefs.parse docxml
       info docxml, nil
       conversions(docxml)
@@ -76,11 +76,11 @@ module IsoDoc
     end
 
     def postprocess(result, filename, _dir)
-      toXML(result, filename)
+      to_xml(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }
     end
 
-    def toXML(result, filename)
+    def to_xml(result, filename)
       File.open(filename, "w:UTF-8") { |f| f.write(result) }
     end
   end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.5.2".freeze
+  VERSION = "2.0.5.3".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -107,9 +107,8 @@ module IsoDoc
                 x += 1
               end
               (r..(r + rs - 1)).each do |y2|
-                (x..(x + cs - 1)).each do |x2|
-                  cells2d[y2][x2] = 1
-                end
+                cells2d[y2].nil? and next
+                (x..(x + cs - 1)).each { |x2| cells2d[y2][x2] = 1 }
               end
               width = (x..(x + cs - 1)).each_with_object({ width: 0 }) do |z, m|
                 m[:width] += w[z]

data/lib/isodoc/xref/xref_gen.rb

@@ -35,7 +35,7 @@ module IsoDoc
         @labels["termnote"].gsub(/%/, note.to_s)
       end
 
-      def increment_label(elems, node, counter, increment = true)
+      def increment_label(elems, node, counter, increment: true)
         return "" if elems.size == 1 && !node["number"]
 
         counter.increment(node) if increment
@@ -62,10 +62,9 @@ module IsoDoc
           c = Counter.new
           examples.reject { |n| blank?(n["id"]) }.each do |n|
             c.increment(n)
-            idx = increment_label(examples, n, c, false)
-            @anchors[n["id"]] =
-              anchor_struct(idx, n, @labels["example_xref"], "termexample",
-                            n["unnumbered"])
+            idx = increment_label(examples, n, c, increment: false)
+            @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
+                                              "termexample", n["unnumbered"])
           end
         end
       end

data/lib/isodoc/xslfo_convert.rb

@@ -2,7 +2,7 @@ require "metanorma"
 
 module IsoDoc
   class XslfoPdfConvert < ::IsoDoc::Convert
-    # MN2PDF_OPTIONS = :mn2pdf
+    MN_OPTIONS_KEY = :mn2pdf
     MN2PDF_FONT_MANIFEST = :font_manifest
     MN2PDF_OPTIONS = { pdfencryptionlength: "--encryption-length",
                        pdfownerpassword: "--owner-password",
@@ -43,7 +43,7 @@ module IsoDoc
 
     def pdf_options(_docxml)
       ret = {}
-      font_manifest = @options[MN2PDF_FONT_MANIFEST] and
+      font_manifest = @options.dig(MN_OPTIONS_KEY, MN2PDF_FONT_MANIFEST) and
         ret[MN2PDF_FONT_MANIFEST] = font_manifest
       @aligncrosselements && !@aligncrosselements.empty? and
         ret["--param align-cross-elements="] =

data/lib/metanorma/output/base.rb

@@ -1,10 +1,9 @@
-
 module Metanorma
   module Output
 
     class Base
 
-      def convert(in_path, out_path)
+      def convert(_in_path, _out_path)
         raise "This is an abstract class"
       end
 

data/spec/isodoc/xslfo_convert_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe IsoDoc do
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-        IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
+        IsoDoc::XslfoPdfConvert::MN_OPTIONS_KEY => {
           IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => nil,
         },
       },
@@ -32,8 +32,7 @@ RSpec.describe IsoDoc do
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-        IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => mn2pdf_opts,
-        font_manifest: "/tmp/manifest.yml",
+        IsoDoc::XslfoPdfConvert::MN_OPTIONS_KEY => mn2pdf_opts,
       },
     )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.5.2
+  version: 2.0.5.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -372,6 +372,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.yml"
@@ -390,23 +391,15 @@ files:
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
-- lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
 - lib/isodoc/base_style/bands.scss
-- lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss
-- lib/isodoc/base_style/coverpage.css
 - lib/isodoc/base_style/coverpage.scss
-- lib/isodoc/base_style/defaults.css
 - lib/isodoc/base_style/defaults.scss
-- lib/isodoc/base_style/metanorma_word.css
 - lib/isodoc/base_style/metanorma_word.scss
-- lib/isodoc/base_style/nav.css
 - lib/isodoc/base_style/nav.scss
-- lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
 - lib/isodoc/base_style/scripts.html
-- lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
@@ -519,7 +512,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -534,8 +527,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []

data/lib/isodoc/base_style/all.css

@@ -1,227 +0,0 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  border: 0;
-  font-size: 100%; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  vertical-align: baseline; }
-
-html, body, div, span, applet, object, iframe,
-p, blockquote,
-a, abbr, acronym, address, big, cite,
-del, dfn, em, img, ins, q, s,
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  font-family: {{bodyfont}}; }
-
-code, pre, tt, kbd, samp {
-  font-family: {{monospacefont}};
-  font-variant-ligatures: none; }
-
-code *, pre *, tt *, kbd *, samp * {
-  font-family: {{monospacefont}} !important;
-  font-variant-ligatures: none; }
-
-p code, dt code, li code, label code, legend code, caption code, th code, td code,
-p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
-p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
-p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
-  font-size: {{monospacefontsize}}; }
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block; }
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0; }
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: {{headerfont}}; }
-
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: {{headerfont}}; }
-
-blockquote, q {
-  quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
-    content: '';
-    content: none; }
-
-.h2Annex {
-  font-family: {{headerfont}}; }
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto; }
-  dl dt p, dl dd p {
-    margin-top: 0; }
-  dl dt {
-    grid-column-start: 1; }
-  dl dd {
-    grid-column-start: 2; }
-
-b, strong {
-  font-weight: bold; }
-
-div.document-stage-band, div.document-type-band {
-  background-color: #333333; }
-
-a.FootnoteRef + a.FootnoteRef:before {
-  content: ", ";
-  vertical-align: super; }
-
-.addition {
-  color: blue; }
-
-.deletion {
-  color: red;
-  text-decoration: line-through; }
-
-#standard-band {
-  background-color: #0AC442; }
-
-#standard {
-  border-bottom: solid 3px #0AC442; }
-
-#directive-band {
-  background-color: #540D6E; }
-
-#directive {
-  border-bottom: solid 3px #540D6E; }
-
-#guide-band {
-  background-color: #D183C9; }
-
-#guide {
-  border-bottom: solid 3px #D183C9; }
-
-#specification-band {
-  background-color: #65AFFF; }
-
-#specification {
-  border-bottom: solid 3px #65AFFF; }
-
-#report-band {
-  background-color: #3A405A; }
-
-#report {
-  border-bottom: solid 3px #3A405A; }
-
-#amendment-band {
-  background-color: #F26430; }
-
-#amendment {
-  border-bottom: solid 3px #F26430; }
-
-#corrigendum-band {
-  background-color: #C84630; }
-
-#corrigendum {
-  border-bottom: solid 3px #C84630; }
-
-#administrative-band {
-  background-color: #BFAE48; }
-
-#administrative {
-  border-bottom: solid 3px #BFAE48; }
-
-#advisory-band {
-  background-color: #BD9391; }
-
-#advisory {
-  border-bottom: solid 3px #BD9391; }
-
-#proposal-band {
-  background-color: #39A0ED; }
-
-#proposal {
-  border-bottom: solid 3px #39A0ED; }
-
-#working-draft-band {
-  background-color: #2D7393; }
-
-#working-draft {
-  border-bottom: solid 3px #2D7393; }
-
-#committee-draft-band {
-  background-color: #2A6B7C; }
-
-#committee-draft {
-  border-bottom: solid 3px #2A6B7C; }
-
-#draft-standard-band {
-  background-color: #1C7F7A; }
-
-#draft-standard {
-  border-bottom: solid 3px #1C7F7A; }
-
-#final-draft-band {
-  background-color: #53C170; }
-
-#final-draft {
-  border-bottom: solid 3px #53C170; }
-
-#published-band {
-  background-color: #069E2D; }
-
-#published {
-  border-bottom: solid 3px #069E2D; }
-
-#withdrawn-band {
-  background-color: #004E64; }
-
-#withdrawn {
-  border-bottom: solid 3px #004E64; }
-
-#cancelled-band {
-  background-color: #2E382E; }
-
-#cancelled {
-  border-bottom: solid 3px #2E382E; }

data/lib/isodoc/base_style/metanorma_word.css

@@ -1,47 +0,0 @@
-div.table_container {
-  margin-bottom: 14pt; }
-
-ol {
-  margin-bottom: 0cm; }
-
-ul {
-  margin-bottom: 0cm; }
-
-table.MsoISOTable tr {
-  page-break-inside: avoid; }
-
-td {
-  page-break-inside: avoid; }
-
-tr {
-  page-break-after: avoid; }
-
-table.MsoISOTableBig tr {
-  page-break-inside: auto; }
-
-table.MsoISOTableBig td {
-  page-break-inside: auto; }
-
-span.stem {
-  font-family: "Cambria Math",serif;
-  mso-ascii-font-family: "Cambria Math";
-  font-style: italic; }
-
-dt {
-  page-break-inside: avoid;
-  page-break-after: avoid; }
-
-br.section {
-  page-break-before: always;
-  mso-break-type: section-break; }
-
-br.pagebreak {
-  page-break-before: always;
-  mso-special-character: line-break; }
-
-span.addition {
-  color: blue; }
-
-span.deletion {
-  color: red;
-  text-decoration: line-through; }

data/lib/isodoc/base_style/reset.css

@@ -1,125 +0,0 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  border: 0;
-  font-size: 100%; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  vertical-align: baseline; }
-
-html, body, div, span, applet, object, iframe,
-p, blockquote,
-a, abbr, acronym, address, big, cite,
-del, dfn, em, img, ins, q, s,
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  font-family: {{bodyfont}}; }
-
-code, pre, tt, kbd, samp {
-  font-family: {{monospacefont}};
-  font-variant-ligatures: none; }
-
-code *, pre *, tt *, kbd *, samp * {
-  font-family: {{monospacefont}} !important;
-  font-variant-ligatures: none; }
-
-p code, dt code, li code, label code, legend code, caption code, th code, td code,
-p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
-p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
-p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
-  font-size: {{monospacefontsize}}; }
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block; }
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0; }
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: {{headerfont}}; }
-
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: {{headerfont}}; }
-
-blockquote, q {
-  quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
-    content: '';
-    content: none; }
-
-.h2Annex {
-  font-family: {{headerfont}}; }
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto; }
-  dl dt p, dl dd p {
-    margin-top: 0; }
-  dl dt {
-    grid-column-start: 1; }
-  dl dd {
-    grid-column-start: 2; }
-
-b, strong {
-  font-weight: bold; }
-
-div.document-stage-band, div.document-type-band {
-  background-color: #333333; }
-
-a.FootnoteRef + a.FootnoteRef:before {
-  content: ", ";
-  vertical-align: super; }
-
-.addition {
-  color: blue; }
-
-.deletion {
-  color: red;
-  text-decoration: line-through; }