metanorma-iso 2.2.3 → 2.3.0

data/lib/isodoc/iso/isosts_convert.rb

@@ -13,14 +13,19 @@ module IsoDoc
         @suffix = "isosts.xml"
       end
 
-      def convert(input_fname, file = nil, debug = false, output_fname = nil)
-        file = File.read(input_fname, encoding: "utf-8") if file.nil?
-        _, fname, dir = convert_init(file, input_fname, debug)
+      def get_input_fname(input_fname)
         /\.xml$/.match(input_fname) or
           input_fname = Tempfile.open([fname, ".xml"], encoding: "utf-8") do |f|
             f.write file
             f.path
           end
+        input_fname
+      end
+
+      def convert(input_fname, file = nil, debug = false, output_fname = nil)
+        file = File.read(input_fname, encoding: "utf-8") if file.nil?
+        _, fname, dir = convert_init(file, input_fname, debug)
+        input_fname = get_input_fname(input_fname)
         FileUtils.rm_rf dir
         MnConvert.convert(input_fname,
                           {

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -101,7 +101,7 @@ module IsoDoc
       end
 
       def concept_term1(node, seen)
-        term = node&.at(ns("./refterm"))&.to_xml
+        term = to_xml(node.at(ns("./refterm")))
         if term && seen[term]
           concept_render(node, ital: "false", ref: "false",
                                linkref: "true", linkmention: "false")
@@ -114,8 +114,8 @@ module IsoDoc
 
       def concept1_ref_content(ref)
         repl = if ref.name == "termref"
-                 @i18n.term_defined_in.sub(/%/, ref.to_xml)
-               else "(#{ref.to_xml})"
+                 @i18n.term_defined_in.sub(/%/, to_xml(ref))
+               else "(#{to_xml(ref)})"
                end
         ref.replace(repl)
       end
@@ -152,7 +152,7 @@ module IsoDoc
           (v = elem.at(ns("./definition/verbal-definition"))) &&
           v.elements.first.name == "p") or return
         v.elements.first.children.first.previous =
-          "<#{d.remove.children.to_xml}> "
+          "<#{to_xml(d.remove.children)}> "
       end
 
       def insertall_after_here(node, insert, name)
@@ -186,7 +186,7 @@ module IsoDoc
         p = n.next_element
         return unless p.name == "p"
 
-        p.children.first.previous = admonition_name(n.remove.children.to_xml)
+        p.children.first.previous = admonition_name(to_xml(n.remove.children))
       end
 
       def admonition_name(xml)

data/lib/isodoc/iso/presentation_xref.rb

@@ -33,9 +33,10 @@ module IsoDoc
         ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
                                                             node))
         node["droploc"] = droploc
-        eref_localities1(target,
-                         prefix_clause(target, refs.first.at(ns("./locality"))),
-                         l10n(ret[1..-1].join), nil, node, @lang)
+        eref_localities1({ target: target, number: "pl",
+                           type: prefix_clause(target, refs.first.at(ns("./locality"))),
+                           from: l10n(ret[1..-1].join),
+                           node: node, lang: @lang })
       end
 
       def prefix_clause(target, loc)
@@ -79,29 +80,30 @@ module IsoDoc
         ret.join
       end
 
-      def eref_localities1_zh(target, type, from, upto, node)
-        ret = " 第#{from}" if from
-        ret += "–#{upto}" if upto
-        node["droploc"] != "true" && !subclause?(target, type, from) and
-          ret += eref_locality_populate(type, node)
-        ret += ")" if type == "list"
-        locality_span_wrap(ret, type)
+      def eref_localities1_zh(opt)
+        ret = " 第#{opt[:from]}" if opt[:from]
+        ret += "–#{opt[:upto]}" if opt[:upto]
+        opt[:node]["droploc"] != "true" &&
+          !subclause?(opt[:target], opt[:type], opt[:from]) and
+          ret += eref_locality_populate(opt[:type], opt[:node], "sg")
+        ret += ")" if opt[:type] == "list"
+        locality_span_wrap(ret, opt[:type])
       end
 
-      def eref_localities1(target, type, from, upto, node, lang = "en")
-        return nil if type == "anchor"
+      def eref_localities1(opt)
+        return nil if opt[:type] == "anchor"
 
-        type = type.downcase
-        lang == "zh" and
-          return l10n(eref_localities1_zh(target, type, from, upto, node))
+        opt[:type] = opt[:type].downcase
+        opt[:lang] == "zh" and return l10n(eref_localities1_zh(opt))
         ret = ""
-        node["droploc"] != "true" && !subclause?(target, type, from) and
-          ret = eref_locality_populate(type, node)
-        ret += " #{from}" if from
-        ret += "–#{upto}" if upto
-        ret += ")" if type == "list"
+        opt[:node]["droploc"] != "true" &&
+          !subclause?(opt[:target], opt[:type], opt[:from]) and
+          ret = eref_locality_populate(opt[:type], opt[:node], opt[:number])
+        ret += " #{opt[:from]}" if opt[:from]
+        ret += "–#{opt[:upto]}" if opt[:upto]
+        ret += ")" if opt[:type] == "list"
         ret = l10n(ret)
-        locality_span_wrap(ret, type)
+        locality_span_wrap(ret, opt[:type])
       end
 
       def prefix_container(container, linkend, node, target)

data/lib/isodoc/iso/word_convert.rb

@@ -101,7 +101,7 @@ module IsoDoc
 
       def footnote_reference_format(link)
         link.children =
-          "<span class='MsoFootnoteReference'>#{link.children.to_xml}</span>)"
+          "<span class='MsoFootnoteReference'>#{to_xml(link.children)}</span>)"
       end
 
       def bibliography_attrs

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -10,7 +10,7 @@ module IsoDoc
         admonition: "Admonition",
         admonitiontitle: "AdmonitionTitle",
         sourcetitle: "SourceTitle",
-        tabletitle: "TableTitle",
+        TableTitle: "Tabletitle",
         titlepagesbhead: "TablePageSubhead",
         NormRef: "RefNorm",
         Biblio: "BiblioEntry",
@@ -205,7 +205,7 @@ module IsoDoc
         docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
           p["class"] = "zzCopyright"
           p["style"] = "text-indent:20.15pt;"
-          p.replace(p.to_xml.gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
+          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright' " \
                                              "style='text-indent:20.15pt;'>"))
         end
         docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
@@ -217,7 +217,7 @@ module IsoDoc
       def copyright_dis(docxml)
         docxml.xpath("//p[@id = 'boilerplate-address']")&.each do |p|
           p["class"] = "zzCopyright"
-          p.replace(p.to_xml.gsub(%r{<br/>}, "</p>\n<p class='zzCopyright'>"))
+          p.replace(to_xml(p).gsub(%r{<br/>}, "</p>\n<p class='zzCopyright'>"))
         end
         docxml.xpath("//p[@class = 'zzCopyrightHdr']")&.each do |p|
           p.remove
@@ -235,17 +235,18 @@ module IsoDoc
           if t.at("./p |./div")
             t.xpath("./p | ./div").each { |p| p["class"] = s }
           else
-            t.children = "<div class='#{s}'>#{t.children.to_xml}</div>"
+            t.children = "<div class='#{s}'>#{to_xml(t.children)}</div>"
           end
         end
       end
 
-      def make_FigureWordToC(docxml)
-        super.sub(/FigureTitle,figuretitle/, "Figure title,Annex Figure Title")
+      def table_toc_class
+        ["Table title", "Tabletitle", "Annex Table Title", "AnnexTableTitle"] +
+          super
       end
 
-      def make_TableWordToC(docxml)
-        super.sub(/TableTitle,tabletitle/, "Table title,Annex Table Title")
+      def figure_toc_class
+        ["Figure Title", "Annex Figure Title", "AnnexFigureTitle"] + super
       end
     end
   end

data/lib/isodoc/iso/word_dis_convert.rb

@@ -44,7 +44,7 @@ module IsoDoc
       end
 
       def table_title_attrs(_node)
-        { class: "Tabletitle", style: "text-align:center;" }
+        { class: "TableTitle", style: "text-align:center;" }
       end
 
       def span_parse(node, out)

data/lib/isodoc/iso/xref.rb

@@ -43,7 +43,7 @@ module IsoDoc
           n = Counter.new
           n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
           n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-          doc.xpath(ns("//sections/clause[not(@type = 'scope')] | "\
+          doc.xpath(ns("//sections/clause[not(@type = 'scope')] | " \
                        "//sections/terms | //sections/definitions")).each do |c|
             n = section_names(c, n, 1)
           end
@@ -169,25 +169,28 @@ module IsoDoc
 
       def modspec_table_xrefs(clause)
         clause.xpath(ns(".//table[@class = 'modspec']")).noblank.each do |t|
-          (@anchors[t["id"]] && !@anchors[t["id"]][:modspec]) or next
           n = @anchors[t["id"]][:xref]
-          @anchors[t["id"]][:modspec] = true
-          @anchors[t["id"]][:xref] =
-            l10n("#{n}, #{@anchors_previous[t['id']][:xref_bare]}")
+          xref_to_modspec(t["id"], n) or next
           modspec_table_components_xrefs(t, n)
         end
       end
 
       def modspec_table_components_xrefs(table, table_label)
         table.xpath(ns(".//tr[@id]")).each do |tr|
-          (@anchors[tr["id"]] && !@anchors[tr["id"]][:modspec]) or next
-          @anchors[tr["id"]][:modspec] = true
-          @anchors[tr["id"]][:xref] =
-            l10n("#{table_label}, #{@anchors_previous[tr['id']][:xref]}")
+          xref_to_modspec(tr["id"], table_label) or next
           @anchors[tr["id"]].delete(:container)
         end
       end
 
+      def xref_to_modspec(id, table_label)
+        (@anchors[id] && !@anchors[id][:has_modspec]) or return
+        @anchors[id][:has_modspec] = true
+        x = @anchors_previous[id][:xref_bare] || @anchors_previous[id][:xref]
+        @anchors[id][:xref] = l10n("#{table_label}, #{x}")
+        @anchors[id][:modspec] = @anchors_previous[id][:modspec]
+        true
+      end
+
       def hierarchical_table_names(clause, _num)
         super
         modspec_table_xrefs(clause) if @anchors_previous

data/lib/metanorma/iso/basicdoc.rng

@@ -683,6 +683,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/iso/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/iso/isodoc.rng

@@ -1152,7 +1152,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="BibliographicItem"/>
+      <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
   <define name="image" combine="choice">
@@ -2653,6 +2653,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <value>modspec</value>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/iso/validate.rb

@@ -36,10 +36,10 @@ module Metanorma
             /\b(see| refer to)\s*\Z/mi.match(preceding)
 
           (target = root.at("//*[@id = '#{t['target']}']")) || next
-          if target.at("./ancestor-or-self::*[@obligation = 'normative']")
+          target.at("./ancestor-or-self::*[@obligation = 'normative']") &&
+            !target.at("./ancestor::sections") and
             @log.add("Style", t,
                      "'see #{t['target']}' is pointing to a normative section")
-          end
         end
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.2.3".freeze
+    VERSION = "2.3.0".freeze
   end
 end

data/lib/metanorma/requirements/modspec.rb

@@ -3,15 +3,6 @@ module Metanorma
     class Modspec
       # Don't want to inherit from Metanorma::Requirements::Modspec
       class Iso < ::Metanorma::Requirements::Modspec
-        def recommendation_label_xref(elem, label, xrefs, _type)
-          id = @reqtlabels[label]
-          number = xrefs.anchor(id, :xref_reqt2reqt, false)
-          number.nil? and return type
-          elem.ancestors("requirement, recommendation, permission").empty? and
-            return number
-          "<xref target='#{id}'>#{number}</xref>"
-        end
-
         def recommendation_label(elem, type, xrefs)
           lbl = super
           title = elem.at(ns("./title"))
@@ -55,55 +46,13 @@ module Metanorma
 
         def postprocess_anchor_struct(block, anchor)
           super
-          anchor[:xref_reqt2reqt] = anchor[:xref_bare]
+          anchor[:modspec] = anchor[:xref_bare]
           if l = block.at(ns("./title"))
-            anchor[:xref_reqt2reqt] =
-              l10n("#{anchor[:xref_reqt2reqt]}: #{l.children.to_xml.strip}")
+            anchor[:modspec] =
+              l10n("#{anchor[:modspec]}: #{l.children.to_xml.strip}")
           end
           anchor
         end
-
-        def reqt_ids(docxml)
-          docxml.xpath(ns("//requirement | //recommendation | //permission"))
-            .each_with_object({}) do |r, m|
-              id = r.at(ns("./identifier")) or next
-              m[id.text] =
-                { id: r["id"],
-                  lbl: @xrefs.anchor(r["id"], :xref_reqt2reqt, false) }
-            end
-        end
-
-        def reqt_links_test1(reqt, acc)
-          return unless %w(conformanceclass
-                           verification).include?(reqt["type"])
-
-          subj = reqt_extract_target(reqt)
-          id = reqt.at(ns("./identifier")) or return
-          lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref_reqt2reqt,
-                              false)
-          return unless subj
-
-          acc[subj.text] = { lbl: lbl, id: reqt["id"] }
-        end
-
-        def reqt_links_class(docxml)
-          docxml.xpath(ns("//requirement | //recommendation | //permission"))
-            .each_with_object({}) do |r, m|
-              next unless %w(class
-                             conformanceclass).include?(r["type"])
-
-              id = r.at(ns("./identifier")) or next
-              r.xpath(ns("./requirement | ./recommendation | ./permission"))
-                .each do |r1|
-                id1 = r1.at(ns("./identifier")) or next
-                lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id],
-                                    :xref_reqt2reqt, false)
-                next unless lbl
-
-                m[id1.text] = { lbl: lbl, id: r["id"] }
-              end
-            end
-        end
       end
     end
   end

data/metanorma-iso.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.3.0"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid-iso"
   spec.add_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-07 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -415,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: metanorma-iso lets you write ISO standards in AsciiDoc.