isodoc 1.2.2 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae2344f96c7d3a7ca351c911b175bdfcd37e645473398772e736184e4b1efc46
-  data.tar.gz: e0c0d19b58f5fcbe662f737389760119958afa7582ae68c9bc0c5c4dd1539674
+  metadata.gz: c1a16a6af5cb8621eb1dd8e14a2680e7858476d5ffc1007e45566928e9ebaef7
+  data.tar.gz: ef5696d693f602b825457939bfab6f1ccfd827a9f24cbfa975ee6120c603b264
 SHA512:
-  metadata.gz: '0049d33cb7b840af705590e2a7253c8f3bebd6a7fc1dcabb17e61fbfbbcaeab4db2aa741245325bf1e7b5472e166682461e0ad944d75ab079de9f03826bab08b'
-  data.tar.gz: df5c3ac115b0e2493e1c84bf5e51943fd7e22bb2dea6c39d67a310b9873cd719785c4b1987e84d92614d741ae75e6712830d536629c9ab261f27bcd97ec922cd
+  metadata.gz: f3f8718e404915ce3d9d7ad8de1b4f6c0eb6442c930ced3e05c6f1db25ee23324de1783c3fe96e41e86d765a705b7b41df78bd159ff1333f3809ed2682188cc6
+  data.tar.gz: 0ba52d047fb5b1119d1cf485eea60511066f5fec0152222123cedea05f346a7f2276a9ac90aede713d6ae14b3a2be4c5e41267ffdb4ccdff285b5d13350cd26c

data/.github/workflows/rake.yml

@@ -0,0 +1,64 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '2.7'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '2.7'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Use Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Install Inkscape macOS
+        if: matrix.os == 'macos-latest'
+        run: |
+          brew cask install inkscape
+          inkscape --version
+
+      - name: Install Inkscape Ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo add-apt-repository ppa:inkscape.dev/stable
+          sudo apt update
+          sudo apt install inkscape
+          inkscape --version
+
+      - name: Install Inkscape Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          choco install --no-progress -y inkscape
+          inkscape --version
+
+      - name: Update gems
+        run: bundle install --jobs 4 --retry 3
+
+      - name: Run specs
+        run: bundle exec rake

data/isodoc.gemspec

@@ -36,7 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "html2doc", "~> 1.0.0"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
-  spec.add_dependency "metanorma", "~> 1.1.0"
+  spec.add_dependency "metanorma", "~> 1.2.0"
+  spec.add_dependency "relaton-cli"
+  spec.add_dependency "gyoku", "~> 1.3"
 
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "byebug", "~> 9.1"

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -1,6 +1,6 @@
 term_def_boilerplate: 
 scope: Domaine d'application
-symbolabbrev: Symboles et termes abrégés
+symbolsabbrev: Symboles et termes abrégés
 abbrev: Termes abrégés
 symbols: Symboles
 table_of_contents: Sommaire

data/lib/isodoc/base_style/all.css

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }
@@ -104,6 +104,10 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 #standard-band {
   background-color: #0AC442; }
 

data/lib/isodoc/base_style/metanorma_word.css

@@ -16,6 +16,12 @@ td {
 tr {
   page-break-after: avoid; }
 
+table.MsoISOTableBig tr {
+  page-break-inside: auto; }
+
+table.MsoISOTableBig td {
+  page-break-inside: auto; }
+
 span.stem {
   font-family: "Cambria Math",serif;
   mso-ascii-font-family: "Cambria Math";

data/lib/isodoc/base_style/metanorma_word.scss

@@ -13,6 +13,12 @@ table.MsoISOTable tr
 td { page-break-inside:avoid; }
 tr { page-break-after:avoid; }
 
+table.MsoISOTableBig tr
+    {page-break-inside:auto;}
+
+table.MsoISOTableBig td
+    {page-break-inside:auto;}
+
 span.stem
     {font-family:"Cambria Math",serif;
     mso-ascii-font-family:"Cambria Math";

data/lib/isodoc/base_style/reset.css

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }
@@ -103,3 +103,7 @@ b, strong {
 
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
+
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }

data/lib/isodoc/base_style/reset.scss

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0;
@@ -127,3 +127,8 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
+
+a.FootnoteRef + a.FootnoteRef:before {
+    content: ", ";
+    vertical-align: super;
+  }

data/lib/isodoc/convert.rb

@@ -116,20 +116,7 @@ module IsoDoc
     end
 
     # none for this parent gem, but will be populated in child gems 
-    # which have access to stylesheets &c; e.g.
-    # {
-    #      htmlstylesheet: html_doc_path("htmlstyle.scss"),
-    #      htmlcoverpage: html_doc_path("html_rsd_titlepage.html"),
-    #      htmlintropage: html_doc_path("html_rsd_intro.html"),
-    #      scripts: html_doc_path("scripts.html"),
-    #      wordstylesheet: html_doc_path("wordstyle.scss"),
-    #      standardstylesheet: html_doc_path("rsd.scss"),
-    #      header: html_doc_path("header.html"),
-    #      wordcoverpage: html_doc_path("word_rsd_titlepage.html"),
-    #      wordintropage: html_doc_path("word_rsd_intro.html"),
-    #      ulstyle: l3
-    #      olstyle: l2
-    # }
+    # which have access to stylesheets &c
     def default_file_locations(_options)
       {}
     end

data/lib/isodoc/function/blocks.rb

@@ -181,6 +181,7 @@ module IsoDoc::Function
     def quote_attribution(node, out)
       author = node.at(ns("./author"))
       source = node.at(ns("./source"))
+      return if author.nil? && source.nil?
       out.p **{ class: "QuoteAttribution" } do |p|
         p << "&mdash; #{author.text}" if author
         p << ", " if author && source

data/lib/isodoc/function/cleanup.rb

@@ -6,9 +6,9 @@ module IsoDoc::Function
 
     def termref_cleanup(docxml)
       docxml.
+        gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
         gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ").
         gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source}: ")).
-        gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
         gsub(%r{\s*\[\/TERMREF\]\s*}, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
     end

data/lib/isodoc/function/references.rb

@@ -54,7 +54,8 @@ module IsoDoc::Function
     def bibitem_ref_code(b)
       id = b.at(ns("./docidentifier[@type = 'metanorma']"))
       id1 = pref_ref_code(b)
-      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN']")) 
+      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or "\
+                    "@type = 'ISBN']")) 
       return [id, id1, id2] if id || id1 || id2
       id = Nokogiri::XML::Node.new("docidentifier", b.document)
       id << "(NO ID)"
@@ -193,7 +194,8 @@ module IsoDoc::Function
     def bibliography_parse(node, out)
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
-        clause_parse_title(node, div, node.at(ns("./title")), out, { class: "Section3" })
+        clause_parse_title(node, div, node.at(ns("./title")), out,
+                           { class: "Section3" })
         biblio_list(node, div, true)
       end
     end

data/lib/isodoc/function/section.rb

@@ -182,7 +182,6 @@ module IsoDoc::Function
       page_break(out)
       out.div **attr_code(id: f["id"]) do |s|
         clause_name(nil, f.at(ns("./title")), s, { class: "AbstractTitle" })
-        #s.h1(**{ class: "AbstractTitle" }) { |h1| h1 << @i18n.abstract }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end
@@ -201,6 +200,19 @@ module IsoDoc::Function
       end
     end
 
+    def is_clause?(name)
+      %w(clause references definitions terms foreword introduction abstract
+      acknowledgements).include? name
+    end
+
+    def preface_block(isoxml, out)
+      p = isoxml.at(ns("//preface")) or return
+      p.elements.each do |e|
+        next if is_clause?(e.name)
+        parse(e, out)
+      end
+    end
+
     def copyright_parse(node, out)
       out.div **{class: "boilerplate-copyright"} do |div|
         node.children.each { |n| parse(n, div) }

data/lib/isodoc/function/table.rb

@@ -82,6 +82,7 @@ module IsoDoc::Function
     def make_tr_attr(td, row, totalrows, header)
       style = td.name == "th" ? "font-weight:bold;" : ""
       td["align"] and style += "text-align:#{td['align']};"
+      td["valign"] and style += "vertical-align:#{td['valign']};"
       rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
       style += <<~STYLE
         border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}

data/lib/isodoc/function/to_word_html.rb

@@ -80,6 +80,7 @@ module IsoDoc::Function
     def make_body3(body, docxml)
       body.div **{ class: "main-section" } do |div3|
         boilerplate docxml, div3
+        preface_block docxml, div3
         abstract docxml, div3
         foreword docxml, div3
         introduction docxml, div3
@@ -95,6 +96,7 @@ module IsoDoc::Function
       @meta.subtitle isoxml, out
       @meta.docstatus isoxml, out
       @meta.docid isoxml, out
+      @meta.otherid isoxml, out
       @meta.docnumeric isoxml, out
       @meta.doctype isoxml, out
       @meta.author isoxml, out
@@ -103,6 +105,7 @@ module IsoDoc::Function
       @meta.version isoxml, out
       @meta.url isoxml, out
       @meta.keywords isoxml, out
+      @meta.note isoxml, out
       @meta.get
     end
 
@@ -220,6 +223,7 @@ module IsoDoc::Function
         when "feedback-statement" then feedback_parse(node, out)
         when "passthrough" then passthrough_parse(node, out)
         when "variant" then variant_parse(node, out)
+        when "amend" then amend_parse(node, out)
         when "tab" then clausedelimspace(out) # in Presentation XML only
         else
           error_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -184,7 +184,7 @@ module IsoDoc::Function
 
     def labelled_ancestor(node)
       !node.ancestors('example, requirement, recommendation, permission, '\
-                             'table, figure, sourcecode').empty?
+                             'note, table, figure, sourcecode').empty?
     end
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -31,6 +31,7 @@ module IsoDoc::HtmlFunction
     def make_body3(body, docxml)
       body.div **{ class: "main-section" } do |div3|
         boilerplate docxml, div3
+        preface_block docxml, div3
         abstract docxml, div3
         foreword docxml, div3
         introduction docxml, div3

data/lib/isodoc/i18n.rb

@@ -1,6 +1,5 @@
 require "yaml"
 
-# TODO: Cleanup and generalize
 module IsoDoc
   class I18n
     def load_yaml(lang, script, i18nyaml = nil)
@@ -43,55 +42,6 @@ module IsoDoc
       @labels.each do |k, v|
         self.class.send(:define_method, k.downcase) { v }
       end
-=begin
-      @term_def_boilerplate = y["term_def_boilerplate"]
-      @scope_lbl = y["scope"]
-      @symbols_lbl = y["symbols"]
-      @table_of_contents_lbl = y["table_of_contents"]
-      @introduction_lbl = y["introduction"]
-      @foreword_lbl = y["foreword"]
-      @abstract_lbl = y["abstract"]
-      @termsdef_lbl = y["termsdef"]
-      @termsdefsymbols_lbl = y["termsdefsymbols"]
-      @normref_lbl = y["normref"]
-      @bibliography_lbl = y["bibliography"]
-      @clause_lbl = y["clause"]
-      @annex_lbl = y["annex"]
-      @appendix_lbl = y["appendix"]
-      @no_terms_boilerplate = y["no_terms_boilerplate"]
-      @internal_terms_boilerplate = y["internal_terms_boilerplate"]
-      @norm_with_refs_pref = y["norm_with_refs_pref"]
-      @norm_empty_pref = y["norm_empty_pref"]
-      @external_terms_boilerplate = y["external_terms_boilerplate"]
-      @internal_external_terms_boilerplate =
-        y["internal_external_terms_boilerplate"]
-      @note_lbl = y["note"]
-      @note_xref_lbl = y["note_xref"]
-      @termnote_lbl = y["termnote"]
-      @figure_lbl = y["figure"]
-      @list_lbl = y["list"]
-      @formula_lbl = y["formula"]
-      @inequality_lbl = y["inequality"]
-      @table_lbl = y["table"]
-      @key_lbl = y["key"]
-      @example_lbl = y["example"]
-      @example_xref_lbl = y["example_xref"]
-      @where_lbl = y["where"]
-      @wholeoftext_lbl = y["wholeoftext"]
-      @draft_lbl = y["draft_label"]
-      @inform_annex_lbl = y["inform_annex"]
-      @norm_annex_lbl = y["norm_annex"]
-      @modified_lbl = y["modified"]
-      @deprecated_lbl = y["deprecated"]
-      @source_lbl = y["source"]
-      @and_lbl = y["and"]
-      @all_parts_lbl = y["all_parts"]
-      @permission_lbl = y["permission"]
-      @recommendation_lbl = y["recommendation"]
-      @requirement_lbl = y["requirement"]
-      @locality = y["locality"]
-      @admonition = y["admonition"]
-=end
     end
 
     def self.l10n(x, lang = @lang, script = @script)
@@ -116,6 +66,14 @@ module IsoDoc
       end
     end
 
+    def multiple_and(names, andword)
+      return '' if names.empty?
+      return names[0] if names.length == 1
+      (names.length == 2) &&
+        (return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script))
+      l10n(names[0..-2].join(', ') + " #{andword} #{names[-1]}", @lang, @script)
+    end
+
     #module_function :l10n
 
   end

data/lib/isodoc/metadata.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
 require_relative './metadata_date'
+require_relative './metadata_contributor'
 
 module IsoDoc
   class Metadata
-    DATETYPES = %w{published accessed created implemented obsoleted confirmed
-                   updated issued received transmitted copied unchanged
-                   circulated vote-started
-                   vote-ended}.freeze
-
     attr_accessor :fonts_options
 
     def ns(xpath)
@@ -20,7 +16,7 @@ module IsoDoc
     end
 
     def initialize(lang, script, i18n, fonts_options = {})
-      @metadata = {}
+      @metadata = { lang: lang, script: script }
       DATETYPES.each { |w| @metadata["#{w.gsub(/-/, '_')}date".to_sym] = 'XXX' }
       @lang = lang
       @script = script
@@ -42,113 +38,37 @@ module IsoDoc
       @metadata[key] = value
     end
 
-    def extract_person_names(authors)
-      authors.reduce([]) do |ret, a|
-        if a.at(ns('./name/completename'))
-          ret << a.at(ns('./name/completename')).text
-        else
-          fn = []
-          forenames = a.xpath(ns('./name/forename'))
-          forenames.each { |f| fn << f.text }
-          surname = a&.at(ns('./name/surname'))&.text
-          ret << fn.join(' ') + ' ' + surname
-        end
-      end
-    end
+    NOLANG = "[not(@language) or @language = '']".freeze
 
-    def extract_person_affiliations(authors)
-      authors.reduce([]) do |m, a|
-        name = a&.at(ns('./affiliation/organization/name'))&.text
-        location = a&.at(ns('./affiliation/organization/address/'\
-                            'formattedAddress'))&.text
-        m << (!name.nil? && !location.nil? ? "#{name}, #{location}" :
-          (name || location || ''))
-        m
-      end
-    end
-
-    def extract_person_names_affiliations(authors)
-      names = extract_person_names(authors)
-      affils = extract_person_affiliations(authors)
-      ret = {}
-      affils.each_with_index do |a, i|
-        ret[a] ||= []
-        ret[a] << names[i]
-      end
-      ret
-    end
-
-    def personal_authors(isoxml)
-      authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author' "\
-                                "or xmlns:role/@type = 'editor']/person"))
-      set(:authors, extract_person_names(authors))
-      set(:authors_affiliations, extract_person_names_affiliations(authors))
-    end
-
-    def author(xml, _out)
-      personal_authors(xml)
-      agency(xml)
-    end
-
-    def bibdate(isoxml, _out)
-      isoxml.xpath(ns('//bibdata/date')).each do |d|
-        set("#{d['type'].gsub(/-/, '_')}date".to_sym, Common::date_range(d))
-      end
+    def currlang
+      "[@language = '#{@lang}']"
     end
 
     def doctype(isoxml, _out)
-      b = isoxml&.at(ns('//bibdata/ext/doctype'))&.text || return
-      t = b.split(/[- ]/).map(&:capitalize).join(' ')
-      set(:doctype, t)
-    end
-
-    def iso?(org)
-      name = org&.at(ns('./name'))&.text
-      abbrev = org&.at(ns('./abbreviation'))&.text
-      (abbrev == 'ISO' ||
-       name == 'International Organization for Standardization')
-    end
-
-    def agency(xml)
-      agency = ''
-      publisher = []
-      xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/"\
-                   'organization')).each do |org|
-        name = org&.at(ns('./name'))&.text
-        agency1 = org&.at(ns('./abbreviation'))&.text || name
-        publisher << name if name
-        agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
-      end
-      set(:agency, agency.sub(%r{/$}, ''))
-      set(:publisher, multiple_and(publisher, @labels['and']))
-    end
-
-    def multiple_and(names, andword)
-      return '' if names.empty?
-      return names[0] if names.length == 1
-      (names.length == 2) &&
-        (return l10n("#{names[0]} #{andword} #{names[1]}", @lang, @script))
-      l10n(names[0..-2].join(', ') + " #{andword} #{names[-1]}", @lang, @script)
+      b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text || return
+      set(:doctype, status_print(b))
+      b1 = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}"))&.text || b
+      set(:doctype_display, status_print(b1))
     end
 
-    def docstatus(isoxml, _out)
-      docstatus = isoxml.at(ns('//bibdata/status/stage'))
+    def docstatus(xml, _out)
       set(:unpublished, true)
-      if docstatus
-        set(:stage, status_print(docstatus.text))
-        (i = isoxml&.at(ns('//bibdata/status/substage'))&.text) &&
-          set(:substage, i)
-        (i = isoxml&.at(ns('//bibdata/status/iteration'))&.text) &&
-          set(:iteration, i)
-        set(:unpublished, unpublished(docstatus.text))
-        unpublished(docstatus.text) &&
-          set(:stageabbr, stage_abbr(docstatus.text))
-      end
+      return unless s = xml.at(ns("//bibdata/status/stage#{NOLANG}"))
+      s1 = xml.at(ns("//bibdata/status/stage#{currlang}")) || s
+      set(:stage, status_print(s.text))
+      s1 and set(:stage_display, status_print(s1.text))
+      (i = xml&.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
+        set(:substage, i)
+      (i1 = xml&.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
+        set(:substage_display, i1)
+      (i2 = xml&.at(ns('//bibdata/status/iteration'))&.text) and
+        set(:iteration, i2)
+      set(:unpublished, unpublished(s.text))
+      unpublished(s.text) && set(:stageabbr, stage_abbr(s.text))
     end
 
     def stage_abbr(docstatus)
-      status_print(docstatus).split(/ /)
-                             .map { |s| s[0].upcase }.join('')
+      status_print(docstatus).split(/ /).map { |s| s[0].upcase }.join('')
     end
 
     def unpublished(status)
@@ -156,7 +76,7 @@ module IsoDoc
     end
 
     def status_print(status)
-      status.split(/-/).map(&:capitalize).join(' ')
+      status.split(/[- ]/).map(&:capitalize).join(' ')
     end
 
     def docid(isoxml, _out)
@@ -164,18 +84,23 @@ module IsoDoc
       set(:docnumber, dn&.text)
     end
 
+    def otherid(isoxml, _out)
+      dn = isoxml.at(ns('//bibdata/docidentifier[@type = "ISBN"]'))
+      set(:isbn, dn&.text)
+      dn = isoxml.at(ns('//bibdata/docidentifier[@type = "ISBN10"]'))
+      set(:isbn10, dn&.text)
+    end
+
     def docnumeric(isoxml, _out)
       dn = isoxml.at(ns('//bibdata/docnumber'))
       set(:docnumeric, dn&.text)
     end
 
     def draftinfo(draft, revdate)
-      draftinfo = ''
-      if draft
-        draftinfo = " (#{@labels['draft_label']} #{draft}"
-        draftinfo += ", #{revdate}" if revdate
-        draftinfo += ')'
-      end
+      return "" unless draft
+      draftinfo = " (#{@labels['draft_label']} #{draft}"
+      draftinfo += ", #{revdate}" if revdate
+      draftinfo += ')'
       l10n(draftinfo, @lang, @script)
     end
 
@@ -191,7 +116,7 @@ module IsoDoc
     end
 
     def title(isoxml, _out)
-      main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+      main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"))&.text
       set(:doctitle, main)
     end
 
@@ -231,5 +156,13 @@ module IsoDoc
       isoxml.xpath(ns('//bibdata/keyword')).each { |kw| ret << kw.text }
       set(:keywords, ret)
     end
+
+    def note(isoxml, _out)
+      ret = []
+      isoxml.xpath(ns("//bibdata/note[@type = 'title-footnote']")).each do |n|
+        ret << n.text
+      end
+      set(:title_footnote, ret)
+    end
   end
 end