metanorma-itu 1.0.14 → 1.0.15

data/lib/isodoc/itu/pdf_convert.rb

@@ -13,10 +13,18 @@ module IsoDoc
         super
       end
 
+      def pdf_stylesheet(docxml)
+        case doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        when "resolution" then "itu.resolution.xsl"
+        when "recommendation-annex" then "itu.recommendation-annex.xsl"
+        else
+          "itu.recommendation.xsl"
+        end
+      end
+
       def convert(filename, file = nil, debug = false)
         file = File.read(filename, encoding: "utf-8") if file.nil?
         docxml, outname_html, dir = convert_init(file, filename, debug)
-        resolution = docxml.at(ns("//bibdata/ext[doctype = 'resolution']"))
         /\.xml$/.match(filename) or
           filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
           f.write file
@@ -24,8 +32,7 @@ module IsoDoc
         end
         FileUtils.rm_rf dir
         ::Metanorma::Output::XslfoPdf.new.convert(
-          filename, outname_html + ".pdf",
-          File.join(@libdir, resolution ? "itu.resolution.xsl" : "itu.recommendation.xsl"))
+          filename, outname_html + ".pdf", File.join(@libdir, pdf_stylesheet(docxml)))
       end
     end
   end

data/lib/isodoc/itu/ref.rb

@@ -6,7 +6,7 @@ module IsoDoc
   module ITU
     module BaseConvert
       def norm_ref(isoxml, out, num)
-        q = "//bibliography/references[title = 'References']"
+        q = "//bibliography/references[@normative = 'true']"
         f = isoxml.at(ns(q)) or return num
         out.div do |div|
           num = num + 1

data/lib/isodoc/itu/xref.rb

@@ -15,9 +15,13 @@ module IsoDoc
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
             xref: "#{lbl} #{num}", level: 1 }
-        clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
-          each_with_index do |c, i|
-          annex_names1(c, "#{num}.#{i + 1}", 2)
+        if a = single_annex_special_section(clause)
+          annex_names1(a, "#{num}", 1)
+        else
+          clause.xpath(ns("./clause | ./references | ./terms | ./definitions")).
+            each_with_index do |c, i|
+            annex_names1(c, "#{num}.#{i + 1}", 2)
+          end
         end
         hierarchical_asset_names(clause, num)
       end
@@ -52,8 +56,8 @@ module IsoDoc
           hierarchical_asset_names(d.xpath("//xmlns:preface/child::*"), "Preface") :
           sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
         n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
-        n = section_names(d.at(ns("//bibliography/clause[title = 'References'] | "\
-                                  "//bibliography/references[title = 'References']")), n, 1)
+        n = section_names(d.at(ns("//bibliography/clause[.//references[@normative = 'true']] | "\
+                                  "//bibliography/references[@normative = 'true']")), n, 1)
         n = section_names(d.at(ns("//sections/terms | "\
                                   "//sections/clause[descendant::terms]")), n, 1)
         n = section_names(d.at(ns("//sections/definitions")), n, 1)
@@ -68,10 +72,10 @@ module IsoDoc
       end
 
       MIDDLE_SECTIONS = "//clause[title = 'Scope'] | "\
-          "//foreword | //introduction | //acknowledgements | "\
-          "//references[title = 'References' or title = 'references'] | "\
-          "//sections/terms | //preface/clause | "\
-          "//sections/definitions | //clause[parent::sections]".freeze
+        "//foreword | //introduction | //acknowledgements | "\
+        "//references[@normative = 'true'] | "\
+        "//sections/terms | //preface/clause | "\
+        "//sections/definitions | //clause[parent::sections]".freeze
 
       def middle_section_asset_names(d)
         return super unless @hierarchical_assets
@@ -116,7 +120,7 @@ module IsoDoc
       def sequential_formula_names(clause)
         clause&.first&.xpath(ns(MIDDLE_SECTIONS))&.each do |c|
           if c["id"] && @anchors[c["id"]]
-          hierarchical_formula_names(c, @anchors[c["id"]][:label] || @anchors[c["id"]][:xref] || "???")
+            hierarchical_formula_names(c, @anchors[c["id"]][:label] || @anchors[c["id"]][:xref] || "???")
           else
             hierarchical_formula_names(c, "???")
           end

data/lib/metanorma/itu/processor.rb

@@ -2,8 +2,8 @@ require "metanorma/processor"
 
 module Metanorma
   module ITU
-    def self.pdf_fonts
-      ["Arial", "Courier", "Times New Roman"]
+    def self.fonts_used
+      ["Arial", "Courier New", "Times New Roman"]
     end
 
     class Processor < Metanorma::Processor

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.14"
+    VERSION = "1.0.15"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -275,6 +275,7 @@ files:
 - lib/isodoc/itu/html/wordstyle.scss
 - lib/isodoc/itu/html_convert.rb
 - lib/isodoc/itu/i18n-en.yaml
+- lib/isodoc/itu/itu.recommendation-annex.xsl
 - lib/isodoc/itu/itu.recommendation.xsl
 - lib/isodoc/itu/itu.resolution.xsl
 - lib/isodoc/itu/metadata.rb