isodoc 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 491a322b0df2e6b1c8b4f12e520ca349657a009058b416067acdd5437a16085c
-  data.tar.gz: 1f52844ffdc37875d2b40f8d46f52263abcbe5101c99adaf88d839a28a18ed49
+  metadata.gz: f1edc88536663d06a4d23249a6ec1909148185456f84a427fe2299da8e138ab4
+  data.tar.gz: fd6099657296706882b03eb557f59b242c733415b9d49fe8bf4e3aa73bd67eb8
 SHA512:
-  metadata.gz: ce472eadec9ab44d5739f0e506813cb89cf7de6def2909e8ffd0788cf4fe246bf3433b75c22490528b0287bbfad1e2cc5ca50eeaacdd4156fe9bb32a36e912df
-  data.tar.gz: efb30d195c6a15f97133b76d1d4cac762800fe7620d11a58a2655e7ccd3bc972827d419337cbff13fb7d1c4b96004da7b9d95323ae7d8f6c1eaa07d784f67834
+  metadata.gz: 4112c5b84d25a09e9d701b9735d80e01e9f4bf294288c097524c83e31689dc90c1dd9168e9f70061868d41c032d2b864a96b76b19f0926584a2549a1f5309a63
+  data.tar.gz: b002124056e50a37732ad78fa9e959658b0f07c9f5af9d248f69c0d282cc74804471124fc4b7f150ba19935e3aa904df0d54222fb201e279d6325ebfffe9def8

data/.github/workflows/rake.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         with:
           path: vendor/bundle
           key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}

data/lib/isodoc/base_style/blocks.scss

@@ -50,7 +50,7 @@
   }
 
   background-color: $colorBg;
-  font-size: 0.8em;
+  font-size: $monospacefontsize;
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
@@ -68,7 +68,7 @@
   }
 
   background-color: $colorBg;
-  font-size: 0.8em;
+  font-size: $monospacefontsize;
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;

data/lib/isodoc/base_style/typography.scss

@@ -56,7 +56,7 @@
 
   &, th, td {
     border: $border;
-    font-size: 0.95em;
+    font-size: 0.95em; // NN 20201115: ??? normalfontsize - 0.05?
   }
   th, td {
     padding: 1em;

data/lib/isodoc/convert.rb

@@ -3,6 +3,7 @@ require "isodoc/common"
 require "fileutils"
 require "tempfile"
 require_relative "i18n"
+require_relative "css"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
@@ -17,6 +18,10 @@ module IsoDoc
     # wordcoverpage: Cover page for Word
     # htmlintropage: Introductory page for HTML
     # wordintropage: Introductory page for Word
+    # normalfontsize: Font size for body text
+    # smallerfontsize: Font size for smaller than body text
+    # monospacefontsize: Font size for monospace font
+    # footnotefontsize: Font size for footnotes
     # i18nyaml: YAML file for internationalisation of text
     # ulstyle: list style in Word CSS for unordered lists
     # olstyle: list style in Word CSS for ordered lists
@@ -25,8 +30,10 @@ module IsoDoc
     # monospace: font to use for monospace text
     # suppressheadingnumbers: suppress heading numbers for clauses
     # scripts: Scripts file for HTML
-    # scripts_pdf: Scripts file for PDF
+    # scripts_pdf: Scripts file for PDF (not used in XSLT PDF)
     # datauriimage: Encode images in HTML output as data URIs
+    # break_up_urls_in_tables: whether to insert spaces in URLs in tables
+    #   every 40-odd chars
     def initialize(options)
       @libdir ||= File.dirname(__FILE__)
       options.merge!(default_fonts(options)) do |_, old, new|
@@ -46,6 +53,10 @@ module IsoDoc
       @wordcoverpage = options[:wordcoverpage]
       @htmlintropage = options[:htmlintropage]
       @wordintropage = options[:wordintropage]
+      @normalfontsize = options[:normalfontsize]
+      @smallerfontsize = options[:smallerfontsize]
+      @monospacefontsize = options[:monospacefontsize]
+      @footnotefontsize = options[:footnotefontsize]
       @scripts = options[:scripts]
       @scripts_pdf = options[:scripts_pdf]
       @i18nyaml = options[:i18nyaml]
@@ -80,62 +91,10 @@ module IsoDoc
       @fn_bookmarks = {}
     end
 
-    # Check if already compiled version(.css) exists,
-    #   if not, return original scss file. During release
-    #   we compile scss into css files in order to not depend on scss
-    def precompiled_style_or_original(stylesheet_path)
-      # Already have compiled stylesheet, use it
-      return stylesheet_path if stylesheet_path.nil? ||
-                                File.extname(stylesheet_path) == '.css'
-
-      basename = File.basename(stylesheet_path, '.*')
-      compiled_path = File.join(File.dirname(stylesheet_path),
-                                "#{basename}.css")
-      return stylesheet_path unless File.file?(compiled_path)
-
-      compiled_path
-    end
-
-    # run this after @meta is populated
-    def populate_css
-      @htmlstylesheet = generate_css(@htmlstylesheet_name, true)
-      @wordstylesheet = generate_css(@wordstylesheet_name, false)
-      @standardstylesheet = generate_css(@standardstylesheet_name, false)
-    end
-
     def tmpimagedir_suffix
       '_images'
     end
 
-    def default_fonts(_options)
-      {
-        bodyfont: 'Arial',
-        headerfont: 'Arial',
-        monospacefont: 'Courier'
-      }
-    end
-
-    # none for this parent gem, but will be populated in child gems 
-    # which have access to stylesheets &c
-    def default_file_locations(_options)
-      {}
-    end
-
-    def fonts_options
-      {
-        'bodyfont' => options[:bodyfont] || 'Arial',
-        'headerfont' => options[:headerfont] || 'Arial',
-        'monospacefont' => options[:monospacefont] || 'Courier'
-      }
-    end
-
-    def scss_fontheader
-      b = options[:bodyfont] || 'Arial'
-      h = options[:headerfont] || 'Arial'
-      m = options[:monospacefont] || 'Courier'
-      "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
-    end
-
     def html_doc_path(*file)
       file.each do |f|
         ret = File.join(@libdir, File.join('html', f))
@@ -144,37 +103,6 @@ module IsoDoc
       nil
     end
 
-    def convert_scss(filename, stylesheet)
-      require 'sassc'
-      require 'isodoc/sassc_importer'
-
-      [File.join(Gem.loaded_specs['isodoc'].full_gem_path,
-                 'lib', 'isodoc'),
-                 File.dirname(filename)].each do |name|
-                   SassC.load_paths << name
-                 end
-                 SassC::Engine.new(scss_fontheader + stylesheet, syntax: :scss,
-                                   importer: SasscImporter)
-                   .render
-    end
-
-    def generate_css(filename, stripwordcss)
-      return nil if filename.nil?
-
-      filename = precompiled_style_or_original(filename)
-      stylesheet = File.read(filename, encoding: 'UTF-8')
-      stylesheet = populate_template(stylesheet, :word)
-      stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, '\\1') if stripwordcss
-      if File.extname(filename) == '.scss'
-        stylesheet = convert_scss(filename, stylesheet)
-      end
-      Tempfile.open([File.basename(filename, '.*'), 'css'],
-                    encoding: 'utf-8') do |f|
-        f.write(stylesheet)
-        f
-      end
-    end
-
     def convert1(docxml, filename, dir)
       @xrefs.parse docxml
       noko do |xml|

data/lib/isodoc/css.rb

@@ -0,0 +1,95 @@
+module IsoDoc
+  class Convert < ::IsoDoc::Common
+    # Check if already compiled version(.css) exists,
+    #   if not, return original scss file. During release
+    #   we compile scss into css files in order to not depend on scss
+    def precompiled_style_or_original(stylesheet_path)
+      # Already have compiled stylesheet, use it
+      return stylesheet_path if stylesheet_path.nil? ||
+        File.extname(stylesheet_path) == '.css'
+      basename = File.basename(stylesheet_path, '.*')
+      compiled_path = File.join(File.dirname(stylesheet_path),
+                                "#{basename}.css")
+      return stylesheet_path unless File.file?(compiled_path)
+      compiled_path
+    end
+
+    # run this after @meta is populated
+    def populate_css
+      @htmlstylesheet = generate_css(@htmlstylesheet_name, true)
+      @wordstylesheet = generate_css(@wordstylesheet_name, false)
+      @standardstylesheet = generate_css(@standardstylesheet_name, false)
+    end
+
+    def default_fonts(_options)
+      {
+        bodyfont: 'Arial',
+        headerfont: 'Arial',
+        monospacefont: 'Courier',
+      }
+    end
+
+    # none for this parent gem, but will be populated in child gems
+    # which have access to stylesheets &c
+    def default_file_locations(_options)
+      {}
+    end
+
+    def fonts_options
+      {
+        'bodyfont' => options[:bodyfont] || 'Arial',
+        'headerfont' => options[:headerfont] || 'Arial',
+        'monospacefont' => options[:monospacefont] || 'Courier',
+        "normalfontsize" => options[:normalfontsize],
+        "monospacefontsize" => options[:monospacefontsize],
+        "smallerfontsize" => options[:smallerfontsize],
+        "footnotefontsize" => options[:footnotefontsize] 
+      }
+    end
+
+    def scss_fontheader(is_html_css)
+      b = options[:bodyfont] || 'Arial'
+      h = options[:headerfont] || 'Arial'
+      m = options[:monospacefont] || 'Courier'
+      ns = options[:normalfontsize] || (is_html_css ? "1.0em" : '12.0pt')
+      ms = options[:monospacefontsize] || (is_html_css ? "0.8em" : '11.0pt')
+      ss = options[:smallerfontsize] || (is_html_css ? "0.9em" : '10.0pt')
+      fs = options[:footnotefontsize] || (is_html_css ? "0.9em" : '9.0pt')
+      "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"\
+        "$normalfontsize: #{ns};\n$monospacefontsize: #{ms};\n"\
+        "$smallerfontsize: #{ss};\n$footnotefontsize: #{fs};\n"
+    end
+
+    def convert_scss(filename, stylesheet, stripwordcss)
+      require 'sassc'
+      require 'isodoc/sassc_importer'
+
+      [File.join(Gem.loaded_specs['isodoc'].full_gem_path,
+                 'lib', 'isodoc'),
+                 File.dirname(filename)].each do |name|
+                   SassC.load_paths << name
+                 end
+                 SassC::Engine.new(scss_fontheader(stripwordcss) + stylesheet,
+                                   syntax: :scss, importer: SasscImporter)
+                   .render
+    end
+
+    # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet
+    def generate_css(filename, stripwordcss)
+      return nil if filename.nil?
+
+      filename = precompiled_style_or_original(filename)
+      stylesheet = File.read(filename, encoding: 'UTF-8')
+      stylesheet = populate_template(stylesheet, :word)
+      stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, '\\1') if stripwordcss
+      if File.extname(filename) == '.scss'
+        stylesheet = convert_scss(filename, stylesheet, stripwordcss)
+      end
+      Tempfile.open([File.basename(filename, '.*'), 'css'],
+                    encoding: 'utf-8') do |f|
+        f.write(stylesheet)
+        f
+      end
+    end
+  end
+end

data/lib/isodoc/function/lists.rb

@@ -38,7 +38,8 @@ module IsoDoc::Function
     end
 
     def ol_attrs(node)
-      { type: ol_depth(node), id: node["id"], style: keep_style(node) }
+      { type: node["type"] ? ol_style(node["type"].to_sym) : ol_depth(node),
+        id: node["id"], style: keep_style(node) }
     end
 
     def ol_parse(node, out)

data/lib/isodoc/function/references.rb

@@ -80,7 +80,8 @@ module IsoDoc::Function
     end
 
     def docid_prefix(prefix, docid)
-      docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix)
+      docid = "#{prefix} #{docid}" if prefix && !omit_docid_prefix(prefix) &&
+        !/^#{prefix}\b/.match(docid)
       docid_l10n(docid)
     end
 
@@ -111,7 +112,7 @@ module IsoDoc::Function
     # reference not to be rendered because it is deemed implicit
     # in the standards environment
     def implicit_reference(b)
-      false
+      b["hidden"] == "true"
     end
 
     def prefix_bracketed_ref(ref, text)
@@ -160,7 +161,7 @@ module IsoDoc::Function
     end
 
     def norm_ref(isoxml, out, num)
-      f = isoxml.at(ns(norm_ref_xpath)) or return num
+      f = isoxml.at(ns(norm_ref_xpath)) and f["hidden"] != "true" or return num
       out.div do |div|
         num = num + 1
         clause_name(num, f.at(ns("./title")), div, nil)
@@ -180,10 +181,9 @@ module IsoDoc::Function
     end
 
     def bibliography(isoxml, out)
-      f = isoxml.at(ns(bibliography_xpath)) || return
+      f = isoxml.at(ns(bibliography_xpath)) and f["hidden"] != "true" or return
       page_break(out)
       out.div do |div|
-        #div.h1 @bibliography_lbl, **{ class: "Section3" }
         div.h1 **{class: "Section3"} do |h1|
           f&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
         end
@@ -192,6 +192,7 @@ module IsoDoc::Function
     end
 
     def bibliography_parse(node, out)
+      node["hidden"] != true or return
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
         clause_parse_title(node, div, node.at(ns("./title")), out,
@@ -202,15 +203,9 @@ module IsoDoc::Function
 
     def format_ref(ref, prefix, isopub, date, allparts)
       ref = docid_prefix(prefix, ref)
-      return "[#{ref}]" if /^\d+$/.match(ref) && !prefix &&
+      return "[#{ref}]" if ref && /^\d+$/.match(ref) && !prefix &&
         !/^\[.*\]$/.match(ref)
         ref
     end
-
-    # def ref_names(ref)
-    #  linkend = ref.text
-    # linkend.gsub!(/[\[\]]/, "") unless /^\[\d+\]$/.match linkend
-    # @anchors[ref["id"]] = { xref: linkend }
-    # end
   end
 end

data/lib/isodoc/html_function/postprocess.rb

@@ -186,14 +186,22 @@ module IsoDoc::HtmlFunction
       docxml
     end
 
+    def footnote_backlinks1(x, fn)
+      xdup = x.dup
+      xdup.remove["id"]
+      if fn.elements.empty?
+        fn.children.first.previous = xdup
+      else
+        fn.elements.first.children.first.previous = xdup
+      end
+    end
+
     def footnote_backlinks(docxml)
       seen = {}
       docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
         seen[x["href"]] and next or seen[x["href"]] = true
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-        xdup = x.dup
-        xdup.remove["id"]
-        fn.elements.first.children.first.previous = xdup
+        footnote_backlinks1(x, fn)
         x["id"] ||= "fnref:#{i + 1}"
         fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
       end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -25,13 +25,13 @@ module IsoDoc
       hash_translate(b, @i18n.get["substage_dict"], "./status/substage")
     end
 
-    def hash_translate(bibdata, hash, xpath)
+    def hash_translate(bibdata, hash, xpath, lang = @lang)
       x = bibdata.at(ns(xpath)) or return
       x["language"] = ""
       hash.is_a? Hash or return
       hash[x.text] or return
       x.next = x.dup
-      x.next["language"] = @lang
+      x.next["language"] = lang
       x.next.children = hash[x.text]
     end
 
@@ -40,7 +40,7 @@ module IsoDoc
     end
 
     def i18n_safe(k)
-      k.gsub(/\s|\./, "_")
+      k.to_s.gsub(/\s|\./, "_")
     end
 
     def i8n_name(h, pref)

data/lib/isodoc/presentation_function/inline.rb

@@ -164,14 +164,16 @@ module IsoDoc
     def localize_maths(f, locale)
       f.xpath(".//m:mn", MATHML).each do |x|
         num = /\./.match(x.text) ? x.text.to_f : x.text.to_i
-        x.children = localized_number(num, locale)
+        precision = /\./.match(x.text) ? x.text.sub(/^.*\./, "").size : 0
+        x.children = localized_number(num, locale, precision)
       end
     end
 
     # By itself twiiter cldr does not support fraction part digits grouping
     # and custom delimeter, will decorate fraction part manually
-    def localized_number(num, locale)
-      localized = num.localize(locale).to_s
+    def localized_number(num, locale, precision)
+      localized = precision == 0 ? num.localize(locale).to_s :
+        num.localize(locale).to_decimal.to_s(:precision => precision)
       twitter_cldr_reader_symbols = twitter_cldr_reader(locale)
       return localized unless twitter_cldr_reader_symbols[:decimal]
       integer, fraction = localized.split(twitter_cldr_reader_symbols[:decimal])

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.8".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/isodoc/word_convert.rb

@@ -4,26 +4,6 @@ require_relative "word_function/body.rb"
 require_relative "word_function/postprocess.rb"
 
 module IsoDoc
-
-=begin
-  module WordConvertModule
-    # http://tech.tulentsev.com/2012/02/ruby-how-to-override-class-method-with-a-module/
-    # https://www.ruby-forum.com/topic/148303
-    #
-    # The following is ugly indeed, but the only way I can split module override methods
-    # across files
-    def self.included base
-      base.class_eval do
-
-        eval File.open(File.join(File.dirname(__FILE__),"wordconvertmodule.rb")).read
-        eval File.open(File.join(File.dirname(__FILE__),"comments.rb")).read
-        eval File.open(File.join(File.dirname(__FILE__),"footnotes.rb")).read
-        eval File.open(File.join(File.dirname(__FILE__),"postprocess.rb")).read
-      end
-    end
-  end
-=end
-
   class WordConvert < ::IsoDoc::Convert
     include WordFunction::Comments
     include WordFunction::Footnotes

data/lib/isodoc/xref/xref_counter.rb

@@ -2,8 +2,8 @@ require "roman-numerals"
 
 module IsoDoc::XrefGen
   class Counter
-    def initialize
-      @num = 0
+    def initialize(num = 0)
+      @num = num
       @letter = ""
       @subseq = ""
       @letter_override = nil
@@ -76,13 +76,24 @@ module IsoDoc::XrefGen
       "#{@base}#{@number_override || @num}#{@letter_override || @letter}"
     end
 
-    def listlabel(depth)
-      return @num.to_s if [2, 7].include? depth
-      return (96 + @num).chr.to_s if [1, 6].include? depth
-      return (64 + @num).chr.to_s if [4, 9].include? depth
-      return RomanNumerals.to_roman(@num).downcase if [3, 8].include? depth
-      return RomanNumerals.to_roman(@num).upcase if [5, 10].include? depth
-      return @num.to_s
+    def ol_type(list, depth)
+      return list["type"].to_sym if list["type"]
+      return :arabic if [2, 7].include? depth
+      return :alphabet if [1, 6].include? depth
+      return :alphabet_upper if [4, 9].include? depth
+      return :roman if [3, 8].include? depth
+      return :roman_upper if [5, 10].include? depth
+      return :arabic
+    end
+
+    def listlabel(list, depth)
+      case ol_type(list, depth)
+      when :arabic then @num.to_s
+      when :alphabet then (96 + @num).chr.to_s
+      when :alphabet_upper then (64 + @num).chr.to_s
+      when :roman then RomanNumerals.to_roman(@num).downcase
+      when :roman_upper then RomanNumerals.to_roman(@num).upcase
+      end
     end
   end
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -123,9 +123,9 @@ module IsoDoc::XrefGen
     end
 
     def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
-      c = Counter.new
+      c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
       list.xpath(ns("./li")).each do |li|
-        label = c.increment(li).listlabel(depth)
+        label = c.increment(li).listlabel(list, depth)
         label = "#{prev_label}.#{label}" unless prev_label.empty?
         label = "#{list_anchor[:xref]} #{label}" if refer_list
         li["id"] and @anchors[li["id"]] =

data/spec/assets/html.scss

@@ -3,4 +3,18 @@
 
 p {
   font-family: $bodyfont;
+  font-size: $normalfontsize;
+}
+code {
+  font-family: $monospacefont;
+  font-size: $monospacefontsize;
+}
+aside {
+  font-size: $footnotefontsize;
+}
+h1 {
+  font-family: $headerfont;
+}
+p.note {
+  font-size: $smallerfontsize;
 }

data/spec/isodoc/lists_spec.rb

@@ -203,7 +203,7 @@ RSpec.describe IsoDoc do
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <ol type="a" id="_ae34a226-aab4-496d-987b-1aa7b6314026">
+                 <ol type="I" id="_ae34a226-aab4-496d-987b-1aa7b6314026">
          <li id="_ae34a226-aab4-496d-987b-1aa7b6314027">
            <p id="_0091a277-fb0e-424a-aea8-f0001303fe78">all information necessary for the complete identification of the sample;</p>
          </li>

data/spec/isodoc/postproc_spec.rb

@@ -139,7 +139,7 @@ expect(File.exist?("test.doc")).to be true
   it "generates HTML output docs with complete configuration" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::HtmlConvert.new({bodyfont: "Zapf", htmlstylesheet: "spec/assets/html.scss", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
+    IsoDoc::HtmlConvert.new({bodyfont: "Zapf", monospacefont: "Consolas", headerfont: "Comic Sans", normalfontsize: "30pt", monospacefontsize: "29pt", smallerfontsize: "28pt", footnotefontsize: "27pt", htmlstylesheet: "spec/assets/html.scss", htmlcoverpage: "spec/assets/htmlcover.html", htmlintropage: "spec/assets/htmlintro.html", scripts: "spec/assets/scripts.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -150,7 +150,13 @@ expect(File.exist?("test.doc")).to be true
     INPUT
     html = File.read("test.html")
     expect(html).to match(/another empty stylesheet/)
-    expect(html).to match(/font-family: Zapf/)
+    expect(html).to match(/p \{[^}]*?font-family: Zapf/m)
+    expect(html).to match(/code \{[^}]*?font-family: Consolas/m)
+    expect(html).to match(/h1 \{[^}]*?font-family: Comic Sans/m)
+    expect(html).to match(/p \{[^}]*?font-size: 30pt/m)
+    expect(html).to match(/code \{[^}]*?font-size: 29pt/m)
+    expect(html).to match(/p\.note \{[^}]*?font-size: 28pt/m)
+    expect(html).to match(/aside \{[^}]*?font-size: 27pt/m)
     expect(html).to match(/an empty html cover page/)
     expect(html).to match(/an empty html intro page/)
     expect(html).to match(/This is > a script/)
@@ -172,7 +178,13 @@ expect(File.exist?("test.doc")).to be true
     INPUT
     html = File.read("test.html")
     expect(html).to match(/another empty stylesheet/)
-    expect(html).to match(/font-family: Arial/)
+    expect(html).to match(/p \{[^}]*?font-family: Arial/m)
+    expect(html).to match(/code \{[^}]*?font-family: Courier/m)
+    expect(html).to match(/h1 \{[^}]*?font-family: Arial/m)
+    expect(html).to match(/p \{[^}]*?font-size: 1em;/m)
+    expect(html).to match(/code \{[^}]*?font-size: 0.8em/m)
+    expect(html).to match(/p\.note \{[^}]*?font-size: 0.9em/m)
+    expect(html).to match(/aside \{[^}]*?font-size: 0.9em/m)
     expect(html).to match(/an empty html cover page/)
     expect(html).to match(/an empty html intro page/)
     expect(html).to match(/This is > a script/)
@@ -183,7 +195,7 @@ expect(File.exist?("test.doc")).to be true
   it "generates Word output docs with complete configuration" do
     FileUtils.rm_f "test.doc"
     FileUtils.rm_f "test.html"
-    IsoDoc::WordConvert.new({bodyfont: "Zapf", wordstylesheet: "spec/assets/html.scss", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
+    IsoDoc::WordConvert.new({bodyfont: "Zapf", monospacefont: "Consolas", headerfont: "Comic Sans", normalfontsize: "30pt", monospacefontsize: "29pt", smallerfontsize: "28pt", footnotefontsize: "27pt", wordstylesheet: "spec/assets/html.scss", standardstylesheet: "spec/assets/std.css", header: "spec/assets/header.html", wordcoverpage: "spec/assets/wordcover.html", wordintropage: "spec/assets/wordintro.html", i18nyaml: "spec/assets/i18n.yaml", ulstyle: "l1", olstyle: "l2"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -194,7 +206,13 @@ expect(File.exist?("test.doc")).to be true
     INPUT
     word = File.read("test.doc")
     expect(word).to match(/another empty stylesheet/)
-    expect(word).to match(/font-family: Zapf/)
+    expect(word).to match(/p \{[^}]*?font-family: Zapf/m)
+    expect(word).to match(/code \{[^}]*?font-family: Consolas/m)
+    expect(word).to match(/h1 \{[^}]*?font-family: Comic Sans/m)
+    expect(word).to match(/p \{[^}]*?font-size: 30pt/m)
+    expect(word).to match(/code \{[^}]*?font-size: 29pt/m)
+    expect(word).to match(/p\.note \{[^}]*?font-size: 28pt/m)
+    expect(word).to match(/aside \{[^}]*?font-size: 27pt/m)
     expect(word).to match(/a third empty stylesheet/)
     #expect(word).to match(/<title>test<\/title>/)
     expect(word).to match(/test_files\/header.html/)
@@ -217,7 +235,13 @@ expect(File.exist?("test.doc")).to be true
     INPUT
     word = File.read("test.doc")
     expect(word).to match(/another empty stylesheet/)
-    expect(word).to match(/font-family: Arial/)
+    expect(word).to match(/p \{[^}]*?font-family: Arial/m)
+    expect(word).to match(/code \{[^}]*?font-family: Courier/m)
+    expect(word).to match(/h1 \{[^}]*?font-family: Arial/m)
+    expect(word).to match(/p \{[^}]*?font-size: 12pt/m)
+    expect(word).to match(/code \{[^}]*?font-size: 11pt/m)
+    expect(word).to match(/p\.note \{[^}]*?font-size: 10pt/m)
+    expect(word).to match(/aside \{[^}]*?font-size: 9pt/m)
     expect(word).to match(/a third empty stylesheet/)
     #expect(word).to match(/<title>test<\/title>/)
     expect(word).to match(/test_files\/header.html/)
@@ -512,7 +536,7 @@ TOCLEVEL
   <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">This is a footnote.</p>
 </fn><clause id="N" inline-header="false" obligation="normative">
          <title>Introduction to this<fn reference="2">
-  <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6">Formerly denoted as 15 % (m/m).</p>
+  Formerly denoted as 15 % (m/m).
 </fn></title>
        </clause>
        <clause id="O" inline-header="false" obligation="normative">
@@ -548,7 +572,7 @@ TOCLEVEL
                </a>This is a footnote.</p>
        <a href="#fnref:1">&#x21A9;</a></aside>
              <aside id="fn:2" class="footnote">
-         <p id="_ff27c067-2785-4551-96cf-0a73530ff1e6"><a class='FootnoteRef' href='#fn:2'><sup>2</sup></a>Formerly denoted as 15 % (m/m).</p>
+         <a class='FootnoteRef' href='#fn:2'><sup>2</sup></a>Formerly denoted as 15 % (m/m).
        <a href="#fnref:2">&#x21A9;</a></aside>
            </main>
     OUTPUT

data/spec/isodoc/presentation_xml_spec.rb

@@ -494,7 +494,7 @@ it "customises localisation of numbers" do
         </bibdata>
         <preface>
         <p><stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mn>30000</mn></math></stem>
-        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>1</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
+        <stem type="MathML"><math xmlns="http://www.w3.org/1998/Math/MathML"><mi>P</mi><mfenced open="(" close=")"><mrow><mi>X</mi><mo>≥</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mfenced><mo>=</mo><munderover><mrow><mo>∑</mo></mrow><mrow><mrow><mi>j</mi><mo>=</mo><msub><mrow><mi>X</mi></mrow><mrow><mo>max</mo></mrow></msub></mrow></mrow><mrow><mn>1000</mn></mrow></munderover><mfenced open="(" close=")"><mtable><mtr><mtd><mn>1000</mn></mtd></mtr><mtr><mtd><mi>j</mi></mtd></mtr></mtable></mfenced><msup><mrow><mi>p</mi></mrow><mrow><mi>j</mi></mrow></msup><msup><mrow><mfenced open="(" close=")"><mrow><mn>0.0000032</mn><mo>−</mo><mi>p</mi></mrow></mfenced></mrow><mrow><mrow><mn>1.003</mn><mo>−</mo><mi>j</mi></mrow></mrow></msup></math></stem></p>
         </preface>
    </iso-standard>
   INPUT
@@ -573,7 +573,7 @@ it "customises localisation of numbers" do
                    <mrow>
                      <mfenced open='(' close=')'>
                        <mrow>
-                         <mn>1</mn>
+                         <mn>0,0000032</mn>
                          <mo>&#x2212;</mo>
                          <mi>p</mi>
                        </mrow>

data/spec/isodoc/ref_spec.rb

@@ -63,7 +63,7 @@ RSpec.describe IsoDoc do
 </bibitem>
 <bibitem id="ref1">
   <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
-  <docidentifier type="ICC">167</docidentifier>
+  <docidentifier type="ICC">ICC/167</docidentifier>
 </bibitem>
 <note><p>This is an annotation of ISO 20483:2013-2014</p></note>
     <bibitem id="zip_ffs"><formattedref format="application/x-isodoc+xml">Title 5</formattedref><docidentifier type="metanorma">[5]</docidentifier></bibitem>
@@ -136,7 +136,7 @@ RSpec.describe IsoDoc do
                 <eref bibitemid='ISBN'>[1]</eref>
                 <eref bibitemid='ISSN'>[2]</eref>
                 <eref bibitemid='ISO16634'>ISO 16634:-- (all parts)</eref>
-                <eref bibitemid='ref1'>ICC 167</eref>
+                <eref bibitemid='ref1'>ICC/167</eref>
                 <eref bibitemid='ref10'>[10]</eref>
                 <eref bibitemid='ref12'>Citn</eref>
                 <eref bibitemid='zip_ffs'>[5]</eref>
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
                   <link target='http://www.icc.or.at'/>
                   )
                 </formattedref>
-                <docidentifier type='ICC'>167</docidentifier>
+                <docidentifier type='ICC'>ICC/167</docidentifier>
               </bibitem>
               <note>
                 <name>NOTE</name>
@@ -309,7 +309,7 @@ RSpec.describe IsoDoc do
           <a href='#ISBN'>[1]</a>
           <a href='#ISSN'>[2]</a>
           <a href='#ISO16634'>ISO 16634:-- (all parts)</a>
-          <a href='#ref1'>ICC 167</a>
+          <a href='#ref1'>ICC/167</a>
           <a href='#ref10'>[10]</a>
           <a href='#ref12'>Citn</a>
           <a href='#zip_ffs'>[5]</a>
@@ -342,7 +342,7 @@ RSpec.describe IsoDoc do
           <i>Cereals and pulses</i>
         </p>
         <p id='ref1' class='NormRef'>
-          ICC 167,
+          ICC/167,
           <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
           .
           <i>
@@ -424,4 +424,322 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
   end
 
+
+    it "processes hidden references sections in Relaton bibliographies" do
+    presxml = <<~PRESXML
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+          <bibdata>
+            <language current="true">en</language>
+          </bibdata>
+          <preface>
+            <foreword>
+              <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                <eref bibitemid='ISO712'>[110]</eref>
+                <eref bibitemid='ISBN'>[1]</eref>
+                <eref bibitemid='ISSN'>[2]</eref>
+                <eref bibitemid='ISO16634'>ISO 16634:-- (all parts)</eref>
+                <eref bibitemid='ref1'>ICC/167</eref>
+                <eref bibitemid='ref10'>[10]</eref>
+                <eref bibitemid='ref12'>Citn</eref>
+                <eref bibitemid='zip_ffs'>[5]</eref>
+              </p>
+            </foreword>
+          </preface>
+          <bibliography>
+            <references id='_normative_references' obligation='informative' normative='true' hidden="true">
+            <title depth='1'>1.<tab/>Normative References</title>
+              <p>
+                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' type='standard'>
+                <title format='text/plain'>Cereals or cereal products</title>
+                <title type='main' format='text/plain'>Cereals and cereal products</title>
+                <docidentifier type='ISO'>ISO 712</docidentifier>
+                <docidentifier type='metanorma'>[110]</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ISO16634' type='standard'>
+                <title language='x' format='text/plain'>
+                  Cereals, pulses, milled cereal products, xxxx, oilseeds and animal
+                  feeding stuffs
+                </title>
+                <title language='en' format='text/plain'>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+                <docidentifier type='ISO'>ISO 16634:-- (all parts)</docidentifier>
+                <date type='published'>
+                  <on>--</on>
+                </date>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+                <note format='text/plain' type='Unpublished-Status' reference='1'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+                <extent type='part'>
+                  <referenceFrom>all</referenceFrom>
+                </extent>
+              </bibitem>
+              <bibitem id='ISO20483' type='standard'>
+                <title format='text/plain'>Cereals and pulses</title>
+                <docidentifier type='ISO'>ISO 20483:2013-2014</docidentifier>
+                <date type='published'>
+                  <from>2013</from>
+                  <to>2014</to>
+                </date>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ref1'>
+                <formattedref format='application/x-isodoc+xml'>
+                  <smallcap>Standard No I.C.C 167</smallcap>
+                  .
+                  <em>
+                    Determination of the protein content in cereal and cereal products
+                    for food and animal feeding stuffs according to the Dumas combustion
+                    method
+                  </em>
+                   (see
+                  <link target='http://www.icc.or.at'/>
+                  )
+                </formattedref>
+                <docidentifier type='ICC'>ICC/167</docidentifier>
+              </bibitem>
+              <note>
+                <name>NOTE</name>
+                <p>This is an annotation of ISO 20483:2013-2014</p>
+              </note>
+              <bibitem id='zip_ffs'>
+                <formattedref format='application/x-isodoc+xml'>Title 5</formattedref>
+                <docidentifier type='metanorma'>[5]</docidentifier>
+              </bibitem>
+            </references>
+            <references id='_bibliography' obligation='informative' normative='false' hidden="true">
+              <title depth="1">Bibliography</title>
+              <bibitem id='ISBN' type='ISBN'>
+                <title format='text/plain'>Chemicals for analytical laboratory use</title>
+                <docidentifier type='ISBN'>ISBN</docidentifier>
+                <docidentifier type='metanorma'>[1]</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISBN</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ISSN' type='ISSN'>
+                <title format='text/plain'>Instruments for analytical laboratory use</title>
+                <docidentifier type='ISSN'>ISSN</docidentifier>
+                <docidentifier type='metanorma'>[2]</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISSN</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <note>
+                <name>NOTE</name>
+                <p>This is an annotation of document ISSN.</p>
+              </note>
+              <note>
+                <name>NOTE</name>
+                <p>This is another annotation of document ISSN.</p>
+              </note>
+              <bibitem id='ISO3696' type='standard'>
+                <title format='text/plain'>Water for analytical laboratory use</title>
+                <docidentifier type='ISO'>ISO 3696</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ref10'>
+                <formattedref format='application/x-isodoc+xml'>
+                  <smallcap>Standard No I.C.C 167</smallcap>
+                  .
+                  <em>
+                    Determination of the protein content in cereal and cereal products
+                    for food and animal feeding stuffs according to the Dumas combustion
+                    method
+                  </em>
+                   (see
+                  <link target='http://www.icc.or.at'/>
+                  )
+                </formattedref>
+                <docidentifier type='metanorma'>[10]</docidentifier>
+              </bibitem>
+              <bibitem id='ref11'>
+                <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
+                <docidentifier type='IETF'>RFC 10</docidentifier>
+              </bibitem>
+              <bibitem id='ref12'>
+                <formattedref format='application/x-isodoc+xml'>
+                  CitationWorks. 2019.
+                  <em>How to cite a reference</em>
+                  .
+                </formattedref>
+                <docidentifier type='metanorma'>[Citn]</docidentifier>
+                <docidentifier type='IETF'>RFC 20</docidentifier>
+              </bibitem>
+            </references>
+          </bibliography>
+        </iso-standard>
+        PRESXML
+
+        html = <<~OUTPUT
+    #{HTML_HDR}
+<br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                 <a href='#ISO712'>[110]</a>
+                 <a href='#ISBN'>[1]</a>
+                 <a href='#ISSN'>[2]</a>
+                 <a href='#ISO16634'>ISO 16634:-- (all parts)</a>
+                 <a href='#ref1'>ICC/167</a>
+                 <a href='#ref10'>[10]</a>
+                 <a href='#ref12'>Citn</a>
+                 <a href='#zip_ffs'>[5]</a>
+               </p>
+             </div>
+             <p class='zzSTDTitle1'/>
+           </div>
+         </body>
+       </html>
+
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+  end
+
+     it "processes hidden references sections in Relaton bibliographies" do
+    presxml = <<~PRESXML
+        <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
+          <bibdata>
+            <language current="true">en</language>
+          </bibdata>
+          <preface>
+            <foreword>
+              <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                <eref bibitemid='ISO712'>[110]</eref>
+                <eref bibitemid='ISBN'>[1]</eref>
+                <eref bibitemid='ISSN'>[2]</eref>
+                <eref bibitemid='ISO16634'>ISO 16634:-- (all parts)</eref>
+                <eref bibitemid='ref1'>ICC/167</eref>
+                <eref bibitemid='ref10'>[10]</eref>
+                <eref bibitemid='ref12'>Citn</eref>
+                <eref bibitemid='zip_ffs'>[5]</eref>
+              </p>
+            </foreword>
+          </preface>
+          <bibliography>
+            <references id='_normative_references' obligation='informative' normative='true'>
+            <title depth='1'>1.<tab/>Normative References</title>
+              <p>
+                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' type='standard' hidden="true">
+                <title format='text/plain'>Cereals or cereal products</title>
+                <title type='main' format='text/plain'>Cereals and cereal products</title>
+                <docidentifier type='ISO'>ISO 712</docidentifier>
+                <docidentifier type='metanorma'>[110]</docidentifier>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <name>International Organization for Standardization</name>
+                  </organization>
+                </contributor>
+              </bibitem>
+              <bibitem id='ISO16634' type='standard'>
+                <title language='x' format='text/plain'>
+                  Cereals, pulses, milled cereal products, xxxx, oilseeds and animal
+                  feeding stuffs
+                </title>
+                <title language='en' format='text/plain'>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
+                <docidentifier type='ISO'>ISO 16634:-- (all parts)</docidentifier>
+                <date type='published'>
+                  <on>--</on>
+                </date>
+                <contributor>
+                  <role type='publisher'/>
+                  <organization>
+                    <abbreviation>ISO</abbreviation>
+                  </organization>
+                </contributor>
+                <note format='text/plain' type='Unpublished-Status' reference='1'>Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
+                <extent type='part'>
+                  <referenceFrom>all</referenceFrom>
+                </extent>
+              </bibitem>
+</references></bibliography></iso-standard>
+PRESXML
+
+html = <<~OUTPUT
+    #{HTML_HDR}
+<br/>
+             <div>
+               <h1 class='ForewordTitle'>Foreword</h1>
+               <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
+                 <a href='#ISO712'>[110]</a>
+                 <a href='#ISBN'>[1]</a>
+                 <a href='#ISSN'>[2]</a>
+                 <a href='#ISO16634'>ISO 16634:-- (all parts)</a>
+                 <a href='#ref1'>ICC/167</a>
+                 <a href='#ref10'>[10]</a>
+                 <a href='#ref12'>Citn</a>
+                 <a href='#zip_ffs'>[5]</a>
+               </p>
+             </div>
+             <p class='zzSTDTitle1'/>
+             <div>
+  <h1>1.&#160; Normative References</h1>
+  <p>
+     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>
+  <p id='ISO16634' class='NormRef'>
+    ISO 16634:-- (all parts)
+    <a class='FootnoteRef' href='#fn:1'>
+      <sup>1</sup>
+    </a>
+    ,
+    <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
+  </p>
+</div>
+<aside id='fn:1' class='footnote'>
+  <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
+</aside>
+
+           </div>
+         </body>
+       </html>
+
+    OUTPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
+  end
+
+
 end
+
+

data/spec/isodoc/xref_spec.rb

@@ -2313,7 +2313,7 @@ OUTPUT
   <li id="N1"><p>A</p></li>
 </ol>
   <clause id="xyz"><title>Preparatory</title>
-     <ol id="N02">
+     <ol id="N02" type="arabic">
   <li id="N2"><p>A</p></li>
 </ol>
 </clause>
@@ -2321,17 +2321,17 @@ OUTPUT
     </preface>
     <sections>
     <clause id="scope" type="scope"><title>Scope</title>
-    <ol id="N0">
+    <ol id="N0" type="roman">
   <li id="N"><p>A</p></li>
 </ol>
     </clause>
     <terms id="terms"/>
     <clause id="widgets"><title>Widgets</title>
     <clause id="widgets1">
-    <ol id="note1l">
+    <ol id="note1l" type="alphabet">
   <li id="note1"><p>A</p></li>
 </ol>
-    <ol id="note2l">
+    <ol id="note2l" type="roman_upper">
   <li id="note2"><p>A</p></li>
 </ol>
     </clause>
@@ -2339,12 +2339,12 @@ OUTPUT
     </sections>
     <annex id="annex1">
     <clause id="annex1a">
-    <ol id="ANl">
+    <ol id="ANl" type="alphabet_upper">
   <li id="AN"><p>A</p></li>
 </ol>
     </clause>
     <clause id="annex1b">
-    <ol id="Anote1l">
+    <ol id="Anote1l" type="roman" start="4">
   <li id="Anote1"><p>A</p></li>
 </ol>
     <ol id="Anote2l">
@@ -2360,12 +2360,12 @@ OUTPUT
             <foreword>
               <p>
                 <xref target='N1'>Introduction, a)</xref>
-                <xref target='N2'>Preparatory, a)</xref>
-                <xref target='N'>Clause 1, a)</xref>
+                <xref target='N2'>Preparatory, 1)</xref>
+                <xref target='N'>Clause 1, i)</xref>
                 <xref target='note1'>Clause 3.1, List 1 a)</xref>
-                <xref target='note2'>Clause 3.1, List 2 a)</xref>
-                <xref target='AN'>Annex A.1, a)</xref>
-                <xref target='Anote1'>Annex A.2, List 1 a)</xref>
+                <xref target='note2'>Clause 3.1, List 2 I)</xref>
+                <xref target='AN'>Annex A.1, A)</xref>
+                <xref target='Anote1'>Annex A.2, List 1 iv)</xref>
                 <xref target='Anote2'>Annex A.2, List 2 a)</xref>
               </p>
             </foreword>
@@ -2377,7 +2377,7 @@ OUTPUT
               </ol>
               <clause id='xyz'>
                 <title depth='2'>Preparatory</title>
-                <ol id='N02'>
+                <ol id='N02' type="arabic">
                   <li id='N2'>
                     <p>A</p>
                   </li>
@@ -2392,7 +2392,7 @@ OUTPUT
   <tab/>
   Scope
 </title>
-              <ol id='N0'>
+              <ol id='N0' type="roman">
                 <li id='N'>
                   <p>A</p>
                 </li>
@@ -2408,12 +2408,12 @@ OUTPUT
   Widgets
 </title>
               <clause id='widgets1'><title>3.1.</title>
-                <ol id='note1l'>
+                <ol id='note1l' type="alphabet">
                   <li id='note1'>
                     <p>A</p>
                   </li>
                 </ol>
-                <ol id='note2l'>
+                <ol id='note2l' type="roman_upper">
                   <li id='note2'>
                     <p>A</p>
                   </li>
@@ -2428,14 +2428,14 @@ OUTPUT
   (informative)
 </title>
             <clause id='annex1a'><title>A.1.</title>
-              <ol id='ANl'>
+              <ol id='ANl' type="alphabet_upper">
                 <li id='AN'>
                   <p>A</p>
                 </li>
               </ol>
             </clause>
             <clause id='annex1b'><title>A.2.</title>
-              <ol id='Anote1l'>
+              <ol id='Anote1l' type="roman" start="4">
                 <li id='Anote1'>
                   <p>A</p>
                 </li>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -352,6 +352,7 @@ files:
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
 - lib/isodoc/convert.rb
+- lib/isodoc/css.rb
 - lib/isodoc/function.rb
 - lib/isodoc/function/blocks.rb
 - lib/isodoc/function/blocks_example_note.rb