metanorma-un 0.10.13 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04e000256ab134b80a72f9a876d5b8b6864529306a476ceffd7c164dc4ba366e
-  data.tar.gz: b8191bfffd99a65df9d3b56ddc4bc2db5f3820530ae56637a1b7f32a58b5840e
+  metadata.gz: 633ea5daa3f540bef45566dd48c57acf9b736477bb2b4264faea2c30cab0c3b3
+  data.tar.gz: d1b1f2e6fc90eeb24bf51be943dc0cfcd1afa7730d0d37539b24d70bf297078e
 SHA512:
-  metadata.gz: b61fa9f4b6176a45223ad7b31ee0909be4dc08f6ad957eb6a7a1ebaeccc0768eb0b25bea1cd0594da11784f859d1c5f7d6ab425f8b05fd93dfd10b3f4ad20973
-  data.tar.gz: 48ab9f757cca73b72fb187fa8b9f23148b3aef42a492785e4042caf67d6ad96a804890e3b2f1f585fd2d4f4afd1f67caedf87b446ccd53ff6f2f979f6d14a1dd
+  metadata.gz: dd675bedc775517e9483799880bf57c31c967788938d62bbe32eb7a975837c973b1849e6f867841763b9e3f2027ad039fbb51981d729487087b3e654894c7a39
+  data.tar.gz: dac9c0da31d353fdc028dd018d6273e4506ebacd5223e212baa0b72c814f0a243cd7644099afbf2fba0ad9ed3ff3410026ff34c70c2e04c7a412ad51f25a567d

data/lib/isodoc/un/base_convert.rb

@@ -7,6 +7,15 @@ module IsoDoc
         "//clause[parent::sections]"
       end
 
+      def norm_ref_xpath
+        "//null"
+      end
+
+      def bibliography_xpath
+        "//bibliography/clause[.//references] | " \
+          "//bibliography/references"
+      end
+
       def admonition_parse(node, out)
         name = node.at(ns("./name"))
         out.div **admonition_attrs(node) do |t|
@@ -18,7 +27,7 @@ module IsoDoc
       end
 
       def inline_header_title(out, _node, title)
-        out.span **{ class: "zzMoveToFollowing" } do |s|
+        out.span class: "zzMoveToFollowing" do |s|
           title&.children&.each { |c2| parse(c2, s) }
           clausedelimspace(_node, out) if /\S/.match?(title&.text)
         end
@@ -32,6 +41,10 @@ module IsoDoc
         false
       end
 
+      def norm_ref(node, out)
+        bibliography(node, out)
+      end
+
       def convert_i18n_init1(docxml)
         super
         docxml.xpath(ns("//bibdata/language")).size > 1 and @lang = "en"

data/lib/isodoc/un/html_convert.rb

@@ -65,23 +65,6 @@ module IsoDoc
         end
       end
 
-      def make_body3(body, docxml)
-        body.div class: "main-section" do |div3|
-          boilerplate docxml, div3
-          front docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
-        end
-      end
-
-      def middle(isoxml, out)
-        middle_admonitions(isoxml, out)
-        clause isoxml, out
-        annex isoxml, out
-        bibliography isoxml, out
-      end
-
       def introduction(clause, out)
         page_break(out)
         out.div class: "Section3", id: clause["id"] do |div|

data/lib/isodoc/un/presentation_xml_convert.rb

@@ -9,6 +9,8 @@ module IsoDoc
         @toc = options[:toc]
       end
 
+      def middle_title(docxml); end
+
       def note1(elem)
         return if elem.parent.name == "bibitem"
         return if elem["type"] == "title-footnote"

data/lib/isodoc/un/un.plenary-attachment.xsl

@@ -4628,6 +4628,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -6719,25 +6722,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale * 0.985"/>%</xsl:attribute><!-- 0.985 due border around image -->
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale * 0.985"/>%</xsl:attribute><!-- 0.985 due border around image -->
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -10380,7 +10403,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/un/un.plenary.xsl

@@ -4628,6 +4628,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -6719,25 +6722,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale * 0.985"/>%</xsl:attribute><!-- 0.985 due border around image -->
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale * 0.985"/>%</xsl:attribute><!-- 0.985 due border around image -->
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -10380,7 +10403,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/un/un.recommendation.xsl

@@ -4755,6 +4755,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -6846,25 +6849,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -10508,7 +10531,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/un/word_convert.rb

@@ -73,34 +73,21 @@ module IsoDoc
         end
       end
 
-      def make_body2(body, docxml)
-        body.div class: "WordSection2" do |div2|
-          info docxml, div2
-          boilerplate docxml, div2
-          front docxml, div2
-          div2.p { |p| p << "&#xa0;" } # placeholder
-        end
-        section_break(body)
-      end
-
-      ENDLINE = <<~END.freeze
+      ENDLINE = <<~ENDLINE.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"/>
-      END
+      ENDLINE
 
       def end_line(_isoxml, out)
         out.parent.add_child(ENDLINE)
       end
 
-      def middle(isoxml, out)
-        middle_admonitions(isoxml, out)
-        clause isoxml, out
-        annex isoxml, out
-        bibliography isoxml, out
+      def make_body3(out, isoxml)
+        super
         end_line(isoxml, out)
       end
 
@@ -108,7 +95,7 @@ module IsoDoc
         out.div class: "Section3", id: clause["id"] do |div|
           page_break(out)
           div.p(class: "IntroTitle") do |h1|
-            clause&.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
+            clause.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
           end
           clause.elements.each do |e|
             parse(e, div) unless e.name == "title"
@@ -120,7 +107,7 @@ module IsoDoc
         out.div **attr_code(id: clause["id"]) do |s|
           page_break(out)
           s.p(class: "ForewordTitle") do |h1|
-            clause&.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
+            clause.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
           end
           clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
@@ -137,7 +124,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 a["style"].include?("page-break-before:always")
         end
         docxml&.at("//p[@class = 'AbstractTitle']")&.remove if abstractbox
         foreword.parent = preface_container if foreword && preface_container
@@ -157,7 +144,7 @@ module IsoDoc
         out.div **attr_code(id: clause["id"]) do |s|
           page_break(out)
           s.p(class: "AbstractTitle") do |h1|
-            clause&.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
+            clause.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
           end
           clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
@@ -167,7 +154,7 @@ module IsoDoc
         super
         a = docxml.at("//div[@id = 'boilerplate-ECEhdr']") and
           a["class"] = "boilerplate-ECEhdr"
-        docxml&.at("//div[@class = 'authority']")&.remove
+        docxml.at("//div[@class = 'authority']")&.remove
       end
 
       include BaseConvert

data/lib/metanorma/un/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.2 -->
+<!-- VERSION v1.2.3 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.10.13".freeze
+    VERSION = "0.11.0".freeze
   end
 end

data/metanorma-un.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roman-numerals"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_dependency "metanorma-standoc", "~> 2.4.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.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.10.13
+  version: 0.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-07 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.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement