metanorma-iso 2.5.2 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e717f4c41d2cda0aa92bc42985e6f12d420e9bcdb2b0410fe085bca689a549
-  data.tar.gz: 33d5e0b9f67c9c76afcbd0feff13a81e21919c3cb48dc56524bfa34203725ae1
+  metadata.gz: 27078d397dbb62231ecac33bc066b23fe72a3f878144556b3856f54a9860201c
+  data.tar.gz: 75d0a641ea5a5b968b876f67392b35498273f1b574ef0ac9560444c151b4ad3b
 SHA512:
-  metadata.gz: a5249f0f6147e52c1ef81b7c32a3a431a74478a7727e8bde1842e411f20d1e56311fb41755828f93dc626e94ea14b5d661a5e4fbd6a17c41619131fe1a4d60eb
-  data.tar.gz: a97203b198a7e9baa2e28f5597f53c9cd60ab79cc0de989f5e3dcc7671d5199e9047abdf0eb0b02401d05d48317dbae45781475642275b4c15fa8a6aaf0f446d
+  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/base_convert.rb

@@ -125,8 +125,9 @@ module IsoDoc
       end
 
       def figure_name_parse(_node, div, name)
+        name.nil? and return
         div.p class: "FigureTitle", style: "text-align:center;" do |p|
-          name&.children&.each { |n| parse(n, p) }
+          name.children.each { |n| parse(n, p) }
         end
       end
 

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/index.rb

@@ -8,7 +8,7 @@ module IsoDoc
       def index(xml)
         if xml.at(ns("//index"))
           i = xml.at(ns("//indexsect")) ||
-            xml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}"\
+            xml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}" \
                                "</title></indexsect>").first
           index = sort_indexterms(xml.xpath(ns("//index")),
                                   xml.xpath(ns("//index-xref[@also = 'false']")),
@@ -147,7 +147,7 @@ module IsoDoc
           index2bookmark(t)
           term_hash_init(v, term, term2, term3, :xref)
           to = t["to"] ? "to='#{t['to']}' " : ""
-          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' "\
+          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' " \
                                           "#{to}pagenumber='true'/>"
         end
       end

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