isodoc 2.12.0 → 2.12.1

data/lib/isodoc/presentation_xml_convert.rb

@@ -55,9 +55,10 @@ module IsoDoc
       # feeds middle_title
       # triggers xrefs reparse, so put references before all other sections,
       # which alter titles and thus can alter xrefs
-      rearrange_clauses docxml # feeds toc, display_order, clausetitle, 
+      rearrange_clauses docxml # feeds toc, display_order, clausetitle,
       # clause, middle_title
       middle_title docxml
+      missing_title docxml # feeds clause
       annex docxml
       clause docxml # feeds clausetitle
       term docxml
@@ -79,6 +80,8 @@ module IsoDoc
       admonition docxml
       source docxml
       ol docxml
+      dl docxml
+      quote docxml
       permission docxml
       requirement docxml
       recommendation docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.12.0".freeze
+  VERSION = "2.12.1".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -111,7 +111,7 @@ module IsoDoc
           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) }
+        node.element_children[1..].each { |n| parse(n, div) }
       end
 
       def note_parse1(node, div)
@@ -131,7 +131,7 @@ module IsoDoc
           div.p class: "Note" do |p|
             if name
               name.children.each { |n| parse(n, p) }
-              p << termnote_delim
+              p << " "
             end
             para_then_remainder(node.first_element_child, node, p, div)
           end
@@ -165,7 +165,7 @@ module IsoDoc
             parse(node.at(ns("./stem")), div)
             insert_tab(div, 1)
             if lbl = node&.at(ns("./name"))&.text
-              div << "(#{lbl})"
+              div << lbl
             end
           end
         end

data/lib/isodoc/xref/clause_order.rb

@@ -17,10 +17,10 @@ module IsoDoc
           { path: "//sections/clause[@type = 'scope']" },
           { path: @klass.norm_ref_xpath },
           { path: "//sections/terms | " \
-            "//sections/clause[descendant::terms]" },
+            "//sections/clause[descendant::terms]", multi: true },
           { path: "//sections/definitions | " \
             "//sections/clause[descendant::definitions]" \
-            "[not(descendant::terms)]" },
+            "[not(descendant::terms)]", multi: true },
           { path: @klass.middle_clause(docxml), multi: true },
         ]
       end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -8,9 +8,6 @@ module IsoDoc
           annex_anchor_names(xml)
           back_clauses_anchor_names(xml)
         end
-        if @klass.bibrender && (@parse_settings.empty? || @parse_settings[:refs])
-          references(xml)
-        end
       end
 
       def annex_anchor_names(xml)
@@ -33,11 +30,7 @@ module IsoDoc
         end
       end
 
-      def references(docxml)
-        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-          reference_names(ref)
-        end
-      end
+      # NOTE: references processing has moved to Presentation XML
 
       def initial_anchor_names(xml)
         if @parse_settings.empty? || @parse_settings[:clauses]
@@ -83,8 +76,9 @@ module IsoDoc
 
       def clause_title(clause, use_elem_name: false)
         ret = clause.at(ns("./title"))&.text
-        if use_elem_name && !ret
-          clause.name.capitalize
+        if use_elem_name && ret.blank?
+          @i18n.labels[clause.name]&.capitalize ||
+            clause.name.capitalize
         else ret
         end
       end
@@ -107,11 +101,11 @@ module IsoDoc
 
       def unnumbered_names(clause)
         clause.nil? and return
-        preface_name_anchors(clause, 1,
-                             clause_title(clause, use_elem_name: true))
+        title = clause_title(clause, use_elem_name: true)
+        preface_name_anchors(clause, 1, title)
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names1(c, c.at(ns("./title"))&.text,
-                         "#{clause_title(clause)}, #{i + 1}", 2)
+                         "#{title}, #{i + 1}", 2)
         end
       end
 
@@ -217,15 +211,6 @@ module IsoDoc
           annex_names1(c, i.increment(c).print, level + 1)
         end
       end
-
-      def reference_names(ref)
-        ids = @klass.bibitem_ref_code(ref)
-        identifiers = @klass.render_identifier(ids)
-        reference = @klass
-          .docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
-                      identifiers[:ordinal] || identifiers[:doi])
-        @anchors[ref["id"]] = { xref: reference }
-      end
     end
   end
 end

data/lib/isodoc/xref/xref_util.rb

@@ -6,6 +6,12 @@ module Enumerable
   end
 end
 
+class Object
+  def blank?
+    nil? || empty?
+  end
+end
+
 module IsoDoc
   module XrefGen
     module Blocks

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.08'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.08'
 - !ruby/object:Gem::Dependency
   name: mn-requirements
   requirement: !ruby/object:Gem::Requirement
@@ -421,6 +421,7 @@ files:
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
 - lib/isodoc/presentation_function/concepts.rb
+- lib/isodoc/presentation_function/docid.rb
 - lib/isodoc/presentation_function/erefs.rb
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb