Merge pull request #550 from metanorma/fix/i18n-yaml-inheritance

Fix/i18n yaml inheritance
metanorma · Nov 29, 2023 · 2c4f4fa · 2c4f4fa
2 parents 7c87979 + 034e767
commit 2c4f4fa
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 47 deletions.
diff --git a/lib/isodoc/i18n.rb b/lib/isodoc/i18n.rb
@@ -7,23 +7,26 @@ module IsoDoc
   class I18n
     Hash.include Metanorma::Utils::Hash
 
-    def load_yaml1(lang, script)
+    def yaml_lang(lang, script)
       case lang
       when "en", "fr", "ru", "de", "es", "ar", "ja"
-        load_yaml2(lang)
+        lang
       when "zh"
-        if script == "Hans" then load_yaml2("zh-Hans")
-        else load_yaml2("en")
-        end
-      else
-        load_yaml2("en")
+        "#{lang}-#{script}"
       end
     end
 
+    def load_yaml1(lang, script)
+      load_yaml2(yaml_lang(lang, script))
+    end
+
     def load_yaml2(str)
-      YAML.load_file(File.join(File.dirname(__FILE__),
-                               "../isodoc-yaml/i18n-#{str}.yaml"))
+      f = File.join(File.dirname(__FILE__),
+                    "../isodoc-yaml/i18n-#{str}.yaml")
+      File.exist?(f) or
+        f = File.join(File.dirname(__FILE__),
+                      "../isodoc-yaml/i18n-en.yaml")
+      YAML.load_file(f)
     end
   end
 end
-
diff --git a/lib/isodoc/presentation_function/bibdata.rb b/lib/isodoc/presentation_function/bibdata.rb
@@ -15,10 +15,10 @@ def bibdata(docxml)
         "</localized-strings>"
     end
 
-    def extension_insert(docxml, path = [])
-      ins = docxml.at(ns("//metanorma-extension")) ||
-        docxml.at(ns("//bibdata"))&.after("<metanorma-extension/>")&.next_element ||
-        docxml.root.elements.first.before("<metanorma-extension/>").previous_element
+    def extension_insert(xml, path = [])
+      ins = xml.at(ns("//metanorma-extension")) ||
+        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")&.next_element ||
+        xml.root.elements.first.before("<metanorma-extension/>").previous_element
       path.each do |n|
         ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
       end
@@ -39,24 +39,24 @@ def passthrough_xslt
       @output_formats.empty? and return nil
       @output_formats.each_key.with_object([]) do |k, m|
         m << <<~XSLT
-<preprocess-xslt format="#{k}">
-  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
-    <xsl:strip-space elements="*"/>
-    <xsl:template match="@* | node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@* | node()"/>
-    </xsl:copy>
-  </xsl:template>
-    <xsl:template match="*[local-name() = 'passthrough']">
-      <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
-    <xsl:copy>
-        <xsl:apply-templates select="@* | node()"/>
-    </xsl:copy>
-      </xsl:if>
-    </xsl:template>
-  </xsl:stylesheet>
-</preprocess-xslt>
+          <preprocess-xslt format="#{k}">
+            <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
+              <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
+              <xsl:strip-space elements="*"/>
+              <xsl:template match="@* | node()">
+              <xsl:copy>
+                <xsl:apply-templates select="@* | node()"/>
+              </xsl:copy>
+            </xsl:template>
+              <xsl:template match="*[local-name() = 'passthrough']">
+                <xsl:if test="contains(@formats,',#{k},')"> <!-- delimited -->
+              <xsl:copy>
+                  <xsl:apply-templates select="@* | node()"/>
+              </xsl:copy>
+                </xsl:if>
+              </xsl:template>
+            </xsl:stylesheet>
+          </preprocess-xslt>
         XSLT
       end.join("\n")
     end
@@ -67,8 +67,7 @@ def preprocess_xslt_read
     end
 
     def toc_metadata(docxml)
-      return unless @tocfigures || @toctables || @tocrecommendations
-
+      @tocfigures || @toctables || @tocrecommendations or return
       ins = extension_insert(docxml)
       @tocfigures and
         ins << "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
@@ -89,8 +88,7 @@ def address_precompose(bib)
     end
 
     def fonts_metadata(xmldoc)
-      return unless @fontist_fonts
-
+      @fontist_fonts or return
       ins = xmldoc.at(ns("//presentation-metadata")) ||
         xmldoc.at(ns("//metanorma-extension")) || xmldoc.at(ns("//bibdata"))
       CSV.parse_line(@fontist_fonts, col_sep: ";").map(&:strip).each do |f|
@@ -144,9 +142,10 @@ def hash_translate(bibdata, hash, xpath, lang = @lang)
     def edition_translate(bibdata)
       x = bibdata.at(ns("./edition")) or return
       /^\d+$/.match?(x.text) or return
+      @i18n.edition_ordinal or return
+      edn = edition_translate1(x.text.to_i) or return
       tag_translate(x, @lang,
-                    @i18n.edition_ordinal.sub(/%(Spellout|Ordinal)?/,
-                                              edition_translate1(x.text.to_i)))
+                    @i18n.edition_ordinal.sub(/%(Spellout|Ordinal)?/, edn))
     end
 
     def edition_translate1(num)

diff --git a/lib/isodoc/presentation_function/inline.rb b/lib/isodoc/presentation_function/inline.rb
@@ -1,4 +1,5 @@
 require "metanorma-utils"
+require "csv"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -126,16 +127,18 @@ def passthrough1(elem, formats)
       elem["formats"] = ",#{elem['formats']},"
     end
 
-    private
-
     def extract_custom_charsets(docxml)
-      docxml.xpath(ns("//presentation-metadata/custom-charset-font")).
-        each_with_object({}) do |x, m|
-          kv = x.text.split(":", 2)
+      docxml.xpath(ns("//presentation-metadata/custom-charset-font"))
+        .each_with_object({}) do |line, m|
+        line.text.split(",").map(&:strip).each do |x|
+          kv = x.split(":", 2)
           m[kv[0]] = kv[1]
         end
+      end
     end
 
+    private
+
     def found_matching_variant_sibling(node)
       prev = node.xpath("./preceding-sibling::xmlns:variant")
       foll = node.xpath("./following-sibling::xmlns:variant")

diff --git a/spec/isodoc/presentation_xml_spec.rb b/spec/isodoc/presentation_xml_spec.rb
@@ -1844,17 +1844,15 @@
   it "realises custom charsets" do
     input = <<~INPUT
       <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic">
-      <presentation-metadata><custom-charset-font>weather:"OGC Weather Symbols"</custom-charset-font></presentation-metadata>
-      <presentation-metadata><custom-charset-font>conscript:"Code 2000"</custom-charset-font></presentation-metadata>
+      <presentation-metadata><custom-charset-font>weather:"OGC Weather Symbols",conscript:"Code 2000"</custom-charset-font></presentation-metadata>
         <preface>
           <foreword id="A">
             <p id="_214f7090-c6d4-8fdc-5e6a-837ebb515871"><span custom-charset="weather">ﶀ</span></p>
        </foreword></preface></standard-document>
     INPUT
     presxml = <<~OUTPUT
            <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="presentation">
-       <presentation-metadata><custom-charset-font>weather:"OGC Weather Symbols"</custom-charset-font></presentation-metadata>
-       <presentation-metadata><custom-charset-font>conscript:"Code 2000"</custom-charset-font></presentation-metadata>
+       <presentation-metadata><custom-charset-font>weather:"OGC Weather Symbols",conscript:"Code 2000"</custom-charset-font></presentation-metadata>
          <preface><clause type="toc" id="_" displayorder="1"><title depth="1">Table of contents</title></clause>
 
            <foreword id="A" displayorder="2">