metanorma-iso 1.4.0 → 1.5.0

data/lib/isodoc/iso/html/wordstyle.scss

@@ -1391,4 +1391,3 @@ ol
 ul
 	{margin-bottom:0cm;
 	margin-left:18pt;}
-

data/lib/isodoc/iso/html_convert.rb

@@ -1,6 +1,6 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
-require_relative "metadata"
 
 module IsoDoc
   module Iso
@@ -49,6 +49,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iso/i18n.rb

@@ -0,0 +1,19 @@
+module IsoDoc
+  module Iso
+    class I18n < IsoDoc::I18n
+      def load_yaml(lang, script, i18nyaml = nil)
+        y = if i18nyaml then YAML.load_file(i18nyaml)
+            elsif lang == "en"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            elsif lang == "fr"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-fr.yaml"))
+            elsif lang == "zh" && script == "Hans"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+            else
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            end
+        super.merge(y)
+      end
+    end
+  end
+end

data/lib/isodoc/iso/init.rb

@@ -0,0 +1,33 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+require_relative "i18n"
+
+module IsoDoc
+  module Iso
+    module Init
+      def metadata_init(lang, script, i18n)
+        @meta = Metadata.new(lang, script, i18n)
+      end
+
+      def xref_init(lang, script, klass, i18n, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, i18n, options)
+      end
+
+      def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      end
+
+      def amd(docxml)
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        %w(amendment technical-corrigendum).include? doctype
+      end
+
+      def clausedelim
+        ""
+      end
+    end
+  end
+end
+

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

@@ -3996,6 +3996,7 @@
 				<fo:inline padding-right="2mm">
 					
 					
+					
 					<xsl:variable name="title-note">
 						<xsl:call-template name="getTitle">
 							<xsl:with-param name="name" select="'title-note'"/>
@@ -5079,4 +5080,35 @@
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
 		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
+	</xsl:template><xsl:template name="namespaceCheck">
+		<xsl:variable name="documentNS" select="namespace-uri(/*)"/>
+		<xsl:variable name="XSLNS">			
+			
+				<xsl:value-of select="document('')//*/namespace::iso"/>
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+						
+						
+		</xsl:variable>
+		<xsl:if test="$documentNS != $XSLNS">
+			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
+		</xsl:if>
+	</xsl:template><xsl:template name="getLanguage">
+		<xsl:param name="lang"/>		
+		<xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
+		<xsl:choose>
+			<xsl:when test="$language = 'en'">English</xsl:when>
+			<xsl:when test="$language = 'fr'">French</xsl:when>
+			<xsl:when test="$language = 'de'">Deutsch</xsl:when>
+			<xsl:when test="$language = 'cn'">Chinese</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template></xsl:stylesheet>

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

@@ -3996,6 +3996,7 @@
 				<fo:inline padding-right="2mm">
 					
 					
+					
 					<xsl:variable name="title-note">
 						<xsl:call-template name="getTitle">
 							<xsl:with-param name="name" select="'title-note'"/>
@@ -5079,4 +5080,35 @@
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
 		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
+	</xsl:template><xsl:template name="namespaceCheck">
+		<xsl:variable name="documentNS" select="namespace-uri(/*)"/>
+		<xsl:variable name="XSLNS">			
+			
+				<xsl:value-of select="document('')//*/namespace::iso"/>
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+						
+						
+		</xsl:variable>
+		<xsl:if test="$documentNS != $XSLNS">
+			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
+		</xsl:if>
+	</xsl:template><xsl:template name="getLanguage">
+		<xsl:param name="lang"/>		
+		<xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
+		<xsl:choose>
+			<xsl:when test="$language = 'en'">English</xsl:when>
+			<xsl:when test="$language = 'fr'">French</xsl:when>
+			<xsl:when test="$language = 'de'">Deutsch</xsl:when>
+			<xsl:when test="$language = 'cn'">Chinese</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template></xsl:stylesheet>

data/lib/isodoc/iso/metadata.rb

@@ -3,7 +3,7 @@ require "isodoc"
 module IsoDoc
   module Iso
     class  Metadata < IsoDoc::Metadata
-      def initialize(lang, script, labels)
+      def initialize(lang, script, i18n)
         super
         @metadata = {
           tc: "XXXX",

data/lib/isodoc/iso/pdf_convert.rb

@@ -15,7 +15,7 @@ module IsoDoc
 
       def pdf_stylesheet(docxml)
         case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
-        when "amendment", "technical-corrigendum" then "itu.recommendation-annex.xsl"
+        when "amendment", "technical-corrigendum" then "iso.amendment.xsl"
         else
           "iso.international-standard.xsl"
         end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -1,4 +1,4 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -8,6 +8,104 @@ module IsoDoc
     # schema encapsulation of the document for validation
     #
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def initialize(options)
+        super
+      end
+
+      def convert1(docxml, filename, dir)
+        if amd(docxml)
+          @oldsuppressheadingnumbers = @suppressheadingnumbers
+          @suppressheadingnumbers = true
+        end
+        super
+      end
+
+      def annex(isoxml)
+        amd(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
+        super
+        isoxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|
+          clause1(f)
+        end
+        amd(isoxml) and @suppressheadingnumbers = true
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        @xrefs = Xref.new(lang, script, klass, labels, options)
+      end
+
+      def figure1(f)
+        return if labelled_ancestor(f) && f.ancestors("figure").empty?
+        lbl = @xrefs.anchor(f['id'], :label, false) or return
+        figname = f.parent.name == "figure" ? "" : "#{@i18n.figure} "
+        connective = f.parent.name == "figure" ? "&nbsp; " : "&nbsp;&mdash; "
+        prefix_name(f, connective, l10n("#{figname}#{lbl}"), "name")
+      end
+
+      def example1(f)
+        n = @xrefs.get[f["id"]]
+        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @i18n.example :
+          l10n("#{@i18n.example} #{n[:label]}")
+        prefix_name(f, "&nbsp;&mdash; ", lbl, "name")
+      end
+
+      def eref_localities1_zh(target, type, from, to, delim)
+        subsection = from&.text&.match(/\./)
+        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
+        ret += " 第#{from.text}" if from
+        ret += "&ndash;#{to.text}" if to
+        loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize )
+        ret += " #{loc}" unless subsection && type == "clause" ||
+          type == "list" || target.match(/^IEV$|^IEC 60050-/)
+        ret += ")" if type == "list"
+        ret
+      end
+
+      def eref_localities1(target, type, from, to, delim, lang = "en")
+        return "" if type == "anchor"
+        subsection = from&.text&.match(/\./)
+        type = type.downcase
+        lang == "zh" and
+          return l10n(eref_localities1_zh(target, type, from, to, delim))
+        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
+        loc = @i18n.locality[type] || type.sub(/^locality:/, "").capitalize
+        ret += " #{loc}" unless subsection && type == "clause" ||
+          type == "list" || target.match(/^IEV$|^IEC 60050-/)
+        ret += " #{from.text}" if from
+        ret += "&ndash;#{to.text}" if to
+        ret += ")" if type == "list"
+        l10n(ret)
+      end
+
+      def prefix_container(container, linkend, target)
+        delim = @xrefs.anchor(target, :type) == "listitem" ? " " : ", "
+        l10n(@xrefs.anchor(container, :xref) + delim + linkend)
+      end
+
+      def example_span_label(node, div, name)
+        return if name.nil?
+        div.span **{ class: "example_label" } do |p|
+          name.children.each { |n| parse(n, div) }
+        end
+      end
+
+      def clause1(f)
+        if !f.at(ns("./title")) &&
+            !%w(sections preface bibliography).include?(f.parent.name)
+          f["inline-header"] = "true"
+        end
+        super
+      end
+
+      def clause(docxml)
+        docxml.xpath(ns("//clause[not(ancestor::annex)] | "\
+                        "//terms | //definitions | //references | "\
+                        "//preface/introduction[clause]")).
+        each do |f|
+          clause1(f)
+        end
+      end
+
+      include Init
     end
   end
 end

data/lib/isodoc/iso/sections.rb

@@ -37,11 +37,10 @@ module IsoDoc
 
       def introduction(isoxml, out)
         f = isoxml.at(ns("//introduction")) || return
-        num = f.at(ns(".//clause")) ? "0" : nil
         title_attr = { class: "IntroTitle" }
         page_break(out)
         out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(num, @introduction_lbl, div, title_attr)
+          clause_name(nil, f.at(ns("./title")), div, title_attr)
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -52,15 +51,11 @@ module IsoDoc
         f = isoxml.at(ns("//foreword")) || return
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @foreword_lbl }
+          clause_name(nil, f.at(ns("./title")) || @i18n.foreword, s,
+                      { class: "ForewordTitle" })
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
-
-      def clause_parse_title(node, div, c1, out)
-        return inline_header_title(out, node, c1) if c1.nil?
-        super
-      end
     end
   end
 end

data/lib/isodoc/iso/word_convert.rb

@@ -1,6 +1,6 @@
 require_relative "base_convert"
 require "isodoc"
-require_relative "metadata"
+require_relative "init"
 
 module IsoDoc
   module Iso
@@ -121,6 +121,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iso/xref.rb

@@ -21,6 +21,8 @@ module IsoDoc
       # we can reference 0-number clauses in introduction
       def introduction_names(clause)
         return if clause.nil?
+        clause.at(ns("./clause")) and @anchors[clause["id"]] = 
+          { label: "0", level: 1, xref: clause.at(ns("./title"))&.text, type: "clause" }
         clause.xpath(ns("./clause")).each_with_index do |c, i|
           section_names1(c, "0.#{i + 1}", 2)
         end

data/lib/metanorma/iso/processor.rb

@@ -33,10 +33,6 @@ module Metanorma
         "Metanorma::ISO #{Metanorma::ISO::VERSION}"
       end
 
-      def input_to_isodoc(file, filename)
-        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
-      end
-
       def use_presentation_xml(ext)
         return true if ext == :html_alt
         super

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.4.0".freeze
+    VERSION = "1.5.0".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -30,17 +30,18 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.1.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
   spec.add_dependency "tokenizer", "~> 0.3.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "mn2sts", "~> 1.2.0"
 
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake" #, "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "= 0.54.0"
   spec.add_development_dependency "simplecov", "~> 0.15"

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -190,7 +190,7 @@ RSpec.describe Asciidoctor::ISO do
       </p>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative" normative="true">
-        <title>Normative References</title>
+        <title>Normative references</title>
         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -233,7 +233,7 @@ RSpec.describe Asciidoctor::ISO do
         </p>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative" normative="true">
-        <title>Normative References</title>
+        <title>Normative references</title>
         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -333,7 +333,7 @@ RSpec.describe Asciidoctor::ISO do
     INPUT
       #{BLANK_HDR}
       <sections></sections>
-      <bibliography><references id="_" obligation="informative" normative="true"><title>Normative References</title>
+      <bibliography><references id="_" obligation="informative" normative="true"><title>Normative references</title>
       <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
              <bibitem id="iso216" type="standard">
          <title format="text/plain">Reference</title>
@@ -638,7 +638,7 @@ RSpec.describe Asciidoctor::ISO do
       </fn>
       </p>
       </clause></sections><bibliography><references id="_" obligation="informative" normative="true">
-        <title>Normative References</title>
+        <title>Normative references</title>
         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>

data/spec/asciidoctor-iso/inline_spec.rb

@@ -128,7 +128,7 @@ RSpec.describe Asciidoctor::ISO do
        <sections>
 
        </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="ISO712">
          <formattedref format="application/x-isodoc+xml">Reference</formattedref>

data/spec/asciidoctor-iso/refs_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Asciidoctor::ISO do
        #{BLANK_HDR}
        <sections>
               </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -65,7 +65,7 @@ RSpec.describe Asciidoctor::ISO do
   </clause>
 </sections>
       <bibliography><references id="_" obligation="informative" normative="true">
-        <title>Normative References</title>
+        <title>Normative references</title>
         <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
         <bibitem id="iso123" type="standard">
          <title format="text/plain">Standard</title>
@@ -101,7 +101,7 @@ RSpec.describe Asciidoctor::ISO do
               <sections>
 
        </sections><bibliography><references id="_" obligation="informative" normative="true">
-         <title>Normative References</title>
+         <title>Normative references</title>
          <p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
          <bibitem id="iso123">
          <formattedref format="application/x-isodoc+xml">