metanorma-un 0.8.8 → 0.9.2

data/lib/isodoc/un/word_convert.rb

@@ -16,19 +16,25 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
-                     '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
-                       '"Times New Roman",serif'),
-                       monospacefont: '"Courier New",monospace',
-                       normalfontsize: "10.5pt",
-                       monospacefontsize: "10.0pt",
-                       smallerfontsize: "10.0pt",
-                       footnotefontsize: "9.0pt",
+          bodyfont: (if options[:script] == "Hans"
+                       '"Source Han Sans",serif'
+                     else
+                       '"Times New Roman",serif'
+                     end),
+          headerfont: (if options[:script] == "Hans"
+                         '"Source Han Sans",sans-serif'
+                       else
+                         '"Times New Roman",serif'
+                       end),
+          monospacefont: '"Courier New",monospace',
+          normalfontsize: "10.5pt",
+          monospacefontsize: "10.0pt",
+          smallerfontsize: "10.0pt",
+          footnotefontsize: "9.0pt",
         }
       end
 
-      def default_file_locations(options)
+      def default_file_locations(_options)
         {
           wordstylesheet: html_doc_path("wordstyle.scss"),
           standardstylesheet: html_doc_path("unece.scss"),
@@ -40,11 +46,11 @@ module IsoDoc
         }
       end
 
-      def footnotes(div)
+      def footnotes(_div)
         if @meta.get[:item_footnote]
           fn = noko do |xml|
-            xml.aside **{ id: "ftnitem" } do |div|
-              div.p @meta.get[:item_footnote]
+            xml.aside **{ id: "ftnitem" } do |d|
+              d.p @meta.get[:item_footnote]
             end
           end.join("\n")
           @footnotes.unshift fn
@@ -77,18 +83,18 @@ module IsoDoc
           introduction docxml, div2
           preface docxml, div2
           acknowledgements docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
+          div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
       ENDLINE = <<~END.freeze
-      <v:line 
- alt="" style='position:absolute;left:0;text-align:left;z-index:251662848;
- mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
- mso-width-percent:0;mso-height-percent:0'
- from="6.375cm,20.95pt" to="10.625cm,20.95pt"
- strokeweight="1.5pt"/>
+             <v:line
+        alt="" style='position:absolute;left:0;text-align:left;z-index:251662848;
+        mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
+        mso-width-percent:0;mso-height-percent:0'
+        from="6.375cm,20.95pt" to="10.625cm,20.95pt"
+        strokeweight="1.5pt"/>
       END
 
       def end_line(_isoxml, out)
@@ -138,7 +144,7 @@ module IsoDoc
         abstract.parent = (abstractbox || preface_container) if abstract &&
           (abstractbox || preface_container)
         abstractbox and abstract&.xpath(".//p/br")&.each do |a|
-          a.parent.remove if /page-break-before:always/.match(a["style"])
+          a.parent.remove if /page-break-before:always/.match?(a["style"])
         end
         docxml&.at("//p[@class = 'AbstractTitle']")&.remove if abstractbox
         foreword.parent = preface_container if foreword && preface_container

data/lib/isodoc/un/xref.rb

@@ -4,21 +4,25 @@ module IsoDoc
   module UN
     class Xref < IsoDoc::Xref
       def initial_anchor_names(doc)
-        preface_names(doc.at(ns("//preface/abstract")))
-        preface_names(doc.at(ns("//foreword")))
-        preface_names(doc.at(ns("//introduction")))
-        doc.xpath(ns("//preface/clause")).each do |c|
-          preface_names(c)
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          preface_names(doc.at(ns("//preface/abstract")))
+          preface_names(doc.at(ns("//foreword")))
+          preface_names(doc.at(ns("//introduction")))
+          doc.xpath(ns("//preface/clause")).each do |c|
+            preface_names(c)
+          end
+          preface_names(doc.at(ns("//acknowledgements")))
+          clause_names(doc, 0)
+        end
+        if @parse_settings.empty?
+          sequential_asset_names(
+            doc.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+                         "//preface/clause | //acknowledgements")),
+          )
+          middle_section_asset_names(doc)
+          termnote_anchor_names(doc)
+          termexample_anchor_names(doc)
         end
-        preface_names(doc.at(ns("//acknowledgements")))
-        sequential_asset_names(
-          doc.xpath(ns("//preface/abstract | //foreword | //introduction | "\
-                       "//preface/clause | //acknowledgements")),
-        )
-        middle_section_asset_names(doc)
-        clause_names(doc, 0)
-        termnote_anchor_names(doc)
-        termexample_anchor_names(doc)
       end
 
       def clause_names(docxml, _sect_num)
@@ -122,8 +126,9 @@ module IsoDoc
         leaf_section?(clause) and
           label_annex_leaf_section(clause, num, 1) and return
         @anchors[clause["id"]] = annex_name_anchors(clause, num)
-        if a = single_annex_special_section(clause)
-          annex_names1(a, num.to_s, 1)
+        if @klass.single_term_clause?(clause)
+          annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
+                       num.to_s, 1)
         else
           i = 1
           clause.xpath(ns(SUBCLAUSES)).each do |c|

data/lib/metanorma/un/biblio.rng

@@ -614,12 +614,12 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -851,17 +851,46 @@
   </define>
   <define name="bplace">
     <element name="place">
-      <optional>
-        <attribute name="uri">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="region"/>
-      </optional>
+      <choice>
+        <text/>
+        <group>
+          <ref name="bibliocity"/>
+          <zeroOrMore>
+            <ref name="biblioregion"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="bibliocountry"/>
+          </zeroOrMore>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="bibliocity">
+    <element name="city">
       <text/>
     </element>
   </define>
+  <define name="biblioregion">
+    <element name="region">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="bibliocountry">
+    <element name="country">
+      <ref name="RegionType"/>
+    </element>
+  </define>
+  <define name="RegionType">
+    <optional>
+      <attribute name="iso"/>
+    </optional>
+    <optional>
+      <attribute name="recommended">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <text/>
+  </define>
   <define name="bprice">
     <element name="price">
       <attribute name="currency"/>
@@ -957,36 +986,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">

data/lib/metanorma/un/converter.rb

@@ -126,13 +126,13 @@ module Metanorma
       end
 
       def outputs(node, ret)
-        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
-        presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml",
+        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert("#{@filename}.xml")
+        html_converter(node).convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml",
+        doc_converter(node).convert("#{@filename}.presentation.xml",
                                     nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml",
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
                                      nil, false, "#{@filename}.pdf")
       end
 

data/lib/metanorma/un/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="admonition">
+      <element name="admonition">
+        <attribute name="type">
+          <ref name="AdmonitionType"/>
+        </attribute>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="uri">
+            <data type="anyURI"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -245,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -287,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -323,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -851,6 +897,16 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -1178,6 +1234,7 @@
       <ref name="concept"/>
       <ref name="add"/>
       <ref name="del"/>
+      <ref name="span"/>
     </choice>
   </define>
   <define name="add">
@@ -1204,6 +1261,14 @@
       </choice>
     </element>
   </define>
+  <define name="span">
+    <element name="span">
+      <attribute name="class"/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/metanorma/un/un.rng

@@ -48,6 +48,16 @@
             <value>safety precautions</value>
           </choice>
         </attribute>
+        <optional>
+          <attribute name="coverpage">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="notag">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.8.8".freeze
+    VERSION = "0.9.2".freeze
   end
 end

data/metanorma-unece.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roman-numerals"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_dependency "metanorma-standoc", "~> 2.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -291,7 +291,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: Metanorma for UN.