metanorma-iso 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30229a0ddab3a83837d4f79b713bd7fa693798e810afeeb1fcdd85169aef9921
-  data.tar.gz: e09fbd0e70fbbe624ab4a82fb741715842e18f9a01d9e24fea986507a6b1710a
+  metadata.gz: 27078d397dbb62231ecac33bc066b23fe72a3f878144556b3856f54a9860201c
+  data.tar.gz: 75d0a641ea5a5b968b876f67392b35498273f1b574ef0ac9560444c151b4ad3b
 SHA512:
-  metadata.gz: d34635dae39c8970d56bd3fb09c8366875c48ab705a3848ba52f3d61fb7b465788aa357ee5a31efd3a4088936fc1d46cfc3272892a8b1737ee7f0dcbbe0e2f9e
-  data.tar.gz: 1c72a98e61841ba18ec4f63f48edf6d1f8554ebd8d88b3d5f1a7d96c907c2c87fe5e576a81ae6b3ea589cbe76ab383abe76b3e5a74052d18ef5307f7bc36693a
+  metadata.gz: d58426c8e269fa6da326020e37b5ddd72511b4dad56a1411c6a6510d358fd3a8ac67db48f29bcc1d50c2fa8df3f92f07a293da5c971a9a566ab2e46479c5c1a5
+  data.tar.gz: f3dc0240af1378db3c923ea986c15217c146ca7b869593ccb3fb2db3594cf1fc82b9593905f73bd7864cf8551765d4ac340b130e09a725b47e23f94e6c8fcde8

data/Gemfile.devel

@@ -0,0 +1,3 @@
+gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "main"
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"
+

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -11,6 +11,10 @@
 <p class="coverpage_docnumber">{{ edition_display | capitalize }}</p>
 {% endif %}
 
+{% if correcteddate != "XXX" %}
+<p class="coverpage_docnumber">{{ labels["corrected_version"] }} : {{ correcteddate }}</p>
+{% endif %}
+
 {% if revdate %}
 <p class="coverpage_docnumber">{{ labels["date"]}}: {{ revdate }}</p>
 {% endif %}

data/lib/isodoc/iso/html/word_iso_titlepage-dis.html

@@ -17,6 +17,9 @@
 {% if doc_date %}
 <p class="zzCover" align="right" style='text-align:right;font-weight:normal;'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'>{{ doc_date }}</span></span></p>
 {% endif %}
+{% if correcteddate %}
+<p class="zzCover">{{ labels["corrected_version"] }}: {{ correcteddate }}</p>
+{% endif %}
 
 <p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">Reference number of project: {{ docnumber_undated }}{% if draftinfo %} {{ draftinfo }}{% endif %}</span></p>
 

data/lib/isodoc/iso/html/word_iso_titlepage-prf.html

@@ -13,6 +13,9 @@
 {% if doc_date %}
 <p class="zzCover" align="right" style='text-align:right'><span lang="EN-GB">Date: <span style='mso-no-proof:yes'><b>{{ doc_date }}</b></span></span></p>
 {% endif %}
+{% if correcteddate %}
+<p class="zzCover">{{ labels["corrected_version"] }}: {{ correcteddate }}</p>
+{% endif %}
 
 <p class="zzCover" style='font-weight:normal;'><span lang="EN-GB">{{ editorialgroup}}</span></p>
 

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -33,6 +33,10 @@ style='mso-no-proof:yes'>{{ editorialgroup }}</span></p>
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">{{ edition_display | capitalize }}</span></p>
 {% endif %}
 
+{% if correcteddate %}
+<p class="MsoNormal" align="right" style='text-align:right'>{{ labels["corrected_version"] }}: {{ correcteddate }}</p>
+{% endif %}
+
 {% if revdate %}
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB">{{ labels["date"] }}: <span style='mso-no-proof:yes'>{{ revdate }}</span></span></p>
 {% endif %}

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

@@ -26,6 +26,7 @@ termsrelated: Terms related to
 availablefrom: Available from
 voting_begins_on: Voting begins on
 voting_terminates_on: Voting terminates on
+corrected_version: Corrected version
 multiple_and: "%1 and %2"
 multiple_or: "%1 or %2"
 doctype_dict:

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

@@ -25,6 +25,7 @@ termsrelated: Termes liés
 availablefrom: Disponible sur
 voting_begins_on: Le vote commence le
 voting_terminates_on: Le vote se termine le
+corrected_version: Version corrigée
 doctype_dict:
   international-standard: Norme internationale
   technical-specification: Spécification technique

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

@@ -26,6 +26,7 @@ termsrelated: Термины, связанные
 availablefrom: Доступна с
 voting_begins_on: Голосование начинается в
 voting_terminates_on: Голосование заканчивается в
+corrected_version: Исправленная версия
 doctype_dict:
   international-standard: Международный Стандарт
   technical-specification: Техническая Спецификация

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

@@ -23,6 +23,7 @@ termsrelated: 相关术语
 availablefrom: 可从
 voting_begins_on: 投票开始于
 voting_terminates_on: 投票终止于
+corrected_version: 修正版本
 doctype_dict:
   international-standard: 国际标准
   technical-specification: 技术规格

data/lib/isodoc/iso/init.rb

@@ -51,12 +51,12 @@ module IsoDoc
           elsif /\p{Zs}/.match?(i) then i
           else std_docid_semantic_full(i)
           end
-        end.join
+        end.join.gsub(%r{</span>(\p{Zs}+)<}, "\\1</span><")
       end
 
       def std_docid_semantic_full(ident)
         ident
-          .sub(/^([^0-9]+)(\s|$)/, "<span class='stdpublisher'>\\1</span>\\2")
+          .sub(/^([^0-9]+)(\p{Zs}|$)/, "<span class='stdpublisher'>\\1</span>\\2")
           .sub(/([0-9]+)/, "<span class='stddocNumber'>\\1</span>")
           .sub(/-([0-9]+)/, "-<span class='stddocPartNumber'>\\1</span>")
           .sub(/:([0-9]{4})(?!\d)/, ":<span class='stdyear'>\\1</span>")

data/lib/isodoc/iso/iso.amendment.xsl

@@ -919,6 +919,18 @@
 																	</fo:block>
 																</fo:block>
 															</xsl:if>
+															<xsl:variable name="date_corrected" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:date[@type = 'corrected'])"/>
+															<xsl:if test="$date_corrected != ''">
+																<fo:block text-align="right" font-size="9.5pt">
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:call-template name="getLocalizedString">
+																		<xsl:with-param name="key">corrected_version</xsl:with-param>
+																	</xsl:call-template>
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:value-of select="$date_corrected"/>
+																</fo:block>
+															</xsl:if>
 														</fo:table-cell>
 													</fo:table-row>
 													<fo:table-row height="17mm" role="SKIP">
@@ -6867,8 +6879,17 @@
 		<xsl:variable name="styles_">
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
-				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'font-family' or $key = 'color'">
+				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:variable name="value">
+					<xsl:choose>
+						<!-- if font-size is digits only -->
+						<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$value_"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 			</xsl:for-each>

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -919,6 +919,18 @@
 																	</fo:block>
 																</fo:block>
 															</xsl:if>
+															<xsl:variable name="date_corrected" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:date[@type = 'corrected'])"/>
+															<xsl:if test="$date_corrected != ''">
+																<fo:block text-align="right" font-size="9.5pt">
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:call-template name="getLocalizedString">
+																		<xsl:with-param name="key">corrected_version</xsl:with-param>
+																	</xsl:call-template>
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:value-of select="$date_corrected"/>
+																</fo:block>
+															</xsl:if>
 														</fo:table-cell>
 													</fo:table-row>
 													<fo:table-row height="17mm" role="SKIP">
@@ -6867,8 +6879,17 @@
 		<xsl:variable name="styles_">
 			<xsl:for-each select="xalan:nodeset($styles__)/item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
-				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
-				<xsl:if test="$key = 'font-family' or $key = 'color'">
+				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
+				<xsl:variable name="value">
+					<xsl:choose>
+						<!-- if font-size is digits only -->
+						<xsl:when test="$key = 'font-size' and translate($value_, '0123456789', '') = ''"><xsl:value-of select="$value_"/>pt</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="$value_"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 			</xsl:for-each>

data/lib/isodoc/iso/word_dis_cleanup.rb

@@ -1,127 +1,8 @@
+require_relative "word_dis_styles"
+
 module IsoDoc
   module Iso
     class WordDISConvert < WordConvert
-      STYLESMAP = {
-        AltTerms: "AdmittedTerm",
-        TableFootnote: "Tablefootnote",
-        formula: "Formula",
-        note: "Note",
-        example: "Example",
-        admonition: "Admonition",
-        admonitiontitle: "AdmonitionTitle",
-        sourcetitle: "SourceTitle",
-        TableTitle: "Tabletitle",
-        titlepagesbhead: "TablePageSubhead",
-        NormRef: "RefNorm",
-        Biblio: "BiblioEntry",
-        MsoNormal: "MsoBodyText",
-        FigureTitle: "Figuretitle",
-        zzwarning: "zzWarning",
-        zzwarninghdr: "zzWarningHdr",
-        quoteattribution: "QuoteAttribution",
-        Sourcecode: "Code",
-        zzSTDTitle1: "zzSTDTitle",
-        zzSTDTitle2: "zzSTDTitle",
-        zzCopyright1: "zzCopyright",
-      }.freeze
-
-      def new_styles(docxml)
-        STYLESMAP.each do |k, v|
-          docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
-        end
-        docxml.xpath("//h1[@class = 'ForewordTitle' or @class = 'IntroTitle']")
-          .each { |h| h.name = "p" }
-        dis_styles1(docxml)
-        docxml.xpath("//p[not(@class)]").each { |p| p["class"] = "MsoBodyText" }
-      end
-
-      def sourcecode_style
-        "Code"
-      end
-
-      def dis_styles1(docxml)
-        amd_style(docxml)
-        middle_title_style(docxml)
-        code_style(docxml)
-        figure_style(docxml)
-        formula_style(docxml)
-        note_style(docxml)
-        example_style(docxml)
-        dis_style_interactions(docxml)
-        quote_style(docxml)
-        stripbgcolor(docxml)
-      end
-
-      def stripbgcolor(docxml)
-        @bgstripcolor == "true" or return
-        %w(aucollab audeg aufname aurole ausuffix ausurname bibarticle bibetal
-           bibfname bibfpage bibissue bibjournal biblpage bibnumber
-           biborganization bibsuppl bibsurname biburl bibvolume bibyear
-           citebib citeen citefig citefn citetbl bibextlink citeeq citetfn
-           auprefix citeapp citesec stddocNumber stddocPartNumber
-           stddocTitle aumember stdfootnote stdpublisher stdsection stdyear
-           stddocumentType bibalt-year bibbook bbichapterno bibchaptertitle
-           bibed-etal bibed-fname bibeditionno bibed-organization bibed-suffix
-           bibed-surname bibinstitution bibisbn biblocation bibpagecount
-           bibpatent bibpublisher bibreportnum bibschool bibseries bibseriesno
-           bibtrans stdsuppl citesection).each do |t|
-          docxml.xpath("//span[@class = '#{t}']").each do |s|
-            s["style"] ||= ""
-            s["style"] = "mso-pattern:none;#{s['style']}"
-          end
-        end
-      end
-
-      def middle_title_style(docxml)
-        docxml.xpath("//p[@class = 'zzSTDTitle2']").each do |p|
-          p1 = p.previous_element && p1.name == p &&
-            p1["class"] = "zzSTDTitle2" or next
-          p1 << " #{p.remove.children.to_xml}"
-        end
-      end
-
-      def dis_style_interactions(docxml)
-        docxml.xpath("//p[@class = 'Code' or @class = 'Code-' or " \
-                     "@class = 'Code--']" \
-                     "[following::p[@class = 'Examplecontinued']]").each do |p|
-          p["style"] ||= ""
-          p["style"] = "margin-bottom:12pt;#{p['style']}"
-        end
-      end
-
-      def amd_style(docxml)
-        return unless @meta.get[:doctype] == "Amendment"
-
-        docxml.xpath("//div[@class = 'WordSection3']//h1").each do |h|
-          h.name = "p"
-          h["style"] = "font-style:italic;page-break-after:avoid;"
-        end
-      end
-
-      def para_style_change(div, class1, class2)
-        s = class1 ? "@class = '#{class1}'" : "not(@class)"
-        div.xpath(".//p[#{s}]").each do |p|
-          p["class"] = class2
-        end
-      end
-
-      def quote_style1(div)
-        para_style_change(div, nil, "BodyTextindent1")
-        para_style_change(div, "Code-", "Code--")
-        para_style_change(div, "Code", "Code-")
-        if div["class"] != "Example"
-          para_style_change(div, "Example", "Exampleindent")
-          para_style_change(div, "Examplecontinued", "Exampleindentcontinued")
-        end
-        if div["class"] != "Note"
-          para_style_change(div, "Note", "Noteindent")
-          para_style_change(div, "Notecontinued", "Noteindentcontinued")
-        end
-        div.xpath(".//table[@class = 'dl']").each do |t|
-          t["style"] = "margin-left: 1cm;"
-        end
-      end
-
       def remove_note_label(doc)
         doc.xpath("//span[@class = 'note_label' or @class = 'example_label']")
           .each do |s|
@@ -129,83 +10,6 @@ module IsoDoc
         end
       end
 
-      def note_style(docxml)
-        remove_note_label(docxml)
-        note_continued_style(docxml)
-      end
-
-      def example_style(docxml)
-        example_continued_style(docxml)
-      end
-
-      def example_continued_style(docxml)
-        docxml.xpath("//div[@class = 'Example']").each do |d|
-          d.xpath("./p").each_with_index do |p, i|
-            next if p["class"] && p["class"] != "Example"
-
-            p["class"] = (i.zero? ? "Example" : "Examplecontinued")
-          end
-        end
-      end
-
-      def note_continued_style(docxml)
-        docxml.xpath("//div[@class = 'Note']").each do |d|
-          d.xpath("./p").each_with_index do |p, i|
-            next if p["class"] && p["class"] != "Note"
-
-            p["class"] = (i.zero? ? "Note" : "Notecontinued")
-          end
-        end
-      end
-
-      FIGURE_NESTED_STYLES =
-        { Note: "Figurenote", example: "Figureexample" }.freeze
-
-      def figure_style(docxml)
-        docxml.xpath("//div[@class = 'figure']").each do |f|
-          FIGURE_NESTED_STYLES.each do |k, v|
-            f.xpath(".//*[@class = '#{k}']").each { |n| n["class"] = v }
-          end
-          f.xpath("./img").each do |i|
-            i.replace("<p class='FigureGraphic'>#{i.to_xml}</p>")
-          end
-        end
-      end
-
-      def formula_style(docxml)
-        docxml.xpath("//div[@class = 'Formula']").each do |f|
-          f.xpath(".//p[not(@class)]").each do |p|
-            p["class"] = "Formula"
-          end
-        end
-      end
-
-      def code_style(doc)
-        span_style((doc.xpath("//tt//b") - doc.xpath("//tt//i//b")),
-                   "ISOCodebold")
-        span_style((doc.xpath("//tt//i") - doc.xpath("//tt//b//i")),
-                   "ISOCodeitalic")
-        span_style((doc.xpath("//b//tt") - doc.xpath("//b//i//tt")),
-                   "ISOCodebold")
-        span_style((doc.xpath("//i//tt") - doc.xpath("//i//b//tt")),
-                   "ISOCodeitalic")
-        span_style(doc.xpath("//tt"), "ISOCode")
-      end
-
-      def span_style(xpath, style)
-        xpath.each do |elem|
-          elem.name = "span"
-          elem["class"] = style
-        end
-      end
-
-      def word_annex_cleanup1(docxml, lvl)
-        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
-          h2.name = "p"
-          h2["class"] = "a#{lvl}"
-        end
-      end
-
       def word_cleanup(docxml)
         word_table_cell_para(docxml)
         super
@@ -229,19 +33,24 @@ module IsoDoc
         end
       end
 
-      def word_table_cell_para_style(cell)
-        ret = cell["header"] == "true" ? "Tableheader" : "Tablebody"
-        cell["class"] == "rouge-code" and ret = "Code"
-        ret
-      end
-
-      def table_toc_class
-        ["Table title", "Tabletitle", "Annex Table Title", "AnnexTableTitle"] +
-          super
-      end
-
-      def figure_toc_class
-        ["Figure Title", "Annex Figure Title", "AnnexFigureTitle"] + super
+      def stripbgcolor(docxml)
+        @bgstripcolor == "true" or return
+        %w(aucollab audeg aufname aurole ausuffix ausurname bibarticle bibetal
+           bibfname bibfpage bibissue bibjournal biblpage bibnumber
+           biborganization bibsuppl bibsurname biburl bibvolume bibyear
+           citebib citeen citefig citefn citetbl bibextlink citeeq citetfn
+           auprefix citeapp citesec stddocNumber stddocPartNumber
+           stddocTitle aumember stdfootnote stdpublisher stdsection stdyear
+           stddocumentType bibalt-year bibbook bbichapterno bibchaptertitle
+           bibed-etal bibed-fname bibeditionno bibed-organization bibed-suffix
+           bibed-surname bibinstitution bibisbn biblocation bibpagecount
+           bibpatent bibpublisher bibreportnum bibschool bibseries bibseriesno
+           bibtrans stdsuppl citesection).each do |t|
+          docxml.xpath("//span[@class = '#{t}']").each do |s|
+            s["style"] ||= ""
+            s["style"] = "mso-pattern:none;#{s['style']}"
+          end
+        end
       end
     end
   end

data/lib/isodoc/iso/word_dis_styles.rb

@@ -0,0 +1,233 @@
+module IsoDoc
+  module Iso
+    class WordDISConvert < WordConvert
+      STYLESMAP = {
+        AltTerms: "AdmittedTerm",
+        TableFootnote: "Tablefootnote",
+        formula: "Formula",
+        note: "Note",
+        example: "Example",
+        admonition: "Admonition",
+        admonitiontitle: "AdmonitionTitle",
+        sourcetitle: "SourceTitle",
+        TableTitle: "Tabletitle",
+        titlepagesbhead: "TablePageSubhead",
+        NormRef: "RefNorm",
+        Biblio: "BiblioEntry",
+        MsoNormal: "MsoBodyText",
+        FigureTitle: "Figuretitle",
+        zzwarning: "zzWarning",
+        zzwarninghdr: "zzWarningHdr",
+        quoteattribution: "QuoteAttribution",
+        Sourcecode: "Code",
+        zzSTDTitle1: "zzSTDTitle",
+        zzSTDTitle2: "zzSTDTitle",
+        zzCopyright1: "zzCopyright",
+      }.freeze
+
+      def new_styles(docxml)
+        STYLESMAP.each do |k, v|
+          docxml.xpath("//*[@class = '#{k}']").each { |s| s["class"] = v }
+        end
+        docxml.xpath("//h1[@class = 'ForewordTitle' or @class = 'IntroTitle']")
+          .each { |h| h.name = "p" }
+        dis_styles1(docxml)
+        docxml.xpath("//p[not(@class)]").each { |p| p["class"] = "MsoBodyText" }
+        stripbgcolor(docxml)
+      end
+
+      def sourcecode_style
+        "Code"
+      end
+
+      def dis_styles1(docxml)
+        amd_style(docxml)
+        middle_title_style(docxml)
+        code_style(docxml)
+        figure_style(docxml)
+        formula_style(docxml)
+        note_style(docxml)
+        example_style(docxml)
+        dis_style_interactions(docxml)
+        quote_style(docxml)
+        smaller_code_style(docxml)
+      end
+
+      def middle_title_style(docxml)
+        docxml.xpath("//p[@class = 'zzSTDTitle2']").each do |p|
+          p1 = p.previous_element && p1.name == p &&
+            p1["class"] = "zzSTDTitle2" or next
+          p1 << " #{p.remove.children.to_xml}"
+        end
+      end
+
+      def dis_style_interactions(docxml)
+        docxml.xpath("//p[@class = 'Code' or @class = 'Code-' or " \
+                     "@class = 'Code--']" \
+                     "[following::p[@class = 'Examplecontinued']]").each do |p|
+          p["style"] ||= ""
+          p["style"] = "margin-bottom:12pt;#{p['style']}"
+        end
+      end
+
+      def amd_style(docxml)
+        @meta.get[:doctype] == "Amendment" or return
+        docxml.xpath("//div[@class = 'WordSection3']//h1").each do |h|
+          h.name = "p"
+          h["style"] = "font-style:italic;page-break-after:avoid;"
+        end
+      end
+
+      def para_style_change(div, class1, class2)
+        s = class1 ? "@class = '#{class1}'" : "not(@class)"
+        div.xpath(".//p[#{s}]").each do |p|
+          p["class"] = class2
+        end
+      end
+
+      def quote_style1(div)
+        para_style_change(div, nil, "BodyTextindent1")
+        para_style_change(div, "Code-", "Code--")
+        para_style_change(div, "Code", "Code-")
+        if div["class"] != "Example"
+          para_style_change(div, "Example", "Exampleindent")
+          para_style_change(div, "Examplecontinued", "Exampleindentcontinued")
+        end
+        if div["class"] != "Note"
+          para_style_change(div, "Note", "Noteindent")
+          para_style_change(div, "Notecontinued", "Noteindentcontinued")
+        end
+        div.xpath(".//table[@class = 'dl']").each do |t|
+          t["style"] = "margin-left: 1cm;"
+        end
+      end
+
+      def note_style(docxml)
+        remove_note_label(docxml)
+        note_continued_style(docxml)
+      end
+
+      def example_style(docxml)
+        example_continued_style(docxml)
+      end
+
+      def example_continued_style(docxml)
+        docxml.xpath("//div[@class = 'Example']").each do |d|
+          d.xpath("./p").each_with_index do |p, i|
+            p["class"] && p["class"] != "Example" and next
+            p["class"] = (i.zero? ? "Example" : "Examplecontinued")
+          end
+        end
+      end
+
+      def note_continued_style(docxml)
+        docxml.xpath("//div[@class = 'Note']").each do |d|
+          d.xpath("./p").each_with_index do |p, i|
+            p["class"] && p["class"] != "Note" and next
+            p["class"] = (i.zero? ? "Note" : "Notecontinued")
+          end
+        end
+      end
+
+      FIGURE_NESTED_STYLES =
+        { Note: "Figurenote", example: "Figureexample" }.freeze
+
+      def figure_style(docxml)
+        docxml.xpath("//div[@class = 'figure']").each do |f|
+          FIGURE_NESTED_STYLES.each do |k, v|
+            f.xpath(".//*[@class = '#{k}']").each { |n| n["class"] = v }
+          end
+          f.xpath("./img").each do |i|
+            i.replace("<p class='FigureGraphic'>#{i.to_xml}</p>")
+          end
+        end
+      end
+
+      def formula_style(docxml)
+        docxml.xpath("//div[@class = 'Formula']").each do |f|
+          f.xpath(".//p[not(@class)]").each do |p|
+            p["class"] = "Formula"
+          end
+        end
+      end
+
+      def code_style(doc)
+        span_style((doc.xpath("//tt//b") - doc.xpath("//tt//i//b")),
+                   "ISOCodebold")
+        span_style((doc.xpath("//tt//i") - doc.xpath("//tt//b//i")),
+                   "ISOCodeitalic")
+        span_style((doc.xpath("//b//tt") - doc.xpath("//b//i//tt")),
+                   "ISOCodebold")
+        span_style((doc.xpath("//i//tt") - doc.xpath("//i//b//tt")),
+                   "ISOCodeitalic")
+        span_style(doc.xpath("//tt"), "ISOCode")
+      end
+
+      def span_style(xpath, style)
+        xpath.each do |elem|
+          elem.name = "span"
+          elem["class"] = style
+        end
+      end
+
+      def smaller_code_style(doc)
+        smaller_code_style_names(doc)
+        smaller_code_style_names2spans(doc)
+      end
+
+      # TODO read $smallerfonsize from CSS definitions
+      SMALL_FONT_CLASSES =
+        %w(pseudocode Note tablefootnote figdl MsoISOTable MsoTableGrid
+           TableISO Example Notecontinued Noteindent Noteindentcontinued
+           ListNumber5- ListContinue5- BodyTextIndent22 BodyTextIndent32
+           Exampleindent2 Exampleindent2continued Noteindent2continued
+           Noteindent2 example_label note_label Tablebody MsoNormalTable).freeze
+
+      INLINE_CODE_CLASSES = %w(ISOCodebold ISOCodeitalic ISOCode).freeze
+
+      def smaller_code_style_names(doc)
+        klass = SMALL_FONT_CLASSES.map { |x| "@class = '#{x}'" }.join(" or ")
+        doc.xpath("//*[#{klass}]") - doc.xpath("//*[#{klass}]//*[#{klass}]")
+          .each do |d|
+            INLINE_CODE_CLASSES.each do |n|
+              d.xpath(".//span[@class = '#{n}']").each do |s|
+                s["class"] += "-"
+              end
+            end
+          end
+      end
+
+      def smaller_code_style_names2spans(doc)
+        INLINE_CODE_CLASSES.each do |n|
+          doc.xpath("//span[@class = '#{n}-']").each do |s|
+            s["class"] = n
+            s.children =
+              "<span style='font-size: 9pt;'>#{s.children.to_xml}</span>"
+          end
+        end
+      end
+
+      def word_annex_cleanup1(docxml, lvl)
+        docxml.xpath("//h#{lvl}[ancestor::*[@class = 'Section3']]").each do |h2|
+          h2.name = "p"
+          h2["class"] = "a#{lvl}"
+        end
+      end
+
+      def word_table_cell_para_style(cell)
+        ret = cell["header"] == "true" ? "Tableheader" : "Tablebody"
+        cell["class"] == "rouge-code" and ret = "Code"
+        ret
+      end
+
+      def table_toc_class
+        ["Table title", "Tabletitle", "Annex Table Title", "AnnexTableTitle"] +
+          super
+      end
+
+      def figure_toc_class
+        ["Figure Title", "Annex Figure Title", "AnnexFigureTitle"] + super
+      end
+    end
+  end
+end

data/lib/isodoc/iso/xref_section.rb

@@ -7,10 +7,9 @@ module IsoDoc
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
-        i = Counter.new
+        i = Counter.new(0, prefix: "0.")
         clause.xpath(ns("./clause")).each do |c|
-          i.increment(c)
-          section_names1(c, "0.#{i.print}", 2)
+          section_names1(c, i.increment(c).print, 2)
         end
       end
 
@@ -27,10 +26,9 @@ module IsoDoc
             anchor_struct(i.print, nil, @labels["appendix"],
                           "clause").merge(level: 2, subtype: "annex",
                                           container: clause["id"])
-          j = Counter.new
+          j = Counter.new(0, prefix: "#{i.print}.")
           c.xpath(ns("./clause | ./references")).each do |c1|
-            j.increment(c1)
-            lbl = "#{@labels['appendix']} #{i.print}.#{j.print}"
+            lbl = "#{@labels['appendix']} #{j.increment(c1).print}"
             appendix_names1(c1, l10n(lbl), 3, clause["id"])
           end
         end
@@ -41,32 +39,29 @@ module IsoDoc
       def section_names1(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, level: level, xref: num, subtype: "clause" }
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns("./clause | ./terms | ./term | ./definitions | " \
                         "./references"))
           .each do |c|
-          i.increment(c)
-          section_names1(c, "#{num}.#{i.print}", level + 1)
+          section_names1(c, i.increment(c).print, level + 1)
         end
       end
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    subtype: "annex" }
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns("./clause | ./references")).each do |c|
-          i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", level + 1)
+          annex_names1(c, i.increment(c).print, level + 1)
         end
       end
 
       def appendix_names1(clause, num, level, container)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    container: container }
-        i = Counter.new
+        i = Counter.new(0, prefix: "#{num}.")
         clause.xpath(ns("./clause | ./references")).each do |c|
-          i.increment(c)
-          appendix_names1(c, "#{num}.#{i.print}", level + 1, container)
+          appendix_names1(c, i.increment(c).print, level + 1, container)
         end
       end
 

data/lib/metanorma/iso/basicdoc.rng

@@ -914,44 +914,47 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <choice>
+          <data type="int"/>
+          <value>auto</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
   </define>
   <define name="video">
     <element name="video">

data/lib/metanorma/iso/biblio.rng

@@ -348,6 +348,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +369,11 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -942,6 +950,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/metanorma/iso/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.6 -->
+<!-- VERSION v1.2.8 -->
 <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">
@@ -1054,6 +1054,17 @@
       <ref name="date_inline"/>
     </choice>
   </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="passthrough_inline"/>
+  </define>
+  <define name="passthrough_inline">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="add">
     <element name="add">
       <choice>
@@ -1092,6 +1103,9 @@
       <optional>
         <attribute name="style"/>
       </optional>
+      <optional>
+        <attribute name="custom-charset"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1394,6 +1408,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1617,6 +1634,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1668,6 +1688,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1765,6 +1788,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/metanorma/iso/isostandard.rng

@@ -220,6 +220,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="type"/>
       </optional>

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.5.3".freeze
+    VERSION = "2.5.4".freeze
   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.6.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.3"
   spec.add_dependency "mnconvert", "~> 1.14"
   spec.add_dependency "pubid-iso", "~> 0.6.0"
   spec.add_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-11-20 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.6.0
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: mnconvert
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +296,7 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.devel
 - LICENSE
 - Makefile
 - README.adoc
@@ -361,6 +362,7 @@ files:
 - lib/isodoc/iso/word_convert.rb
 - lib/isodoc/iso/word_dis_cleanup.rb
 - lib/isodoc/iso/word_dis_convert.rb
+- lib/isodoc/iso/word_dis_styles.rb
 - lib/isodoc/iso/xref.rb
 - lib/isodoc/iso/xref_section.rb
 - lib/metanorma-iso.rb