isodoc 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a7c100c4751a8d8bfe69eeaf31614c74bfeec4c56d188fd0d4a6a16c09d3257
-  data.tar.gz: '0858086207425a9c38bb6f12fba1a219599c4c7e469aea40e4f29255f152333b'
+  metadata.gz: ba10d3ff61b6c99d2251fd1d8e868bf09aea5dde1da505bc1745003778f8750d
+  data.tar.gz: b758cac0f031d6a16c95ba8dd05c963bf227438d64d63f1f3146dd745d5c42e9
 SHA512:
-  metadata.gz: bc74e409e73b0b63f5a609e44b0a90a88cf4e83253604cbf6634f62b9c6ff12cccdc40fa2399acd4c373c44d3748ff311828890f319fc508c35e4993c88ff800
-  data.tar.gz: b6f7d0abe389ee3c0342fbdd862f0671bc94959eb9f7b3755e51c7aac1aad74e65127b8819f5b3f310a8e2c2ede29dd663642f9a16e12b5fdf563dd9e2e9bb4f
+  metadata.gz: 1ba1187b3202d8b8ef7d8c0376ba6cd100230a0cbe889cfaa729510f174cdbfba884b2ca2b5607525b53391b83a007313e21427539aa8c42d604d295b90feb3b
+  data.tar.gz: 0b15b2d4bee5c08e2a0989eba6909d37827f67943eb8f0e86f9815f202ca7f408955b1905c7d041e32ae1433ddc1fa99e7fdecf4bf49c0174ee194731104135f

data/isodoc.gemspec

@@ -43,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "relaton-cli"
   spec.add_dependency "relaton-render", "~> 0.5.2"
   spec.add_dependency "roman-numerals"
+  spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"

data/lib/isodoc/base_style/typography.scss

@@ -24,8 +24,11 @@
     background: $colorHighlightBg;
     box-shadow: 3px 0 0 $colorHighlightBg, -3px 0 0 $colorHighlightBg;
   }
-  ::selection,
-  ::-moz-selection {
+  *::selection {
+    background: $colorHighlightBg;
+    color: $colorHighlightFg;
+  }
+  *::-moz-selection {
     background: $colorHighlightBg;
     color: $colorHighlightFg;
   }

data/lib/isodoc/convert.rb

@@ -11,7 +11,8 @@ require "mn-requirements"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
-    attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models, :requirements_processor
+    attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models,
+                  :requirements_processor
 
     # htmlstylesheet: Generic stylesheet for HTML
     # htmlstylesheet_override: Override stylesheet for HTML
@@ -48,6 +49,7 @@ module IsoDoc
     # fonts: fontist fonts to install
     # fontlicenseagreement: fontist font license agreement
     # modspecidentifierbase: base prefix for any Modspec identifiers
+    # sourcehighlighter: whether to apply sourcecode highlighting
     def initialize(options) # rubocop:disable Lint/MissingSuper
       @options = options_preprocess(options)
       init_stylesheets(@options)
@@ -76,10 +78,11 @@ module IsoDoc
       @suppressheadingnumbers = options[:suppressheadingnumbers]
       @break_up_urls_in_tables = options[:breakupurlsintables]
       @sectionsplit = options[:sectionsplit] == "true"
-      @suppressasciimathdup = options[:suppressasciimathdup] == "true"
+      @suppressasciimathdup = options[:suppressasciimathdup]
       @bare = options[:bare]
       @aligncrosselements = options[:aligncrosselements]
       @modspecidentifierbase = options[:modspecidentifierbase]
+      @sourcehighlighter = options[:sourcehighlighter]
     end
 
     def init_i18n(options)
@@ -207,7 +210,7 @@ module IsoDoc
       docxml.root.default_namespace = ""
       convert_i18n_init(docxml)
       metadata_init(@lang, @script, @locale, @i18n)
-      xref_init(@lang, @script, self, @i18n, {locale: @locale})
+      xref_init(@lang, @script, self, @i18n, { locale: @locale })
       [docxml, filename, dir]
     end
 
@@ -235,7 +238,7 @@ module IsoDoc
     end
 
     def middle_clause(_docxml = nil)
-      "//clause[parent::sections][not(@type = 'scope')]"\
+      "//clause[parent::sections][not(@type = 'scope')]" \
         "[not(descendant::terms)]"
     end
 

data/lib/isodoc/function/blocks.rb

@@ -75,7 +75,7 @@ module IsoDoc
       def sourcecode_parse(node, out)
         name = node.at(ns("./name"))
         out.p **sourcecode_attrs(node) do |div|
-          @sourcecode = true
+          @sourcecode = true unless node.at(ns(".//sourcecode"))
           node.children.each { |n| parse(n, div) unless n.name == "name" }
           @sourcecode = false
         end

data/lib/isodoc/function/inline.rb

@@ -17,12 +17,12 @@ module IsoDoc
       def location_parse(node, out); end
 
       def span_parse(node, out)
-        if node["style"]
-          out.span **{ style: node["style"] } do |s|
+        if node["style"] || node["class"]
+          out.span **attr_code(style: node["style"],
+                               class: node["class"]) do |s|
             node.children.each { |n| parse(n, s) }
           end
-        else
-          node.children.each { |n| parse(n, out) }
+        else node.children.each { |n| parse(n, out) }
         end
       end
 

data/lib/isodoc/function/references.rb

@@ -10,60 +10,59 @@ module IsoDoc
         text
       end
 
-      def nonstd_bibitem(list, bib, ordinal, biblio)
+      def nonstd_bibitem(list, bib, _ordinal, biblio) # %%%
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
-          ids = bibitem_ref_code(bib)
-          idents = render_identifier(ids)
-          if biblio then ref_entry_code(ref, ordinal, idents, ids)
-          else
-            ref << (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
-            ref << ", #{idents[sdo]}" if idents[:ordinal] && idents[:sdo]
-          end
-          ref << "," if idents[:sdo]
-          ref << " "
+          #           ids = bibitem_ref_code(bib)
+          #           idents = render_identifier(ids)
+          #           if biblio then ref_entry_code(ref, ordinal, idents, ids)
+          #           else
+          #             ref << (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
+          #             ref << ", #{idents[sdo]}" if idents[:ordinal] && idents[:sdo]
+          #           end
+          #           ref << "," if idents[:sdo]
+          tag = bib.at(ns("./biblio-tag"))
+          tag&.children&.each { |n| parse(n, ref) }
           reference_format(bib, ref)
         end
       end
 
-      def std_bibitem_entry(list, bib, ordinal, biblio)
+      def std_bibitem_entry(list, bib, _ordinal, biblio) # %%%
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
-          idents = render_identifier(bibitem_ref_code(bib))
-          if biblio then ref_entry_code(ref, ordinal, idents, nil)
-          else
-            ref << (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
-            ref << ", #{idents[:sdo]}" if (idents[:ordinal] ||
-                                          idents[:metanorma]) && idents[:sdo]
-          end
-          date_note_process(bib, ref)
-          ref << "," if idents[:sdo]
-          ref << " "
+          #           idents = render_identifier(bibitem_ref_code(bib))
+          #           if biblio then ref_entry_code(ref, ordinal, idents, nil)
+          #           else
+          #             ref << (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
+          #             ref << ", #{idents[:sdo]}" if (idents[:ordinal] ||
+          #                                           idents[:metanorma]) && idents[:sdo]
+          #           end
+          #           date_note_process(bib, ref)
+          #           ref << "," if idents[:sdo]
+          tag = bib.at(ns("./biblio-tag"))
+          tag&.children&.each { |n| parse(n, ref) }
           reference_format(bib, ref)
         end
       end
 
-      # if ids is just a number, only use that ([1] Non-Standard)
-      # else, use both ordinal, as prefix, and ids
-      def ref_entry_code(ref, ordinal, ids, _id)
-        prefix_bracketed_ref(ref, ids[:ordinal] || ids[:metanorma] ||
-                             "[#{ordinal}]")
-        ids[:sdo] and ref << (ids[:sdo]).to_s
-      end
+      #       # if ids is just a number, only use that ([1] Non-Standard)
+      #       # else, use both ordinal, as prefix, and ids
+      #       def ref_entry_code(ref, ordinal, ids, _id) #%%%
+      #         prefix_bracketed_ref(ref, ids[:ordinal] || ids[:metanorma] ||
+      #                              "[#{ordinal}]")
+      #         ids[:sdo] and ref << (ids[:sdo]).to_s
+      #       end
 
-      def pref_ref_code(bib)
-        return nil if bib["suppress_identifier"] == "true"
+      SKIP_DOCID = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or " \
+                   "@type = 'metanorma-ordinal' or @type = 'ISBN'".freeze
 
-        ret = bib.xpath(ns("./docidentifier[@primary = 'true'][@language = '#{@lang}']"))
+      def pref_ref_code(bib)
+        bib["suppress_identifier"] == "true" and return nil
+        lang = "[@language = '#{@lang}']"
+        ret = bib.xpath(ns("./docidentifier[@primary = 'true']#{lang}"))
         ret.empty? and
           ret = bib.xpath(ns("./docidentifier[@primary = 'true']"))
         ret.empty? and
-          ret = bib.at(ns(<<~XPATH,
-            ./docidentifier[not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN')][@language = '#{@lang}']
-          XPATH
-                         )) ||
-            bib.at(ns(<<~XPATH,
-              ./docidentifier[not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN')]
-            XPATH
-                     ))
+          ret = bib.at(ns("./docidentifier[not(#{SKIP_DOCID})]#{lang}")) ||
+            bib.at(ns("./docidentifier[not(#{SKIP_DOCID})]"))
         ret
       end
 
@@ -123,14 +122,6 @@ module IsoDoc
           .include? prefix
       end
 
-      def date_note_process(bib, ref)
-        date_note = bib.at(ns("./note[@type = 'Unpublished-Status']"))
-        return if date_note.nil?
-
-        date_note.children = "<p>#{date_note.content}</p>"
-        footnote_parse(date_note, ref)
-      end
-
       def iso_bibitem_entry_attrs(bib, biblio)
         { id: bib["id"], class: biblio ? "Biblio" : "NormRef" }
       end
@@ -141,11 +132,6 @@ module IsoDoc
         bib["hidden"] == "true"
       end
 
-      def prefix_bracketed_ref(ref, text)
-        ref << text.to_s
-        insert_tab(ref, 1)
-      end
-
       def reference_format(bib, out)
         ftitle = bib.at(ns("./formattedref"))
         ftitle&.children&.each { |n| parse(n, out) }

data/lib/isodoc/function/table.rb

@@ -13,7 +13,7 @@ module IsoDoc
         if thead
           table.thead do |h|
             thead.element_children.each_with_index do |n, i|
-              tr_parse(n, h, i, thead.element_children.size, true)
+              tr_parse(n, h, i, thead.xpath(ns("./tr")).size, true)
             end
           end
         end
@@ -23,7 +23,7 @@ module IsoDoc
         tbody = node.at(ns("./tbody")) || return
         table.tbody do |h|
           tbody.element_children.each_with_index do |n, i|
-            tr_parse(n, h, i, tbody.element_children.size, false)
+            tr_parse(n, h, i, tbody.xpath(ns("./tr")).size, false)
           end
         end
       end
@@ -33,7 +33,7 @@ module IsoDoc
         if tfoot
           table.tfoot do |h|
             tfoot.element_children.each_with_index do |n, i|
-              tr_parse(n, h, i, tfoot.element_children.size, false)
+              tr_parse(n, h, i, tfoot.xpath(ns("./tr")).size, false)
             end
           end
         end
@@ -41,11 +41,13 @@ module IsoDoc
 
       def table_attrs(node)
         width = node["width"] ? "width:#{node['width']};" : nil
+        c = node["class"]
+        bordered = "border-width:1px;border-spacing:0;"
+        (%w(modspec).include?(c) || !c) or bordered = ""
         attr_code(
           id: node["id"],
-          class: node["class"] || "MsoISOTable",
-          style: "border-width:1px;border-spacing:0;"\
-                 "#{width}#{keep_style(node)}",
+          class: c || "MsoISOTable",
+          style: "#{bordered}#{width}#{keep_style(node)}",
           title: node["alt"],
         )
       end
@@ -91,15 +93,12 @@ module IsoDoc
       # border-left:#{col.zero? ? "#{SW} 1.5pt;" : "none;"}
       # border-right:#{SW} #{col == totalcols && !header ? "1.5" : "1.0"}pt;
 
-      def make_tr_attr(cell, row, totalrows, header)
+      def make_tr_attr(cell, row, totalrows, header, bordered)
         style = cell.name == "th" ? "font-weight:bold;" : ""
         cell["align"] and style += "text-align:#{cell['align']};"
         cell["valign"] and style += "vertical-align:#{cell['valign']};"
         rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
-        style += <<~STYLE
-          border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
-          border-bottom:#{SW} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
-        STYLE
+        style += make_tr_attr_style(row, rowmax, totalrows, header, bordered)
         header and scope = (cell["colspan"] ? "colgroup" : "col")
         !header && cell.name == "th" and
           scope = (cell["rowspan"] ? "rowgroup" : "row")
@@ -107,10 +106,20 @@ module IsoDoc
           style: style.gsub(/\n/, ""), scope: scope }
       end
 
+      def make_tr_attr_style(row, rowmax, totalrows, _header, bordered)
+        bordered or return ""
+        <<~STYLE.gsub(/\n/, "")
+          border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}
+          border-bottom:#{SW} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;
+        STYLE
+      end
+
       def tr_parse(node, out, ord, totalrows, header)
+        c = node.parent.parent["class"]
+        bordered = %w(modspec).include?(c) || !c
         out.tr do |r|
           node.elements.each do |td|
-            attrs = make_tr_attr(td, ord, totalrows - 1, header)
+            attrs = make_tr_attr(td, ord, totalrows - 1, header, bordered)
             r.send td.name, **attr_code(attrs) do |entry|
               td.children.each { |n| parse(n, entry) }
             end

data/lib/isodoc/function/to_word_html.rb

@@ -101,6 +101,7 @@ module IsoDoc
       end
 
       def info(isoxml, out)
+        @meta.code_css isoxml, out
         @meta.title isoxml, out
         @meta.subtitle isoxml, out
         @meta.docstatus isoxml, out

data/lib/isodoc/html_function/html.rb

@@ -89,31 +89,10 @@ module IsoDoc
         d.children.empty? or d.children.first.previous = html_button
       end
 
-      def sourcecodelang(lang)
-        return unless lang
-
-        case lang.downcase
-        when "javascript" then "lang-js"
-        when "c" then "lang-c"
-        when "c+" then "lang-cpp"
-        when "console" then "lang-bsh"
-        when "ruby" then "lang-rb"
-        when "html" then "lang-html"
-        when "java" then "lang-java"
-        when "xml" then "lang-xml"
-        when "perl" then "lang-perl"
-        when "python" then "lang-py"
-        when "xsl" then "lang-xsl"
-        else
-          ""
-        end
-      end
-
       def sourcecode_parse(node, out)
         name = node.at(ns("./name"))
-        class1 = "prettyprint #{sourcecodelang(node&.at(ns('./@lang'))&.value)}"
-        out.pre **sourcecode_attrs(node).merge(class: class1) do |div|
-          @sourcecode = true
+        out.pre **sourcecode_attrs(node).merge(class: "sourcecode") do |div|
+          @sourcecode = true unless node.at(ns(".//sourcecode"))
           node.children.each { |n| parse(n, div) unless n.name == "name" }
           @sourcecode = false
         end

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -31,6 +31,9 @@ module IsoDoc
         head = docxml.at("//*[local-name() = 'head']")
         head << htmlstylesheet(@htmlstylesheet)
         s = htmlstylesheet(@htmlstylesheet_override) and head << s
+        s = @meta.get[:code_css] and
+          head << "<style><!--#{s.gsub(/sourcecode/,
+                                       'pre.sourcecode')}--></style>"
         @bare and
           head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
         docxml
@@ -40,7 +43,6 @@ module IsoDoc
         html_cover(docxml) if @htmlcoverpage && !@bare
         html_intro(docxml) if @htmlintropage && !@bare
         docxml.at("//body") << mathjax(@openmathdelim, @closemathdelim)
-        docxml.at("//body") << sourcecode_highlighter
         html_main(docxml)
         authority_cleanup(docxml)
         docxml
@@ -48,7 +50,7 @@ module IsoDoc
 
       def authority_cleanup1(docxml, klass)
         dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
-        auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or "\
+        auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or " \
                          "@class = 'boilerplate-#{klass}']")
         auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each(&:remove)
         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
@@ -92,7 +94,7 @@ module IsoDoc
       end
 
       def html_toc_entry(level, header)
-        content = header.at("./following-sibling::p"\
+        content = header.at("./following-sibling::p" \
                             "[@class = 'variant-title-toc']") || header
         %(<li class="#{level}"><a href="##{header['id']}">\
       #{header_strip(content)}</a></li>)
@@ -127,7 +129,7 @@ module IsoDoc
       end
 
       def toc_exclude_class
-        "[not(@class = 'TermNum')][not(@class = 'noTOC')]"\
+        "[not(@class = 'TermNum')][not(@class = 'noTOC')]" \
           "[string-length(normalize-space(.))>0]"
       end
 
@@ -142,11 +144,6 @@ module IsoDoc
         "#{a[0]}#{scripts}#{scripts_override}</body>#{a[1]}"
       end
 
-      def sourcecode_highlighter
-        '<script src="https://cdn.rawgit.com/google/code-prettify/master/'\
-          'loader/run_prettify.js"></script>'
-      end
-
       MATHJAX_ADDR =
         "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js".freeze
       MATHJAX = <<~"MATHJAX".freeze

data/lib/isodoc/metadata.rb

@@ -168,5 +168,10 @@ module IsoDoc
       end
       set(:title_footnote, ret)
     end
+
+    def code_css(isoxml, _out)
+      c = isoxml.at(ns("//misc-container/source-highlighter-css")) or return
+      set(:code_css, c.text)
+    end
   end
 end

data/lib/isodoc/presentation_function/block.rb

@@ -1,4 +1,5 @@
 require_relative "./image"
+require "rouge"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -25,24 +26,106 @@ module IsoDoc
       end
     end
 
+    def sourcehighlighter_theme
+      "igorpro"
+    end
+
+    def sourcehighlighter_css(docxml)
+      @sourcehighlighter or return
+      ins = docxml.at(ns("//misc-container")) ||
+        docxml.at(ns("//bibdata")).after("<misc-container/>").next_element
+      x = Rouge::Theme.find(sourcehighlighter_theme)
+        .render(scope: "sourcecode")
+      ins << "<source-highlighter-css>#{x}</source-highlighter-css>"
+    end
+
+    def sourcehighlighter
+      @sourcehighlighter or return
+      f = Rouge::Formatters::HTML.new
+      { formatter: f,
+        formatter_line: Rouge::Formatters::HTMLTable.new(f, {}) }
+    end
+
     def sourcecode(docxml)
+      sourcehighlighter_css(docxml)
+      @highlighter = sourcehighlighter
       docxml.xpath(ns("//sourcecode")).each do |f|
         sourcecode1(f)
       end
     end
 
     def sourcecode1(elem)
-      return if labelled_ancestor(elem)
+      source_highlight(elem)
+      source_label(elem)
+    end
+
+    def source_highlight(elem)
+      @highlighter or return
+      markup = source_remove_markup(elem)
+      p = source_lex(elem)
+      wrapper, code =
+        if elem["linenums"] == "true" then sourcecode_table_to_elem(elem, p)
+        else
+          r = Nokogiri::XML.fragment(@highlighter[:formatter].format(p))
+          [r, r]
+        end
+      elem.children = source_restore_markup(wrapper, code, markup)
+    end
+
+    def source_remove_markup(elem)
+      ret = {}
+      name = elem.at(ns("./name")) and ret[:name] = name.remove.to_xml
+      ret[:ann] = elem.xpath(ns("./annotation")).each(&:remove)
+      ret[:call] = elem.xpath(ns("./callout")).each_with_object([]) do |c, m|
+        m << { xml: c.remove.to_xml, line: c.line - elem.line }
+      end
+      ret
+    end
+
+    def source_restore_markup(wrapper, code, markup)
+      text = source_restore_callouts(code, markup[:call])
+      ret = if code == wrapper
+              text
+            else
+              code.replace(text)
+              to_xml(wrapper)
+            end
+      "#{markup[:name]}#{ret}#{markup[:ann]}"
+    end
+
+    def source_restore_callouts(code, callouts)
+      text = to_xml(code)
+      text.split(/[\n\r]/).each_with_index do |c, i|
+        while !callouts.empty? && callouts[0][:line] == i
+          c.sub!(/\s+$/, " #{callouts[0][:xml]} ")
+          callouts.shift
+        end
+      end.join("\n")
+    end
 
+    def sourcecode_table_to_elem(elem, tokens)
+      r = Nokogiri::XML(@highlighter[:formatter_line].format(tokens)).root
+      pre = r.at(".//td[@class = 'rouge-code']/pre")
+      %w(style).each { |n| elem[n] and pre[n] = elem[n] }
+      pre.name = "sourcecode"
+      [r, pre]
+    end
+
+    def source_lex(elem)
+      l = (Rouge::Lexer.find(elem["lang"] || "plaintext") ||
+       Rouge::Lexer.find("plaintext"))
+      l.lex(@c.decode(elem.children.to_xml))
+    end
+
+    def source_label(elem)
+      labelled_ancestor(elem) and return
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, block_delim,
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
     def formula(docxml)
-      docxml.xpath(ns("//formula")).each do |f|
-        formula1(f)
-      end
+      docxml.xpath(ns("//formula")).each { |f| formula1(f) }
     end
 
     def formula1(elem)
@@ -51,48 +134,38 @@ module IsoDoc
     end
 
     def example(docxml)
-      docxml.xpath(ns("//example")).each do |f|
-        example1(f)
-      end
+      docxml.xpath(ns("//example")).each { |f| example1(f) }
     end
 
     def example1(elem)
       n = @xrefs.get[elem["id"]]
       lbl = if n.nil? || n[:label].nil? || n[:label].empty?
               @i18n.example
-            else
-              l10n("#{@i18n.example} #{n[:label]}")
+            else l10n("#{@i18n.example} #{n[:label]}")
             end
       prefix_name(elem, block_delim, lbl, "name")
     end
 
     def note(docxml)
-      docxml.xpath(ns("//note")).each do |f|
-        note1(f)
-      end
+      docxml.xpath(ns("//note")).each { |f| note1(f) }
     end
 
     def note1(elem)
-      return if elem.parent.name == "bibitem" || elem["notag"] == "true"
-
+      elem.parent.name == "bibitem" || elem["notag"] == "true" and return
       n = @xrefs.get[elem["id"]]
       lbl = if n.nil? || n[:label].nil? || n[:label].empty?
               @i18n.note
-            else
-              l10n("#{@i18n.note} #{n[:label]}")
+            else l10n("#{@i18n.note} #{n[:label]}")
             end
       prefix_name(elem, "", lbl, "name")
     end
 
     def admonition(docxml)
-      docxml.xpath(ns("//admonition")).each do |f|
-        admonition1(f)
-      end
+      docxml.xpath(ns("//admonition")).each { |f| admonition1(f) }
     end
 
     def admonition1(elem)
-      return if elem.at(ns("./name")) || elem["notag"] == "true"
-
+      elem.at(ns("./name")) || elem["notag"] == "true" and return
       prefix_name(elem, "", @i18n.admonition[elem["type"]]&.upcase, "name")
     end
 
@@ -121,15 +194,12 @@ module IsoDoc
     end
 
     def table(docxml)
-      docxml.xpath(ns("//table")).each do |f|
-        table1(f)
-      end
+      docxml.xpath(ns("//table")).each { |f| table1(f) }
     end
 
     def table1(elem)
-      return if labelled_ancestor(elem)
-      return if elem["unnumbered"] && !elem.at(ns("./name"))
-
+      labelled_ancestor(elem) and return
+      elem["unnumbered"] && !elem.at(ns("./name")) and return
       n = @xrefs.anchor(elem["id"], :label, false)
       prefix_name(elem, block_delim, l10n("#{lower2cap @i18n.table} #{n}"),
                   "name")
@@ -137,9 +207,7 @@ module IsoDoc
 
     # we use this to eliminate the semantic amend blocks from rendering
     def amend(docxml)
-      docxml.xpath(ns("//amend")).each do |f|
-        amend1(f)
-      end
+      docxml.xpath(ns("//amend")).each { |f| amend1(f) }
     end
 
     def amend1(elem)
@@ -150,9 +218,7 @@ module IsoDoc
     end
 
     def ol(docxml)
-      docxml.xpath(ns("//ol")).each do |f|
-        ol1(f)
-      end
+      docxml.xpath(ns("//ol")).each { |f| ol1(f) }
       @xrefs.list_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
     end
 

data/lib/isodoc/presentation_function/refs.rb

@@ -49,8 +49,8 @@ module IsoDoc
     def bibrender_relaton(xml, renderings)
       f = renderings[xml["id"]][:formattedref]
       f &&= "<formattedref>#{f}</formattedref>"
-      xml.children =
-        "#{f}#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
+      x = xml.xpath(ns("./docidentifier | ./uri | ./note | ./biblio-tag"))
+      xml.children = "#{f}#{x.to_xml}"
     end
 
     def bibrenderer
@@ -74,6 +74,7 @@ module IsoDoc
         i = bibliography_bibitem_number1(b, i)
       end
       @xrefs.references docxml
+      bibliography_bibitem_tag(docxml)
     end
 
     def bibliography_bibitem_number1(bibitem, idx)
@@ -99,8 +100,79 @@ module IsoDoc
 
     def docid_prefixes(docxml)
       docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
-        i.children = @xrefs.klass.docid_prefix(i["type"], i.text)
+        i.children = @xrefs.klass.docid_prefix(i["type"], to_xml(i.children))
       end
     end
+
+    def bibliography_bibitem_tag(docxml)
+      [true, false].each do |norm|
+        i = 0
+        docxml.xpath(ns("//references[@normative = '#{norm}']")).each do |r|
+          i = bibliography_bibitem_tag1(r, i, norm)
+        end
+      end
+    end
+
+    def bibliography_bibitem_tag1(ref, idx, norm)
+      ref.xpath(ns("./bibitem")).each do |b|
+        @xrefs.klass.implicit_reference(b) and next
+        idx += 1 unless b["hidden"]
+        insert_biblio_tag(b, idx, !norm, @xrefs.klass.standard?(b))
+      end
+      idx
+    end
+
+    def insert_biblio_tag(bib, ordinal, biblio, standard)
+      datefn = date_note_process(bib)
+      ids = @xrefs.klass.bibitem_ref_code(bib)
+      idents = @xrefs.klass.render_identifier(ids)
+      ret = if biblio then biblio_ref_entry_code(ordinal, idents, ids,
+                                                 standard, datefn)
+            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn)
+            end
+      bib << "<biblio-tag>#{ret}</biblio-tag>"
+    end
+
+    def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn)
+      ret = (idents[:ordinal] || idents[:metanorma] || idents[:sdo]).to_s
+      (idents[:ordinal] || idents[:metanorma]) && idents[:sdo] and
+        ret += ", #{idents[:sdo]}"
+      ret += datefn
+      ret.empty? and return ret
+      idents[:sdo] and ret += ","
+      "#{ret} "
+    end
+
+    # if ids is just a number, only use that ([1] Non-Standard)
+    # else, use both ordinal, as prefix, and ids
+    def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn)
+      standard and id = nil
+      ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
+      if ids[:sdo]
+        ret = prefix_bracketed_ref(ret)
+        ret += "#{ids[:sdo]}#{datefn}, "
+      else
+        ret = prefix_bracketed_ref("#{ret}#{datefn}")
+      end
+      ret
+    end
+
+    def prefix_bracketed_ref(text)
+      "#{text}<tab/>"
+    end
+
+    # strip any fns in docidentifier before they are extracted for rendering
+    def date_note_process(bib)
+      ret = ident_fn(bib)
+      date_note = bib.at(ns("./note[@type = 'Unpublished-Status']"))
+      date_note.nil? and return ret
+      id = UUIDTools::UUID.random_create.to_s
+      "#{ret}<fn reference='#{id}'><p>#{date_note.content}</p></fn>"
+    end
+
+    def ident_fn(bib)
+      ret = bib.at(ns("./docidentifier//fn")) or return ""
+      to_xml(ret.remove)
+    end
   end
 end

data/lib/isodoc/presentation_function/terms.rb

@@ -1,17 +1,19 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def concept(docxml)
+      @definition_ids = docxml.xpath(ns("//definitions//dt"))
+        .each_with_object({}) { |x, m| m[x["id"]] = true }
       docxml.xpath(ns("//concept")).each { |f| concept1(f) }
     end
 
     def concept1(node)
       xref = node&.at(ns("./xref/@target"))&.text or
-        return concept_render(node, ital: "true", ref: "true",
+        return concept_render(node, ital: "true", ref: "true", bold: "false",
                                     linkref: "true", linkmention: "false")
-      if node.at(ns("//definitions//dt[@id = '#{xref}']"))
-        concept_render(node, ital: "false", ref: "false",
+      if @definition_ids[xref]
+        concept_render(node, ital: "false", ref: "false", bold: "false",
                              linkref: "true", linkmention: "false")
-      else concept_render(node, ital: "true", ref: "true",
+      else concept_render(node, ital: "true", ref: "true", bold: "false",
                                 linkref: "true", linkmention: "false")
       end
     end
@@ -20,21 +22,23 @@ module IsoDoc
       opts, render, ref = concept_render_init(node, defaults)
       node&.at(ns("./refterm"))&.remove
       ref && opts[:ref] != "false" and render&.next = " "
-      opts[:ital] == "true" and render&.name = "em"
       concept1_linkmention(ref, render, opts)
       concept1_ref(node, ref, opts)
-      concept1_nonital(node, opts)
+      concept1_style(node, opts)
       node.replace(node.children)
     end
 
-    def concept1_nonital(node, opts)
-      opts[:ital] == "false" or return
-      r = node.at(ns(".//renderterm"))
-      r&.replace(r&.children)
+    def concept1_style(node, opts)
+      r = node.at(ns(".//renderterm")) or return
+      opts[:ital] == "true" and r.children = "<em>#{to_xml(r.children)}</em>"
+      opts[:bold] == "true" and
+        r.children = "<strong>#{to_xml(r.children)}</strong>"
+      r.replace(r.children)
     end
 
     def concept_render_init(node, defaults)
-      opts = %i(ital ref linkref linkmention).each_with_object({}) do |x, m|
+      opts = %i(bold ital ref linkref linkmention)
+        .each_with_object({}) do |x, m|
         m[x] = node[x.to_s] || defaults[x]
       end
       [opts, node.at(ns("./renderterm")),
@@ -42,7 +46,8 @@ module IsoDoc
     end
 
     def concept1_linkmention(ref, renderterm, opts)
-      return unless opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?
+      return unless opts[:linkmention] == "true" &&
+        !renderterm.nil? && !ref.nil?
 
       ref2 = ref.clone
       r2 = renderterm.clone

data/lib/isodoc/presentation_function/xrefs.rb

@@ -38,15 +38,18 @@ module IsoDoc
     def anchor_xref(node, target)
       x = @xrefs.anchor(target, :xref)
       t = @xrefs.anchor(target, :title)
-      case node["style"]
-      when "basic" then t || x
-      when "full" then t ? anchor_xref_full(x, t) : x
-      when "short", nil then x
-      else @xrefs.anchor(target, node[:style].to_sym)
-      end
+      ret = case node["style"]
+            when "basic" then t
+            when "full" then anchor_xref_full(x, t)
+            when "short", nil then x
+            else @xrefs.anchor(target, node[:style].to_sym)
+            end
+      ret || x
     end
 
     def anchor_xref_full(num, title)
+      (!title.nil? && !title.empty?) or return nil
+
       l10n("#{num}, #{title}")
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.4.0".freeze
+  VERSION = "2.4.1".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -52,11 +52,17 @@ module IsoDoc
         @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
       end
 
+      def sourcecode_style
+        "Sourcecode"
+      end
+
       def wordstylesheet_update
         return if @wordstylesheet.nil?
 
         f = File.open(@wordstylesheet.path, "a")
         @landscapestyle.empty? or f.write(@landscapestyle)
+        s = @meta.get[:code_css] and
+          f.write(s.gsub(/sourcecode/, "p.#{sourcecode_style}"))
         if @wordstylesheet_override && @wordstylesheet
           f.write(@wordstylesheet_override.read)
           @wordstylesheet_override.close
@@ -70,13 +76,15 @@ module IsoDoc
       def word_admonition_images(docxml)
         docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
           i["width"], i["height"] =
-            Html2Doc.new({}).image_resize(i, image_localfile(i), @maxheight, 300)
+            Html2Doc.new({}).image_resize(i, image_localfile(i), @maxheight,
+                                          300)
         end
       end
 
       def word_cleanup(docxml)
         word_annex_cleanup(docxml)
         word_preface(docxml)
+        word_sourcecode_table(docxml)
         word_nested_tables(docxml)
         word_colgroup(docxml)
         word_table_align(docxml)
@@ -93,6 +101,27 @@ module IsoDoc
         docxml
       end
 
+      def word_sourcecode_table(docxml)
+        docxml.xpath("//p[@class='Sourcecode']/div[@class='table_container']")
+          .each do |d|
+            pre = d.at(".//p[@class='Sourcecode']")
+            to_sourcecode_para(pre)
+            d["id"] = d.parent["id"]
+            d.parent.replace(d)
+          end
+      end
+
+      def to_sourcecode_para(pre)
+        @sourcecode = true
+        pre.traverse do |x|
+          x.text? or next
+          ret = []
+          text_parse(x, ret)
+          x.replace(ret.join)
+        end
+        @sourcecode = false
+      end
+
       def word_tab_clean(docxml)
         docxml.xpath("//p[@class='Biblio']//span[@style='mso-tab-count:1']")
           .each do |s|
@@ -155,7 +184,7 @@ module IsoDoc
           .each do |t|
           if t&.previous_element&.name == "img"
             img = t.previous_element
-            t.previous_element.swap("<p class=\'figure\'>#{img.to_xml}</p>")
+            t.previous_element.swap("<p class='figure'>#{img.to_xml}</p>")
           end
           style_update(t&.previous_element, "page-break-after:avoid;")
         end
@@ -231,7 +260,7 @@ module IsoDoc
         docxml.xpath("//a[@epub:type = 'footnote']").each do |x|
           footnote_reference_format(x)
         end
-        docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
+        docxml.xpath("//a[@class = 'TableFootnoteRef'] | " \
                      "//span[@class = 'TableFootnoteRef']").each do |x|
           table_footnote_reference_format(x)
         end

data/lib/isodoc/word_function/table.rb

@@ -15,39 +15,50 @@ module IsoDoc
         table.at(".//tr").xpath("./td | ./th").each do |td|
           cols += (td["colspan"] ? td["colspan"].to_i : 1)
         end
-        style = "border-top:0pt;mso-border-top-alt:0pt;"\
+        style = "border-top:0pt;mso-border-top-alt:0pt;" \
                 "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;"
         tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
         tfoot.xpath(".//td").last
       end
 
-      def make_tr_attr(td, row, totalrows, _header)
-        style = td.name == "th" ? "font-weight:bold;" : ""
-        rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
-        style += <<~STYLE
+      def make_tr_attr(cell, row, totalrows, header, bordered)
+        style = cell.name == "th" ? "font-weight:bold;" : ""
+        rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
+        style += make_tr_attr_style(row, rowmax, totalrows, header, bordered)
+        { rowspan: cell["rowspan"], colspan: cell["colspan"],
+          valign: cell["valign"], align: cell["align"], style: style }
+      end
+
+      def make_tr_attr_style(row, rowmax, totalrows, header, bordered)
+        ret = <<~STYLE.gsub(/\n/, "")
           border-top:#{row.zero? ? "#{SW1} 1.5pt;" : 'none;'}
           mso-border-top-alt:#{row.zero? ? "#{SW1} 1.5pt;" : 'none;'}
-          border-bottom:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
-          mso-border-bottom-alt:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
+          border-bottom:#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;
+          mso-border-bottom-alt:#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;
         STYLE
-        { rowspan: td["rowspan"], colspan: td["colspan"], valign: td["valign"],
-          align: td["align"], style: style.gsub(/\n/, "") }
+        bordered or ret = ""
+        pb = header || (totalrows <= 10 && rowmax < totalrows) ? "avoid" : "auto"
+        "#{ret}page-break-after:#{pb};"
       end
 
       def table_attrs(node)
+        c = node["class"]
+        bordered = "border-spacing:0;border-width:1px;"
+        (%w(modspec).include?(c) || !c) or bordered = nil
         ret = {
           summary: node["summary"],
           width: node["width"],
-          style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;"\
-                 "border-spacing:0;border-width:1px;#{keep_style(node)}",
+          style: "mso-table-anchor-horizontal:column;mso-table-overlap:never;" \
+                 "#{bordered}#{keep_style(node)}",
           class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable"),
         }
+        bordered or ret.delete(:class)
         super.merge(attr_code(ret))
       end
 
-      def colgroup(node, t)
+      def colgroup(node, table)
         colgroup = node.at(ns("./colgroup")) or return
-        t.colgroup do |cg|
+        table.colgroup do |cg|
           colgroup.xpath(ns("./col")).each do |c|
             cg.col **{ width: c["width"] }
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement