isodoc 2.1.2.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 415f9833363761b737893c9c03f3d71c1b765ff06500f16223f12a7dbac27152
-  data.tar.gz: dda95049642e7d2743552b4e5249dddeab5a748e6314771ed09c8b2429e02b56
+  metadata.gz: 3bf48bda8bc7d17d20a766f93c30bcf9f6e7e597497f8663f2c96ff292ada4f5
+  data.tar.gz: 7efd7f5c3aff9ee37fc631eecd1a564213ab56f92780807d1dff2b17e05c402b
 SHA512:
-  metadata.gz: ac02cacff1a871b347de4b8d5726fcb888d8887923e002f1615dd446203c42d42d66a252caedd48111058f8389d50eec7fc0ca49ce7701fc5a14cac4edcaaad2
-  data.tar.gz: e4e62b67708eddf8d38fa2d19e2df91877a5647d6b5b84251f6de85105ed7c44db835c74ffef7e50b6834f1bc411efa7f5cddab0d731b067772198cdaa7e74f3
+  metadata.gz: 449d645dc7a4caaf2cd778dedfa4bb995344c3c83b076abbe4ea971b32d6fc9515ee7ae1140d76dfbc5f2c01220513979ea239c095fc2037b84263996a728e4f
+  data.tar.gz: 2031af0175ba1ba995fe3cca887180fa0e0d097dcfd6e2afb51eb7dc60ad8934bfbf4fc17dd9f91f1f2fba8e63e46efd8cee7a2fb2e9693d3f3f804ef432f662

data/lib/isodoc/class_utils.rb

@@ -62,5 +62,21 @@ module IsoDoc
       end
       xml.root.children.to_xml
     end
+
+    def nearest_block_parent(node)
+      until %w(p title td th name formula li dt dd sourcecode pre quote
+               note example)
+          .include?(node.name)
+        node = node.parent
+      end
+      node
+    end
+
+    # node is at the start of sentence in a Metanorma XML context
+    def start_of_sentence(node)
+      prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
+        node.xpath("./preceding::text()")
+      prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map(&:text).join)
+    end
   end
 end

data/lib/isodoc/function/utils.rb

@@ -11,6 +11,10 @@ module IsoDoc
         self.class.ns(xpath)
       end
 
+      def start_of_sentence(node)
+        self.class.start_of_sentence(node)
+      end
+
       def insert_tab(out, count)
         tab = %w(Hans Hant).include?(@script) ? "　" : "  "
         [1..count].each { out << tab }

data/lib/isodoc/presentation_function/block.rb

@@ -8,6 +8,10 @@ module IsoDoc
       text.capitalize
     end
 
+    def block_delim
+      " — "
+    end
+
     def prefix_name(node, delim, number, elem)
       return if number.nil? || number.empty?
 
@@ -31,7 +35,7 @@ module IsoDoc
       return if labelled_ancestor(elem)
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, " — ",
+      prefix_name(elem, block_delim,
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
@@ -60,7 +64,7 @@ module IsoDoc
             else
               l10n("#{@i18n.example} #{n[:label]}")
             end
-      prefix_name(elem, " — ", lbl, "name")
+      prefix_name(elem, block_delim, lbl, "name")
     end
 
     def note(docxml)
@@ -130,7 +134,7 @@ module IsoDoc
       return if elem["unnumbered"] && !elem.at(ns("./name"))
 
       n = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, " — ", l10n("#{lower2cap @i18n.table} #{n}"),
+      prefix_name(elem, block_delim, l10n("#{lower2cap @i18n.table} #{n}"),
                   "name")
     end
 

data/lib/isodoc/presentation_function/image.rb

@@ -32,7 +32,7 @@ module IsoDoc
       return if elem.at(ns("./figure")) && !elem.at(ns("./name"))
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, " — ",
+      prefix_name(elem, block_delim,
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -3,14 +3,6 @@ require_relative "xrefs"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def nearest_block_parent(node)
-      until %w(p title td th name formula li dt dd sourcecode pre)
-          .include?(node.name)
-        node = node.parent
-      end
-      node
-    end
-
     def non_locality_elems(node)
       node.children.reject do |c|
         %w{locality localityStack location}.include? c.name

data/lib/isodoc/presentation_function/section.rb

@@ -177,7 +177,7 @@ module IsoDoc
 
     def toc(docxml)
       docxml.xpath(ns("//toc//xref[text()]")).each do |x|
-        lbl = @xrefs.get[x["target"]][:label] or next
+        lbl = @xrefs.anchor(x["target"], :label) or next
         x.children.first.previous = "#{lbl}<tab/>"
       end
     end

data/lib/isodoc/presentation_function/xrefs.rb

@@ -105,9 +105,7 @@ module IsoDoc
     end
 
     def capitalise_xref1(node, linkend)
-      prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
-        node.xpath("./preceding::text()")
-      if prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map(&:text).join)
+      if start_of_sentence(node)
         Common::case_with_markup(linkend, "capital", @script)
       else linkend
       end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.1.2.1".freeze
+  VERSION = "2.1.3".freeze
 end

data/lib/isodoc/word_function/inline.rb

@@ -1,9 +1,14 @@
 module IsoDoc
   module WordFunction
     module Body
-      def section_break(body)
+      def section_break(body, continuous: false)
         body.p do |p|
-          p.br **{ clear: "all", class: "section" }
+          if continuous
+            p.br **{ clear: "all", style: "page-break-before:auto;"\
+                                          "mso-break-type:section-break" }
+          else
+            p.br **{ clear: "all", class: "section" }
+          end
         end
       end
 

data/lib/isodoc/xref.rb

@@ -52,7 +52,7 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
-      amend_preprocess(docxml) if  @parse_settings.empty?
+      amend_preprocess(docxml) if @parse_settings.empty?
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note (ISO default)

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -132,6 +132,7 @@ relatedterms:
   contrast: مضاد
   # تباين
   see: انظر
+  seealso: انظر أيضا
 inflection:
   فقرة:
     sg: فقرة

data/lib/isodoc-yaml/i18n-de.yaml

@@ -138,6 +138,7 @@ relatedterms:
   compare: vergleiche
   contrast: dagegen
   see: siehe
+  seealso: siehe auch
 inflection:
   Klausel:
     sg: Klausel

data/lib/isodoc-yaml/i18n-en.yaml

@@ -138,6 +138,7 @@ relatedterms:
   compare: compare
   contrast: contrast
   see: see
+  seealso: see also
 inflection:
   Clause:
     sg: Clause

data/lib/isodoc-yaml/i18n-es.yaml

@@ -138,6 +138,7 @@ relatedterms:
   compare: relacionado
   contrast: difiere
   see: véase
+  seealso: véase tambien
 inflection:
   Cláusula:
     sg: Cláusula

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -136,6 +136,7 @@ relatedterms:
   compare: comparez
   contrast: contrastez
   see: voir
+  seealso: voir aussi
 inflection:
   Clause:
     sg: Article

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -143,6 +143,7 @@ relatedterms:
   compare: наравне
   contrast: противоположный
   see: см.
+  seealso: см. также
 inflection:
   Пункт:
     sg: Пункт

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -132,4 +132,5 @@ relatedterms:
   compare: 比较
   contrast: 对比
   see: 见
+  seealso: 参见
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.1.2.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -504,7 +504,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.