isodoc 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d98a917ee770ef1034262fa29628010e3254f3ddb5d8dfe63be54c57c3d58c0
-  data.tar.gz: 64b2107fddc44c0096653fc0319c7b0df81285327ab83600471b1b99971f3dbd
+  metadata.gz: 6867b3f44bce43fcfbd4c65115b8b71b6eb38cb7b1e39c20215addc7af8ad086
+  data.tar.gz: f335e4aecc20758c7c9810083d7da486ec73e0db4c377b9528841b46166085de
 SHA512:
-  metadata.gz: 1b1ac5b466169fd9f2698b79617ef4d2c6dd9dbf35b0cca715102ddddfcb2a0013be3bd02153263da42a7f3cde0150ccffa4f3e16e7b750dd0f73be23420e4b1
-  data.tar.gz: 26338d106c6e1cb5133c305c97ec5a8bb1c75292120ce2928efb93572ea6ff79b203eef4a6d73419d097cad76d6a0e22e71beac64a0f483dc09919e8d7d25e86
+  metadata.gz: 0bda93db557ef73dc1c5999bbd88d9ba06ac9977f48b93f4adca7aaac7e762d5b4fed0d62d8934151ce3ecf1becea0060d3fab65c92e2150a8a00a0c49895ee6
+  data.tar.gz: 1b0d780a2e450e8a22e8f6d4dcbcaa991e73bdcf1343ca3675c2e81b5f52688be7882f58762c18820fd2e99c4c37ea6043af8efc7f454ec44b553e00c3d356e3

data/lib/isodoc/function/section.rb

@@ -152,6 +152,7 @@ module IsoDoc
       end
 
       def table_of_contents(clause, out)
+        @bare and return
         page_break(out)
         out.div **attr_code(preface_attrs(clause)) do |div|
           clause_name(clause, clause.at(ns("./title")), div,
@@ -194,32 +195,28 @@ module IsoDoc
       end
 
       def copyright_parse(node, out)
-        return if @bare
-
+        @bare and return
         out.div class: "boilerplate-copyright" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end
 
       def license_parse(node, out)
-        return if @bare
-
+        @bare and return
         out.div class: "boilerplate-license" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end
 
       def legal_parse(node, out)
-        return if @bare
-
+        @bare and return
         out.div class: "boilerplate-legal" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end
 
       def feedback_parse(node, out)
-        return if @bare
-
+        @bare and return
         out.div class: "boilerplate-feedback" do |div|
           node.children.each { |n| parse(n, div) }
         end

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -40,8 +40,10 @@ module IsoDoc
       end
 
       def html_preface(docxml)
-        html_cover(docxml) if @htmlcoverpage && !@bare
-        html_intro(docxml) if @htmlintropage && !@bare
+        @htmlcoverpage && !@htmlcoverpage.empty? && !@bare and
+          html_cover(docxml)
+        @htmlintropage && !@htmlintropage.empty? && !@bare and
+          html_intro(docxml)
         docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
         html_main(docxml)
         authority_cleanup(docxml)

data/lib/isodoc/presentation_function/refs.rb

@@ -102,9 +102,14 @@ module IsoDoc
     end
 
     def bibliography_bibitem_number_insert_pt(bibitem)
-      unless ins = bibitem.at(ns(".//docidentifier")).previous_element
-        bibitem.at(ns(".//docidentifier")).previous = " "
-        ins = bibitem.at(ns(".//docidentifier")).previous
+      unless d = bibitem.at(ns(".//docidentifier"))
+        d = bibitem.children.first
+        d.previous = " "
+        return d.previous
+      end
+      unless ins = d.previous_element
+        d.previous = " "
+        ins = d.previous
       end
       ins
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.10.0".freeze
+  VERSION = "2.10.1".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -64,10 +64,16 @@ module IsoDoc
         word_tab_clean(docxml)
         authority_cleanup(docxml)
         word_footnote_format(docxml)
+        word_remove_empty_toc(docxml)
         word_remove_empty_sections(docxml)
         docxml
       end
 
+      def word_remove_empty_toc(docxml)
+        docxml.at("//div[@class = 'TOC']//p[@class = 'MsoToc1']") and return
+        remove_toc_div(docxml)
+      end
+
       def word_sourcecode_annotations(html)
         ann = ".//div[@class = 'annotation']"
         html.xpath("//p[@class = '#{sourcecode_style}'][#{ann}]")

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -2,8 +2,10 @@ module IsoDoc
   module WordFunction
     module Postprocess
       def word_preface(docxml)
-        word_cover(docxml) if @wordcoverpage
-        word_intro(docxml, @wordToClevels) if @wordintropage
+        @wordcoverpage && !@wordcoverpage.empty? and
+          word_cover(docxml)
+        @wordintropage && !@wordintropage.empty? and
+          word_intro(docxml, @wordToClevels)
       end
 
       def word_remove_empty_sections(docxml)

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -4,11 +4,7 @@ module IsoDoc
       def insert_toc(intro, docxml, level)
         toc = assemble_toc(docxml, level)
         if intro&.include?("WORDTOC")
-          if s = docxml.at("//div[@class = 'TOC']")
-            s&.previous_element&.elements&.first&.name == "br" and
-              s&.previous_element&.remove # page break
-            s.remove
-          end
+          remove_toc_div(docxml)
           intro.sub("WORDTOC", toc)
         else
           source = docxml.at("//div[@class = 'TOC']") and
@@ -17,6 +13,14 @@ module IsoDoc
         end
       end
 
+      def remove_toc_div(docxml)
+        s = docxml.at("//div[@class = 'TOC']") or return
+        prev = s.previous_element
+        prev&.elements&.first&.name == "br" and
+          prev&.remove # page break
+        s.remove
+      end
+
       def assemble_toc(docxml, level)
         toc = ""
         toc += make_WordToC(docxml, level)

data/lib/isodoc/xref/clause_order.rb

@@ -0,0 +1,41 @@
+module IsoDoc
+  module XrefGen
+    module Sections
+      def clause_order(docxml)
+        { preface: clause_order_preface(docxml),
+          main: clause_order_main(docxml),
+          annex: clause_order_annex(docxml),
+          back: clause_order_back(docxml) }
+      end
+
+      def clause_order_preface(_docxml)
+        [{ path: "//preface/*", multi: true }]
+      end
+
+      def clause_order_main(docxml)
+        [
+          { path: "//sections/clause[@type = 'scope']" },
+          { path: @klass.norm_ref_xpath },
+          { path: "//sections/terms | " \
+            "//sections/clause[descendant::terms]" },
+          { path: "//sections/definitions | " \
+            "//sections/clause[descendant::definitions]" \
+            "[not(descendant::terms)]" },
+          { path: @klass.middle_clause(docxml), multi: true },
+        ]
+      end
+
+      def clause_order_annex(_docxml)
+        [{ path: "//annex", multi: true }]
+      end
+
+      def clause_order_back(_docxml)
+        [
+          { path: @klass.bibliography_xpath },
+          { path: "//indexsect", multi: true },
+          { path: "//colophon/*", multi: true },
+        ]
+      end
+    end
+  end
+end

data/lib/isodoc/xref/xref_counter.rb

@@ -139,7 +139,7 @@ module IsoDoc
       end
 
       def increment(node)
-        @unnumbered = (node["unnumbered"] || node["hidden"]) and return self
+        @unnumbered = node["unnumbered"] == "true" || node["hidden"] == "true" and return self
         reset_overrides
         if node["subsequence"] != @subseq &&
             !(blank?(node["subsequence"]) && blank?(@subseq))

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,42 +1,8 @@
+require_relative "clause_order"
+
 module IsoDoc
   module XrefGen
     module Sections
-      def clause_order(docxml)
-        { preface: clause_order_preface(docxml),
-          main: clause_order_main(docxml),
-          annex: clause_order_annex(docxml),
-          back: clause_order_back(docxml) }
-      end
-
-      def clause_order_preface(_docxml)
-        [{ path: "//preface/*", multi: true }]
-      end
-
-      def clause_order_main(docxml)
-        [
-          { path: "//sections/clause[@type = 'scope']" },
-          { path: @klass.norm_ref_xpath },
-          { path: "//sections/terms | " \
-            "//sections/clause[descendant::terms]" },
-          { path: "//sections/definitions | " \
-            "//sections/clause[descendant::definitions]" \
-            "[not(descendant::terms)]" },
-          { path: @klass.middle_clause(docxml), multi: true },
-        ]
-      end
-
-      def clause_order_annex(_docxml)
-        [{ path: "//annex", multi: true }]
-      end
-
-      def clause_order_back(_docxml)
-        [
-          { path: @klass.bibliography_xpath },
-          { path: "//indexsect", multi: true },
-          { path: "//colophon/*", multi: true },
-        ]
-      end
-
       def back_anchor_names(xml)
         if @parse_settings.empty? || @parse_settings[:clauses]
           annex_anchor_names(xml)
@@ -173,7 +139,7 @@ module IsoDoc
       end
 
       def section_names(clause, num, lvl)
-        clause.nil? and return num
+        unnumbered_section_name?(clause) and return num
         num.increment(clause)
         section_name_anchors(clause, num.print, lvl)
         clause.xpath(ns(SUBCLAUSES))
@@ -184,6 +150,7 @@ module IsoDoc
       end
 
       def section_names1(clause, num, level)
+        unnumbered_section_name?(clause) and return num
         section_name_anchors(clause, num, level)
         i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns(SUBCLAUSES)).each do |c|
@@ -191,6 +158,15 @@ module IsoDoc
         end
       end
 
+      def unnumbered_section_name?(clause)
+        clause.nil? and return true
+        if clause["unnumbered"] == "true"
+          unnumbered_names(clause)
+          return true
+        end
+        false
+      end
+
       def section_name_anchors(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, xref: l10n("#{@labels['clause']} #{num}"),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -392,6 +392,7 @@ files:
 - lib/isodoc/word_function/postprocess_toc.rb
 - lib/isodoc/word_function/table.rb
 - lib/isodoc/xref.rb
+- lib/isodoc/xref/clause_order.rb
 - lib/isodoc/xref/xref_anchor.rb
 - lib/isodoc/xref/xref_counter.rb
 - lib/isodoc/xref/xref_gen.rb