metanorma-iso 2.0.6.1 → 2.0.7

data/lib/isodoc/iso/index.rb

@@ -94,12 +94,15 @@ module IsoDoc
       end
 
       def index_entries_see(entries, label)
-        see_sort = entries&.dig(label)&.each_with_object({}) do |w, v|
+        see_sort = entries&.dig(label) or return nil
+
+        x = see_sort.each_with_object({}) do |w, v|
           v[sortable(w).downcase] = w
         end
-        see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
-          see_sort[k]
-        end&.join(", ")
+        x.keys.localize(@lang.to_sym).sort.to_a.map do |k|
+          #see_sort[k]
+          x[k]
+        end.join(", ")
       end
 
       def see_lbl

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

@@ -1396,8 +1396,9 @@
 					</fo:block>
 				</xsl:when>
 				<xsl:otherwise>
+					<xsl:value-of select="$linebreak"/>
 					<xsl:value-of select="$part-text"/>
-					<xsl:text> </xsl:text>
+					<xsl:text> </xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:if>
@@ -1729,7 +1730,8 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<!-- <xsl:value-of select="translate(., $thin_space, ' ')"/> -->
-				<xsl:value-of select="."/>
+				<!-- <xsl:value-of select="."/> -->
+				<xsl:call-template name="text"/>
 			</xsl:otherwise>
 		</xsl:choose>
 		
@@ -3347,8 +3349,27 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
-	</xsl:template><xsl:template match="text()">
-		<xsl:value-of select="."/>
+	</xsl:template><xsl:variable name="tag_open">###fo:inline###</xsl:variable><xsl:variable name="tag_close">###/fo:inline###</xsl:variable><xsl:template match="text()" name="text">
+		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
+		<xsl:call-template name="replace_fo_inline">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_fo_inline">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $tag_open)">
+				<xsl:value-of select="substring-before($text, $tag_open)"/>
+				<xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
+				<xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
+				<xsl:value-of select="substring-before($text_after, $tag_close)"/>
+				<xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
+				<xsl:call-template name="replace_fo_inline">
+					<xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template><xsl:template match="*[local-name()='copyright-statement']">
@@ -7094,7 +7115,8 @@
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
 		<xsl:if test="normalize-space() != ''">
-			<xsl:value-of select="."/>
+			<!-- <xsl:value-of select="."/> -->
+			<xsl:call-template name="text"/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'quote']">		
 		<fo:block-container margin-left="0mm">

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

@@ -1396,8 +1396,9 @@
 					</fo:block>
 				</xsl:when>
 				<xsl:otherwise>
+					<xsl:value-of select="$linebreak"/>
 					<xsl:value-of select="$part-text"/>
-					<xsl:text> </xsl:text>
+					<xsl:text> </xsl:text>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:if>
@@ -1729,7 +1730,8 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<!-- <xsl:value-of select="translate(., $thin_space, ' ')"/> -->
-				<xsl:value-of select="."/>
+				<!-- <xsl:value-of select="."/> -->
+				<xsl:call-template name="text"/>
 			</xsl:otherwise>
 		</xsl:choose>
 		
@@ -3347,8 +3349,27 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
-	</xsl:template><xsl:template match="text()">
-		<xsl:value-of select="."/>
+	</xsl:template><xsl:variable name="tag_open">###fo:inline###</xsl:variable><xsl:variable name="tag_close">###/fo:inline###</xsl:variable><xsl:template match="text()" name="text">
+		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_open,'$1',$tag_close))"/>
+		<xsl:call-template name="replace_fo_inline">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_fo_inline">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $tag_open)">
+				<xsl:value-of select="substring-before($text, $tag_open)"/>
+				<xsl:text disable-output-escaping="yes">&lt;fo:inline keep-together.within-line="always"&gt;</xsl:text>
+				<xsl:variable name="text_after" select="substring-after($text, $tag_open)"/>
+				<xsl:value-of select="substring-before($text_after, $tag_close)"/>
+				<xsl:text disable-output-escaping="yes">&lt;/fo:inline&gt;</xsl:text>
+				<xsl:call-template name="replace_fo_inline">
+					<xsl:with-param name="text" select="substring-after($text_after, $tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
 	</xsl:template><xsl:template match="*[local-name()='copyright-statement']">
@@ -7094,7 +7115,8 @@
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
 		<xsl:if test="normalize-space() != ''">
-			<xsl:value-of select="."/>
+			<!-- <xsl:value-of select="."/> -->
+			<xsl:call-template name="text"/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'quote']">		
 		<fo:block-container margin-left="0mm">

data/lib/isodoc/iso/metadata.rb

@@ -56,14 +56,10 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ISO']"))
-        set(:docnumber, dn&.text)
-        tcdn = isoxml.xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']"))
-        set(:tc_docnumber, tcdn.map(&:text))
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-with-lang']"))
-        set(:docnumber_lang, dn&.text)
-        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-reference']"))
-        set(:docnumber_reference, dn&.text)
+        set(:docnumber, isoxml&.at(ns("//bibdata/docidentifier[@type = 'ISO']"))&.text)
+        set(:tc_docnumber, isoxml.xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']")).map(&:text))
+        set(:docnumber_lang, isoxml&.at(ns("//bibdata/docidentifier[@type = 'iso-with-lang']"))&.text)
+        set(:docnumber_reference, isoxml&.at(ns("//bibdata/docidentifier[@type = 'iso-reference']"))&.text)
       end
 
       # we don't leave this to i18n.rb, because we have both English and
@@ -166,10 +162,7 @@ module IsoDoc
       end
 
       def subtitle(isoxml, _out)
-        lang = case @lang
-               when "fr", "ru" then "en"
-               else "fr"
-               end
+        lang = @lang == "en" ? "fr" : "en"
         intro, main, part, amd = title_parts(isoxml, lang)
         partnumber, subpartnumber, amdnumber, corrnumber = title_nums(isoxml)
 

data/lib/isodoc/iso/sts_convert.rb

@@ -10,14 +10,19 @@ module IsoDoc
         @suffix = "sts.xml"
       end
 
-      def convert(in_fname, file = nil, debug = false, out_fname = nil)
-        file = File.read(in_fname, encoding: "utf-8") if file.nil?
-        _docxml, filename, dir = convert_init(file, in_fname, debug)
+      def inputfile(in_fname, filename)
         /\.xml$/.match?(in_fname) or
           in_fname = Tempfile.open([filename, ".xml"], encoding: "utf-8") do |f|
             f.write file
             f.path
           end
+        in_fname
+      end
+
+      def convert(in_fname, file = nil, debug = false, out_fname = nil)
+        file = File.read(in_fname, encoding: "utf-8") if file.nil?
+        _docxml, filename, dir = convert_init(file, in_fname, debug)
+        in_fname = inputfile(in_fname, filename)
         FileUtils.rm_rf dir
         MnConvert.convert(in_fname,
                           { input_format: MnConvert::InputFormat::MN,

data/lib/isodoc/iso/word_convert.rb

@@ -45,6 +45,18 @@ module IsoDoc
           olstyle: "l2" }
       end
 
+      def convert1(docxml, filename, dir)
+        @dis = /^[45].$/.match?(docxml&.at(ns("//bibdata/status/stage"))&.text)
+        if @dis
+          @wordstylesheet_name = html_doc_path("wordstyle-dis.scss")
+          @standardstylesheet_name = html_doc_path("isodoc-dis.scss")
+          @wordcoverpage = html_doc_path("word_iso_titlepage-dis.html")
+          @wordintropage = html_doc_path("word_iso_intro-dis.html")
+          @header = html_doc_path("header-dis.html")
+        end
+        super
+      end
+
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72" }
         xml.body **body_attr do |body|

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.0.6.1".freeze
+    VERSION = "2.0.7".freeze
   end
 end

data/spec/isodoc/ref_spec.rb

@@ -272,7 +272,7 @@ RSpec.describe IsoDoc do
             </note>
             <bibitem id="ISO3696" type="standard">
               <title format="text/plain">Water for analytical laboratory use</title>
-              <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
+              <docidentifier type='metanorma-ordinal'>[3]</docidentifier>
               <docidentifier type="ISO">ISO 3696</docidentifier>
               <contributor>
                 <role type="publisher"/>
@@ -295,7 +295,7 @@ RSpec.describe IsoDoc do
             </bibitem>
             <bibitem id="ref11">
               <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
-              <docidentifier type='metanorma-ordinal'>[2]</docidentifier>
+              <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
               <docidentifier type="IETF">IETF RFC 10</docidentifier>
             </bibitem>
             <bibitem id="ref12">
@@ -363,7 +363,7 @@ RSpec.describe IsoDoc do
                 <p>
                   <span class="note_label">NOTE</span>&#160; This is another annotation of document ISSN.</p>
               </div>
-              <p class="Biblio" id="ISO3696">[1]&#160; ISO 3696,
+              <p class="Biblio" id="ISO3696">[3]&#160; ISO 3696,
                 <i>Water for analytical laboratory use</i></p>
               <p class="Biblio" id="ref10">[10]&#160; <span style="font-variant:small-caps;">Standard No I.C.C 167</span>
                  .
@@ -371,7 +371,7 @@ RSpec.describe IsoDoc do
                 (see
                 <a href="http://www.icc.or.at">http://www.icc.or.at</a>
                 )</p>
-              <p class="Biblio" id="ref11">[2]&#160; IETF RFC 10,
+              <p class="Biblio" id="ref11">[4]&#160; IETF RFC 10,
                 <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
               <p class="Biblio" id="ref12">Citn&#160; IETF RFC 20, CitationWorks. 2019.
                 <i>How to cite a reference</i>
@@ -384,8 +384,12 @@ RSpec.describe IsoDoc do
         </body>
       </html>
     OUTPUT
-    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({}).convert("test", input, true))
-      .sub(%r{<localized-strings>.*</localized-strings>}m, "")).to be_equivalent_to xmlpp(presxml)
-    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+    expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
+      .convert("test", input, true))
+      .sub(%r{<localized-strings>.*</localized-strings>}m, ""))
+      .to be_equivalent_to xmlpp(presxml)
+    expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({})
+      .convert("test", presxml, true)))
+      .to be_equivalent_to xmlpp(html)
   end
 end

data/spec/metanorma/amd_spec.rb

@@ -280,7 +280,7 @@ RSpec.describe Metanorma::ISO do
     OUTPUT
   end
 
-  it "processes metadata, amendment" do
+  it "processes metadata, amendment, stage 30" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -350,7 +350,7 @@ RSpec.describe Metanorma::ISO do
     OUTPUT
   end
 
-  it "processes metadata, amendment" do
+  it "processes metadata, amendment, stage 40" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -419,7 +419,7 @@ RSpec.describe Metanorma::ISO do
     OUTPUT
   end
 
-  it "processes metadata, amendment" do
+  it "processes metadata, amendment, published" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -487,7 +487,7 @@ RSpec.describe Metanorma::ISO do
     OUTPUT
   end
 
-  it "processes metadata, corrigendum" do
+  it "processes metadata, corrigendum, stage 30" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -503,7 +503,6 @@ RSpec.describe Metanorma::ISO do
       :corrigendum-number: 3
     INPUT
     expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
-      #{'      '}
       <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
         <bibdata type="standard">
           <docidentifier type="ISO">ISO 17301-1:2030/CD Cor.3</docidentifier>
@@ -557,7 +556,7 @@ RSpec.describe Metanorma::ISO do
     OUTPUT
   end
 
-  it "processes metadata, corrigendum" do
+  it "processes metadata, corrigendum, stage 50" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author
@@ -626,7 +625,7 @@ RSpec.describe Metanorma::ISO do
     OUTPUT
   end
 
-  it "processes metadata, corrigendum" do
+  it "processes metadata, corrigendum, published" do
     output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
       = Document title
       Author