isodoc 2.4.0 → 2.4.2

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,26 +93,33 @@ 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")
         { rowspan: cell["rowspan"], colspan: cell["colspan"],
-          style: style.gsub(/\n/, ""), scope: scope }
+          style: style.gsub(/\n/, ""), scope: scope, class: cell["class"] }
+      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

@@ -8,10 +8,6 @@ module IsoDoc
         @termdomain = termdomain
       end
 
-      def in_sourcecode
-        @sourcecode
-      end
-
       def note?
         @note
       end
@@ -101,6 +97,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/function/utils.rb

@@ -37,10 +37,14 @@ module IsoDoc
       DOCTYPE_HDR = "<!DOCTYPE html SYSTEM " \
                     '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
 
+      HUGESTRICT =
+        Nokogiri::XML::ParseOptions::HUGE |
+        Nokogiri::XML::ParseOptions::STRICT
+
       def to_xhtml(xml)
         xml = to_xhtml_prep(xml)
         begin
-          Nokogiri::XML.parse(xml, &:strict)
+          Nokogiri::XML.parse(xml, nil, nil, HUGESTRICT)
         rescue Nokogiri::XML::SyntaxError => e
           File.open("#{@filename}.#{@format}.err", "w:UTF-8") do |f|
             f.write xml

data/lib/isodoc/html_function/html.rb

@@ -7,7 +7,7 @@ module IsoDoc
       def convert1(docxml, filename, dir)
         bibitem_lookup(docxml)
         noko do |xml|
-          xml.html **{ lang: @lang.to_s } do |html|
+          xml.html lang: @lang.to_s do |html|
             info docxml, nil
             populate_css
             html.head { |head| define_head head, filename, dir }
@@ -19,7 +19,7 @@ module IsoDoc
       def make_body1(body, _docxml)
         return if @bare
 
-        body.div **{ class: "title-section" } do |div1|
+        body.div class: "title-section" do |div1|
           div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
@@ -28,14 +28,14 @@ module IsoDoc
       def make_body2(body, _docxml)
         return if @bare
 
-        body.div **{ class: "prefatory-section" } do |div2|
+        body.div class: "prefatory-section" do |div2|
           div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
+        body.div class: "main-section" do |div3|
           boilerplate docxml, div3
           preface_block docxml, div3
           abstract docxml, div3
@@ -51,8 +51,8 @@ module IsoDoc
 
       def googlefonts
         <<~HEAD.freeze
-          <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
-          <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet">
+          <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet"/>
+          <link href="https://fonts.googleapis.com/css?family=Lato:400,400i,700,900" rel="stylesheet"/>
         HEAD
       end
 
@@ -66,11 +66,11 @@ module IsoDoc
           <script type="text/javascript">#{toclevel}</script>
 
           <!--Google fonts-->
-          <link rel="preconnect" href="https://fonts.gstatic.com">#{' '}
+          <link rel="preconnect" href="https://fonts.gstatic.com"/>
           #{googlefonts}
           <!--Font awesome import for the link icon-->
-          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous">
-          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous">
+          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/solid.css" integrity="sha384-v2Tw72dyUXeU3y4aM2Y0tBJQkGfplr39mxZqlTBDUZAb9BGoC40+rdFCG0m10lXk" crossorigin="anonymous"/>
+          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/fontawesome.css" integrity="sha384-q3jl8XQu1OpdLgGFvNRnPdj5VIlCvgsDQTQB6owSOHWlAurxul7f+JpUOVdAiJ5P" crossorigin="anonymous"/>
           <style class="anchorjs"></style>
         HEAD
       end
@@ -89,33 +89,12 @@ 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
-          node.children.each { |n| parse(n, div) unless n.name == "name" }
-          @sourcecode = false
+        tag = node.at(ns(".//sourcecode | .//table")) ? "div" : "pre"
+        attr = sourcecode_attrs(node).merge(class: "sourcecode")
+        out.send tag, **attr do |div|
+          sourcecode_parse1(node, div)
         end
         sourcecode_name_parse(node, out, name)
       end

data/lib/isodoc/html_function/postprocess.rb

@@ -27,7 +27,20 @@ module IsoDoc
       def html_cleanup(html)
         html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
         html = footnote_format(footnote_backlinks(html_toc(html)))
-        mathml(html_list_clean(remove_placeholder_paras(html)))
+        html = mathml(html_list_clean(remove_placeholder_paras(html)))
+        sourcecode_cleanup(html)
+      end
+
+      def sourcecode_cleanup(html)
+        ann = ".//div[@class = 'annotation']"
+        html.xpath("//pre[#{ann}] | //div[@class = 'sourcecode'][#{ann}]")
+          .each do |p|
+          ins = p.after("<pre class='sourcecode'/>").next_element
+          p.xpath(ann).each do |d|
+            ins << d.remove.children
+          end
+        end
+        html
       end
 
       def remove_placeholder_paras(html)

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,6 @@
 require_relative "./image"
+require_relative "./sourcecode"
+require "rouge"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -25,24 +27,8 @@ module IsoDoc
       end
     end
 
-    def sourcecode(docxml)
-      docxml.xpath(ns("//sourcecode")).each do |f|
-        sourcecode1(f)
-      end
-    end
-
-    def sourcecode1(elem)
-      return if labelled_ancestor(elem)
-
-      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 +37,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 +97,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 +110,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 +121,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/sourcecode.rb

@@ -0,0 +1,114 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def sourcehighlighter_css(docxml)
+      @sourcehighlighter or return
+      ins = docxml.at(ns("//misc-container")) ||
+        docxml.at(ns("//bibdata")).after("<misc-container/>").next_element
+      ins << "<source-highlighter-css>#{sourcehighlighter_css_file}" \
+             "</source-highlighter-css>"
+    end
+
+    def sourcehighlighter_css_file
+      File.read(File.join(File.dirname(__FILE__), "..", "base_style",
+                          "rouge.css"))
+    end
+
+    def sourcehighlighter
+      @sourcehighlighter or return
+      f = Rouge::Formatters::HTML.new
+      opts = { gutter_class: "rouge-gutter", code_class: "rouge-code" }
+      { formatter: f,
+        formatter_line: Rouge::Formatters::HTMLLineTable.new(f, opts) }
+    end
+
+    def sourcecode(docxml)
+      sourcehighlighter_css(docxml)
+      @highlighter = sourcehighlighter
+      docxml.xpath(ns("//sourcecode")).each do |f|
+        sourcecode1(f)
+      end
+    end
+
+    def sourcecode1(elem)
+      source_highlight(elem)
+      source_label(elem)
+    end
+
+    def source_highlight(elem)
+      @highlighter or return
+      markup = source_remove_markup(elem)
+      p = source_lex(elem)
+      elem.children = if elem["linenums"] == "true"
+                        r = sourcecode_table_to_elem(elem, p)
+                        source_restore_markup_table(r, markup)
+                      else
+                        r = @highlighter[:formatter].format(p)
+                        source_restore_markup(Nokogiri::XML.fragment(r), markup)
+                      end
+    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, markup)
+      ret = source_restore_callouts(wrapper, markup[:call])
+      "#{markup[:name]}#{ret}#{markup[:ann]}"
+    end
+
+    def source_restore_markup_table(wrapper, markup)
+      source_restore_callouts_table(wrapper, markup[:call])
+      ret = to_xml(wrapper)
+      "#{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+$/, " <span class='c'>#{callouts[0][:xml]}</span> ")
+          callouts.shift
+        end
+      end.join("\n")
+    end
+
+    def source_restore_callouts_table(table, callouts)
+      table.xpath(".//td[@class = 'rouge-code']/sourcecode")
+        .each_with_index do |c, i|
+        while !callouts.empty? && callouts[0][:line] == i
+          c << " <span class='c'>#{callouts[0][:xml]}</span> "
+          callouts.shift
+        end
+      end
+    end
+
+    def sourcecode_table_to_elem(elem, tokens)
+      r = Nokogiri::XML(@highlighter[:formatter_line].format(tokens)).root
+      r.xpath(".//td[@class = 'rouge-code']/pre").each do |pre|
+        %w(style).each { |n| elem[n] and pre[n] = elem[n] }
+        pre.name = "sourcecode"
+        pre.children = to_xml(pre.children).sub(/\s+$/, "")
+      end
+      r
+    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
+  end
+end