metanorma-iso 1.10.4 → 1.10.5

data/lib/isodoc/iso/index.rb

@@ -5,32 +5,36 @@ module IsoDoc
         %(id="_#{UUIDTools::UUID.random_create}")
       end
 
-      def index(docxml)
-        unless docxml.at(ns("//index"))
-          docxml.xpath(ns("//indexsect")).each(&:remove)
-          return
+      def index(xml)
+        if xml.at(ns("//index"))
+          i = xml.at(ns("//indexsect")) ||
+            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']")),
+                                  xml.xpath(ns("//index-xref[@also = 'true']")))
+          index1(xml, i, index)
+        else xml.xpath(ns("//indexsect")).each(&:remove)
         end
-        i = docxml.at(ns("//indexsect")) ||
-          docxml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}</title></indexsect>").first
-        index = sort_indexterms(docxml.xpath(ns("//index")),
-                                docxml.xpath(ns("//index-xref[@also = 'false']")),
-                                docxml.xpath(ns("//index-xref[@also = 'true']")))
-        index1(docxml, i, index)
       end
 
-      def index1(docxml, i, index)
-        c = i.add_child("<ul></ul>").first
+      def index1(docxml, indexsect, index)
+        c = indexsect.add_child("<ul></ul>").first
         index.keys.sort.each do |k|
-          # c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
           words = index[k].keys.each_with_object({}) do |w, v|
             v[sortable(w).downcase] = w
           end
           words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            # c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
             c.add_child index_entries(words, index[k], w)
           end
         end
-        docxml.xpath(ns("//indexsect//xref")).each { |x| x.children.remove }
+        index1_cleanup(docxml)
+      end
+
+      def index1_cleanup(docxml)
+        docxml.xpath(ns("//indexsect//xref")).each do |x|
+          x.children.remove
+        end
         @xrefs.bookmark_anchor_names(docxml)
       end
 
@@ -56,7 +60,7 @@ module IsoDoc
           end
           ret += "</ul>"
         end
-        ret + "</li>"
+        "#{ret}</li>"
       end
 
       def index_entries2(words, index, secondary)
@@ -75,30 +79,29 @@ module IsoDoc
           end
           ret += "</ul>"
         end
-        ret + "</li>"
+        "#{ret}</li>"
       end
 
       def index_entries_head(head, entries, opt)
         ret = "<li>#{head}"
         xref = entries&.dig(:xref)&.join(", ")
-        see_sort = entries&.dig(:see)&.each_with_object({}) do |w, v|
-          v[sortable(w).downcase] = w
-        end
-        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
-                see_sort[k]
-              end&.join(", ")
-        also_sort = entries&.dig(:also)&.each_with_object({}) do |w, v|
-          v[sortable(w).downcase] = w
-        end
-        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
-                 also_sort[k]
-               end&.join(", ")
+        see = index_entries_see(entries, :see)
+        also = index_entries_see(entries, :also)
         ret += "#{opt[:xref_lbl]} #{xref}" if xref
         ret += "#{opt[:see_lbl]} #{see}" if see
         ret += "#{opt[:also_lbl]} #{also}" if also
         ret
       end
 
+      def index_entries_see(entries, label)
+        see_sort = entries&.dig(label)&.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(", ")
+      end
+
       def see_lbl
         @lang == "en" ? @i18n.see : "<em>#{@i18n.see}</em>"
       end
@@ -119,13 +122,8 @@ module IsoDoc
 
       def extract_indexsee(val, terms, label)
         terms.each_with_object(val) do |t, v|
-          term = t&.at(ns("./primary"))&.children&.to_xml
-          term2 = t&.at(ns("./secondary"))&.children&.to_xml
-          term3 = t&.at(ns("./tertiary"))&.children&.to_xml
-          v[term] ||= {}
-          v[term][term2] ||= {}
-          v[term][term2][term3] ||= {}
-          v[term][term2][term3][label] ||= []
+          term, term2, term3 = extract_indexterms_init(t)
+          term_hash_init(v, term, term2, term3, label)
           v[term][term2][term3][label] << t&.at(ns("./target"))&.children&.to_xml
           t.remove
         end
@@ -138,22 +136,32 @@ module IsoDoc
         end
       end
 
-      # attributes are decoded into UTF-8, elements in extract_indexsee are still in entities
+      # attributes are decoded into UTF-8,
+      # elements in extract_indexsee are still in entities
       def extract_indexterms(terms)
         terms.each_with_object({}) do |t, v|
-          term = t&.at(ns("./primary"))&.children&.to_xml
-          term2 = t&.at(ns("./secondary"))&.children&.to_xml
-          term3 = t&.at(ns("./tertiary"))&.children&.to_xml
+          term, term2, term3 = extract_indexterms_init(t)
           index2bookmark(t)
-          v[term] ||= {}
-          v[term][term2] ||= {}
-          v[term][term2][term3] ||= {}
-          v[term][term2][term3][:xref] ||= []
+          term_hash_init(v, term, term2, term3, :xref)
           to = t["to"] ? "to='#{t['to']}' " : ""
-          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' #{to}pagenumber='true'/>"
+          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' "\
+                                          "#{to}pagenumber='true'/>"
+        end
+      end
+
+      def extract_indexterms_init(term)
+        %w(primary secondary tertiary).each_with_object([]) do |x, m|
+          m << term&.at(ns("./#{x}"))&.children&.to_xml
         end
       end
 
+      def term_hash_init(hash, term, term2, term3, label)
+        hash[term] ||= {}
+        hash[term][term2] ||= {}
+        hash[term][term2][term3] ||= {}
+        hash[term][term2][term3][label] ||= []
+      end
+
       def index2bookmark(node)
         node.name = "bookmark"
         node.children.each(&:remove)

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

@@ -1423,7 +1423,9 @@
 
 	<xsl:template name="getListItemFormat">
 		<xsl:choose>
-			<xsl:when test="local-name(..) = 'ul'">—</xsl:when> <!-- dash -->
+			<xsl:when test="local-name(..) = 'ul'">
+				<xsl:call-template name="setULLabel"/>
+			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists -->
 				<xsl:choose>
 					<xsl:when test="../@type = 'arabic'">
@@ -1545,7 +1547,7 @@
 		</xsl:choose>
 	</xsl:template>
 	
-	<xsl:template match="iso:title">
+	<xsl:template match="iso:title" name="title">
 	
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
@@ -4482,6 +4484,7 @@
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
+		<xsl:apply-templates select="@language"/>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -6689,6 +6692,51 @@
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:variable name="ul_labels_">
+		
+		
+		
+		
+		
+		
+		
+			<label>—</label> <!-- em dash -->
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
+		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level">
+			<xsl:choose>
+				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
+				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 2 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="label" mode="ul_labels">
+		<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
+		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -7168,6 +7216,10 @@
 					</svg>
 				</fo:instream-foreign-object>	
 		</fo:inline>
+	</xsl:template><xsl:template match="@language">
+		<xsl:copy-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
+		<xsl:call-template name="title"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

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

@@ -1423,7 +1423,9 @@
 
 	<xsl:template name="getListItemFormat">
 		<xsl:choose>
-			<xsl:when test="local-name(..) = 'ul'">—</xsl:when> <!-- dash -->
+			<xsl:when test="local-name(..) = 'ul'">
+				<xsl:call-template name="setULLabel"/>
+			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists -->
 				<xsl:choose>
 					<xsl:when test="../@type = 'arabic'">
@@ -1545,7 +1547,7 @@
 		</xsl:choose>
 	</xsl:template>
 	
-	<xsl:template match="iso:title">
+	<xsl:template match="iso:title" name="title">
 	
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
@@ -4482,6 +4484,7 @@
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
+		<xsl:apply-templates select="@language"/>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
@@ -6689,6 +6692,51 @@
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:variable name="ul_labels_">
+		
+		
+		
+		
+		
+		
+		
+			<label>—</label> <!-- em dash -->
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
+		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level">
+			<xsl:choose>
+				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
+				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:when test="$list_level mod 2 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="label" mode="ul_labels">
+		<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
+		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -7168,6 +7216,10 @@
 					</svg>
 				</fo:instream-foreign-object>	
 		</fo:inline>
+	</xsl:template><xsl:template match="@language">
+		<xsl:copy-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
+		<xsl:call-template name="title"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>

data/lib/isodoc/iso/metadata.rb

@@ -21,9 +21,8 @@ module IsoDoc
           stage = "DTS" if stage == "DIS"
           stage = "FDTS" if stage == "FDIS"
         end
-        if %w(PWI NWIP WD CD).include?(stage) && iter
+        %w(PWI NWIP WD CD).include?(stage) && iter and
           stage += iter
-        end
         stage = "Pre#{stage}" if /^0\./.match?(draft)
         stage
       end
@@ -31,20 +30,25 @@ module IsoDoc
       def docstatus(isoxml, _out)
         docstatus = isoxml.at(ns("//bibdata/status/stage"))
         set(:unpublished, false)
-        if docstatus
-          set(:stage, docstatus.text)
-          set(:stage_int, docstatus.text.to_i)
-          set(:unpublished, unpublished(docstatus.text))
-          set(:statusabbr, status_abbrev(docstatus["abbreviation"] || "??",
-                                         isoxml&.at(ns("//bibdata/status/substage"))&.text,
-                                         isoxml&.at(ns("//bibdata/status/iteration"))&.text,
-                                         isoxml&.at(ns("//bibdata/version/draft"))&.text,
-                                         isoxml&.at(ns("//bibdata/ext/doctype"))&.text))
-          unpublished(docstatus.text) and
-            set(:stageabbr, docstatus["abbreviation"])
-        end
         revdate = isoxml.at(ns("//bibdata/version/revision-date"))
         set(:revdate, revdate&.text)
+        if docstatus
+          docstatus1(isoxml, docstatus)
+        end
+      end
+
+      def docstatus1(isoxml, docstatus)
+        set(:stage, docstatus.text)
+        set(:stage_int, docstatus.text.to_i)
+        set(:unpublished, unpublished(docstatus.text))
+        set(:statusabbr,
+            status_abbrev(docstatus["abbreviation"] || "??",
+                          isoxml&.at(ns("//bibdata/status/substage"))&.text,
+                          isoxml&.at(ns("//bibdata/status/iteration"))&.text,
+                          isoxml&.at(ns("//bibdata/version/draft"))&.text,
+                          isoxml&.at(ns("//bibdata/ext/doctype"))&.text))
+        unpublished(docstatus.text) and
+          set(:stageabbr, docstatus["abbreviation"])
       end
 
       def unpublished(status)
@@ -73,8 +77,7 @@ module IsoDoc
 
       def amd_label(lang)
         case lang
-        when "en" then "AMENDMENT"
-        when "fr" then "AMENDMENT"
+        when "en", "fr" then "AMENDMENT"
         end
       end
 
@@ -183,10 +186,10 @@ module IsoDoc
       end
 
       def tc(xml)
-        tc_num = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@number"))
-        tc_type = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@type"))
-          &.text || "TC"
-        if tc_num
+        tc_type = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/"\
+                            "@type"))&.text || "TC"
+        if tc_num = xml.at(ns("//bibdata/ext/editorialgroup/"\
+                              "technical-committee/@number"))
           tcid = "#{tc_type} #{tc_num.text}"
           set(:tc,  tcid)
           set(:editorialgroup, get[:editorialgroup] << tcid)
@@ -195,7 +198,8 @@ module IsoDoc
 
       def sc(xml)
         sc_num = xml.at(ns("//bibdata/ext/editorialgroup/subcommittee/@number"))
-        sc_type = xml.at(ns("//bibdata/ext/editorialgroup/subcommittee/@type"))&.text || "SC"
+        sc_type = xml.at(ns("//bibdata/ext/editorialgroup/subcommittee/"\
+                            "@type"))&.text || "SC"
         if sc_num
           scid = "#{sc_type} #{sc_num.text}"
           set(:sc, scid)
@@ -205,7 +209,8 @@ module IsoDoc
 
       def wg(xml)
         wg_num = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/@number"))
-        wg_type = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/@type"))&.text || "WG"
+        wg_type = xml.at(ns("//bibdata/ext/editorialgroup/workgroup/"\
+                            "@type"))&.text || "WG"
         if wg_num
           wgid = "#{wg_type} #{wg_num.text}"
           set(:wg, wgid)

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -113,28 +113,29 @@ module IsoDoc
       end
 
       def concept(docxml)
-        docxml.xpath(ns("//term//concept")).each_with_object({}) do |f, m|
-          concept_term(f, m)
-        end
+        concept_term(docxml)
         docxml.xpath(ns("//concept")).each do |node|
-          concept_render(node, ital: node["ital"] || "false",
-                               ref: node["ref"] || "false",
-                               linkref: node["linkref"] || "true",
-                               linkmention: node["linkmention"] || "false")
+          concept_render(node, ital: "false", ref: "false",
+                               linkref: "true", linkmention: "false")
+        end
+      end
+
+      def concept_term(docxml)
+        docxml.xpath(ns("//term")).each do |f|
+          m = {}
+          f.xpath(ns(".//concept")).each do |c|
+            concept_term1(c, m)
+          end
         end
       end
 
-      def concept_term(node, seen)
+      def concept_term1(node, seen)
         term = node&.at(ns("./refterm"))&.to_xml
         if term && seen[term]
-          concept_render(node, ital: node["ital"] || "false",
-                               ref: node["ref"] || "false",
-                               linkref: node["linkref"] || "true",
-                               linkmention: node["linkmention"] || "false")
-        else concept_render(node, ital: node["ital"] || "true",
-                                  ref: node["ref"] || "true",
-                                  linkref: node["linkref"] || "true",
-                                  linkmention: node["linkmention"] || "false")
+          concept_render(node, ital: "false", ref: "false",
+                               linkref: "true", linkmention: "false")
+        else concept_render(node, ital: "true", ref: "true",
+                                  linkref: "true", linkmention: "false")
         end
         seen[term] = true if term
         seen
@@ -184,6 +185,30 @@ module IsoDoc
           "<#{d.remove.children.to_xml}> "
       end
 
+      def insertall_after_here(node, insert, name)
+        node.children.each do |n|
+          next unless n.name == name
+
+          insert.next = n.remove
+          insert = n
+        end
+        insert
+      end
+
+      def termexamples_before_termnotes(node)
+        return unless insert = node.at(ns("./definition"))
+
+        insert = insertall_after_here(node, insert, "termexample")
+        insertall_after_here(node, insert, "termnote")
+      end
+
+      def terms(docxml)
+        docxml.xpath(ns("//term[termnote][termexample]")).each do |node|
+          termexamples_before_termnotes(node)
+        end
+        super
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/sts_convert.rb

@@ -20,10 +20,8 @@ module IsoDoc
           end
         FileUtils.rm_rf dir
         MnConvert.convert(in_fname,
-                          {
-                            input_format: MnConvert::InputFormat::MN,
-                            output_file: out_fname || "#{filename}.#{@suffix}",
-                          })
+                          { input_format: MnConvert::InputFormat::MN,
+                            output_file: out_fname || "#{filename}.#{@suffix}" })
       end
     end
   end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.10.4".freeze
+    VERSION = "1.10.5".freeze
   end
 end