isodoc 2.1.0.1 → 2.1.2

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -60,7 +60,7 @@ module IsoDoc
           <span lang="EN-GB"><span
             style='mso-element:field-begin'></span><span
             style='mso-spacerun:yes'>&#xA0;</span>TOC
-            \\o &quot;1-#{level}&quot; \\h \\z \\u <span
+            \\o "1-#{level}" \\h \\z \\u <span
             style='mso-element:field-separator'></span></span>
         TOC
       end
@@ -68,7 +68,7 @@ module IsoDoc
       WORD_TOC_SUFFIX1 = <<~TOC.freeze
         <p class="MsoToc1"><span lang="EN-GB"><span
           style='mso-element:field-end'></span></span><span
-          lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
+          lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
       TOC
 
       def make_WordToC(docxml, level)
@@ -86,7 +86,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle&quot;
+        \\h \\z \\t "RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle"
         <span style='mso-element:field-separator'></span></span>
       TOC
 
@@ -94,7 +94,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
+        \\h \\z \\t "TableTitle,tabletitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -102,7 +102,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
+        \\h \\z \\t "FigureTitle,figuretitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 

data/lib/isodoc/xref/xref_gen.rb

@@ -43,7 +43,7 @@ module IsoDoc
       end
 
       def termnote_anchor_names(docxml)
-        docxml.xpath(ns("//term[termnote]")).each do |t|
+        docxml.xpath(ns("//*[termnote]")).each do |t|
           c = Counter.new
           t.xpath(ns("./termnote")).reject { |n| blank?(n["id"]) }.each do |n|
             c.increment(n)
@@ -57,7 +57,7 @@ module IsoDoc
       end
 
       def termexample_anchor_names(docxml)
-        docxml.xpath(ns("//term[termexample]")).each do |t|
+        docxml.xpath(ns("//*[termexample]")).each do |t|
           examples = t.xpath(ns("./termexample"))
           c = Counter.new
           examples.reject { |n| blank?(n["id"]) }.each do |n|
@@ -148,12 +148,12 @@ module IsoDoc
         c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
         list.xpath(ns("./li")).each do |li|
           label = c.increment(li).listlabel(list, depth)
-          label = "#{prev_label}.#{label}" unless prev_label.empty?
+          label = "#{prev_label}) #{label}" unless prev_label.empty?
           label = "#{list_anchor[:xref]} #{label}" if refer_list
           li["id"] and @anchors[li["id"]] =
                          { xref: "#{label})", type: "listitem",
                            container: list_anchor[:container] }
-          li.xpath(ns("./ol")).each do |ol|
+          (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
             list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.1.0.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -399,17 +385,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
-- ".hound.yml"
-- ".oss-guides.rubocop.yml"
-- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - README.adoc
-- Rakefile
-- bin/rspec
 - isodoc.gemspec
 - lib/isodoc-yaml/i18n-ar.yaml
 - lib/isodoc-yaml/i18n-de.yaml
@@ -506,46 +485,6 @@ files:
 - lib/metanorma/output/xslfo.rb
 - lib/relaton/render/config.yml
 - lib/relaton/render/general.rb
-- spec/assets/header.html
-- spec/assets/html.scss
-- spec/assets/html_override.css
-- spec/assets/htmlcover.html
-- spec/assets/htmlintro.html
-- spec/assets/i18n.yaml
-- spec/assets/iso.xml
-- spec/assets/odf.emf
-- spec/assets/odf.svg
-- spec/assets/odf1.svg
-- spec/assets/outputtest/a.xml
-- spec/assets/outputtest/iso.international-standard.xsl
-- spec/assets/rice_image1
-- spec/assets/rice_image1.png
-- spec/assets/scripts.html
-- spec/assets/scripts_override.html
-- spec/assets/std.css
-- spec/assets/word.css
-- spec/assets/word_override.css
-- spec/assets/wordcover.html
-- spec/assets/wordintro.html
-- spec/isodoc/blocks_spec.rb
-- spec/isodoc/cleanup_spec.rb
-- spec/isodoc/footnotes_spec.rb
-- spec/isodoc/form_spec.rb
-- spec/isodoc/i18n_spec.rb
-- spec/isodoc/inline_spec.rb
-- spec/isodoc/lists_spec.rb
-- spec/isodoc/metadata_spec.rb
-- spec/isodoc/postproc_spec.rb
-- spec/isodoc/presentation_xml_spec.rb
-- spec/isodoc/ref_spec.rb
-- spec/isodoc/section_spec.rb
-- spec/isodoc/table_spec.rb
-- spec/isodoc/terms_spec.rb
-- spec/isodoc/utils_spec.rb
-- spec/isodoc/xref_numbering_spec.rb
-- spec/isodoc/xref_spec.rb
-- spec/isodoc/xslfo_convert_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
@@ -565,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  rake:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/inkscape-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,24 +0,0 @@
-# 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/.hound.yml

@@ -1,5 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-ruby:
-  enabled: true
-  config_file: .rubocop.yml