isodoc 2.0.8.2 → 2.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 391849b43509b58e8e08eb2ab4e2922cdb3c6ac21ac287110518078b73601465
-  data.tar.gz: 8b15f3e7f8c608c0521c3347616a6ea2df7d09092d3830c2bd71f58ea23a95fc
+  metadata.gz: 9602bbd1d24d83b9b43f2ac41bd1b01d1fd9edf44c3edf4fbb97c45fb93e1292
+  data.tar.gz: 5406db3babbfe8d4f7403b22a81e713081ba5de7c72f250c65bfeb08e98316e8
 SHA512:
-  metadata.gz: 7f7b97e099260821ec96ec660c2bfa180dff43f2c3b186a2fa42ddebeb5052fe19904afbd62b28215caedeab4f5184c3fbee89171b3fd3a9759e91329bbbfc16
-  data.tar.gz: 53584cc076ed6b5537c592e4c750f069ba5ef69159c8ecabfe787968b5af4024b61868e1e98b7fbf1d03975980087b89557e2fe252e3a74cb42844bcd684ab6c
+  metadata.gz: '0928611616ab02c2a0471ddd92c20bd79019a5c21c022d3a9989609919764f17837e1ae724e72de841b5ef31279537498193cb1ba06be3d65e2032f00bd684d6'
+  data.tar.gz: 6edc16d70239d9106ce0114b92bb0e5f6b85a843fae3abe93456448bc8503d72015c096b12eaaedb3ca9e46cafa135d1b1dcc334781167d9c78a14084f7fe928

data/.github/workflows/release.yml

@@ -21,4 +21,4 @@ jobs:
       event_name: ${{ github.event_name }}
     secrets:
       rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/isodoc.gemspec

@@ -29,16 +29,17 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "asciimath"
-  spec.add_dependency "html2doc", "~> 1.3.0"
+  spec.add_dependency "html2doc", "~> 1.4.0"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "isodoc-i18n", "~> 1.0.0"
   spec.add_dependency "liquid", "~> 4"
   # spec.add_dependency "metanorma", ">= 1.2.0"
-  spec.add_dependency "emf2svg", "<= 1.3"
+  spec.add_dependency "emf2svg"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-utils"
-  spec.add_dependency "nokogiri", "~> 1.12.0"
+  spec.add_dependency "nokogiri", "~> 1.12"
   spec.add_dependency "relaton-cli"
+  spec.add_dependency "relaton-render", ">= 0.3.1"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
@@ -56,4 +57,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "~> 2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/isodoc/convert.rb

@@ -181,7 +181,7 @@ module IsoDoc
     end
 
     def i18n_init(lang, script, i18nyaml = nil)
-      @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
     end
 
     def l10n(expr, lang = @lang, script = @script)

data/lib/isodoc/function/blocks.rb

@@ -9,12 +9,6 @@ module IsoDoc
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << @meta.get[:doctitle] }
       end
 
-      def middle_admonitions(isoxml, out)
-        isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
-          parse(x, out)
-        end
-      end
-
       def figure_name_parse(_node, div, name)
         return if name.nil?
 
@@ -74,12 +68,6 @@ module IsoDoc
         end
       end
 
-      def admonition_name_parse(_node, div, name)
-        div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
-          name.children.each { |n| parse(n, p) }
-        end
-      end
-
       def sourcecode_attrs(node)
         attr_code(id: node["id"], class: "Sourcecode", style: keep_style(node))
       end
@@ -109,33 +97,6 @@ module IsoDoc
         @annotation = false
       end
 
-      def admonition_class(_node)
-        "Admonition"
-      end
-
-      def admonition_name(node, type)
-        name = node&.at(ns("./name")) and return name
-        name = Nokogiri::XML::Node.new("name", node.document)
-        return unless type && @i18n.admonition[type]
-
-        name << @i18n.admonition[type]&.upcase
-        name
-      end
-
-      def admonition_attrs(node)
-        attr_code(id: node["id"], class: admonition_class(node),
-                  style: keep_style(node))
-      end
-
-      def admonition_parse(node, out)
-        type = node["type"]
-        name = admonition_name(node, type)
-        out.div **admonition_attrs(node) do |t|
-          admonition_name_parse(node, t, name) if name
-          node.children.each { |n| parse(n, t) unless n.name == "name" }
-        end
-      end
-
       def formula_where(dlist, out)
         return unless dlist
 

data/lib/isodoc/function/blocks_example_note.rb

@@ -94,7 +94,8 @@ module IsoDoc
       end
 
       def note_attrs(node)
-        attr_code(id: node["id"], class: "Note", style: keep_style(node))
+        attr_code(id: node["id"], class: "Note", style: keep_style(node),
+                  coverpage: node["coverpage"])
       end
 
       def note_parse(node, out)
@@ -108,6 +109,40 @@ module IsoDoc
         end
         @note = false
       end
+
+      def middle_admonitions(isoxml, out)
+        isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
+          parse(x, out)
+        end
+      end
+
+      def admonition_name_parse(_node, div, name)
+        div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
+          name.children.each { |n| parse(n, p) }
+        end
+      end
+
+      def admonition_class(_node)
+        "Admonition"
+      end
+
+      def admonition_name(node, _type)
+        node&.at(ns("./name"))
+      end
+
+      def admonition_attrs(node)
+        attr_code(id: node["id"], class: admonition_class(node),
+                  style: keep_style(node), coverpage: node["coverpage"])
+      end
+
+      def admonition_parse(node, out)
+        type = node["type"]
+        name = admonition_name(node, type)
+        out.div **admonition_attrs(node) do |t|
+          admonition_name_parse(node, t, name) if name
+          node.children.each { |n| parse(n, t) unless n.name == "name" }
+        end
+      end
     end
   end
 end

data/lib/isodoc/function/inline.rb

@@ -14,6 +14,10 @@ module IsoDoc
         end
       end
 
+      def span_parse(node, out)
+        node.children.each { |n| parse(n, out) }
+      end
+
       def callout_parse(node, out)
         out << " &lt;#{node.text}&gt;"
       end

data/lib/isodoc/function/references.rb

@@ -10,7 +10,6 @@ module IsoDoc
         text
       end
 
-      # TODO generate formatted ref if not present
       def nonstd_bibitem(list, bib, ordinal, biblio)
         list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
           ids = bibitem_ref_code(bib)
@@ -126,13 +125,6 @@ module IsoDoc
         { id: bib["id"], class: biblio ? "Biblio" : "NormRef" }
       end
 
-      def iso_title(bib)
-        bib.at(ns("./title[@language = '#{@lang}' and @type = 'main']")) ||
-          bib.at(ns("./title[@language = '#{@lang}']")) ||
-          bib.at(ns("./title[@type = 'main']")) ||
-          bib.at(ns("./title"))
-      end
-
       # reference not to be rendered because it is deemed implicit
       # in the standards environment
       def implicit_reference(bib)
@@ -145,13 +137,8 @@ module IsoDoc
       end
 
       def reference_format(bib, out)
-        if ftitle = bib.at(ns("./formattedref"))
-          ftitle&.children&.each { |n| parse(n, out) }
-        else
-          out.i do |i|
-            iso_title(bib)&.children&.each { |n| parse(n, i) }
-          end
-        end
+        ftitle = bib.at(ns("./formattedref"))
+        ftitle&.children&.each { |n| parse(n, out) }
       end
 
       def standard?(bib)

data/lib/isodoc/function/section.rb

@@ -157,6 +157,11 @@ module IsoDoc
            acknowledgements).include? name
       end
 
+      def single_term_clause?(elem)
+        t = elem.xpath(ns("./clause | ./terms | ./definitions | ./references"))
+        t.size == 1 && %w(terms definitions references).include?(t[0].name)
+      end
+
       def preface_block(isoxml, out)
         p = isoxml.at(ns("//preface")) or return
         p.elements.each do |e|

data/lib/isodoc/function/to_word_html.rb

@@ -183,7 +183,7 @@ module IsoDoc
           when "formula" then formula_parse(node, out)
           when "table" then table_parse(node, out)
           when "figure" then figure_parse(node, out)
-          when "example" then example_parse(node, out)
+          when "example", "termexample" then example_parse(node, out)
           when "image" then image_parse(node, out, nil)
           when "sourcecode" then sourcecode_parse(node, out)
           when "pre" then pre_parse(node, out)
@@ -197,7 +197,6 @@ module IsoDoc
           when "termsource" then termref_parse(node, out)
           when "modification" then modification_parse(node, out)
           when "termnote" then termnote_parse(node, out)
-          when "termexample" then example_parse(node, out)
           when "terms" then terms_parse(node, out)
           when "definitions" then symbols_parse(node, out)
           when "references" then bibliography_parse(node, out)
@@ -205,15 +204,11 @@ module IsoDoc
           when "requirement" then requirement_parse(node, out)
           when "recommendation" then recommendation_parse(node, out)
           when "permission" then permission_parse(node, out)
-          when "subject" then requirement_skip_parse(node, out)
-          when "classification" then requirement_skip_parse(node, out)
-          when "inherit" then requirement_component_parse(node, out)
-          when "description" then requirement_component_parse(node, out)
-          when "specification" then requirement_component_parse(node, out)
-          when "measurement-target" then requirement_component_parse(node, out)
-          when "verification" then requirement_component_parse(node, out)
-          when "import" then requirement_component_parse(node, out)
-          when "component" then requirement_component_parse(node, out)
+          when "subject", "classification"
+            requirement_skip_parse(node, out)
+          when "inherit", "description", "specification", "measurement-target",
+           "verification", "import", "component"
+            requirement_component_parse(node, out)
           when "index" then index_parse(node, out)
           when "index-xref" then index_xref_parse(node, out)
           when "termref" then termrefelem_parse(node, out)
@@ -235,6 +230,7 @@ module IsoDoc
           when "textarea" then textarea_parse(node, out)
           when "toc" then toc_parse(node, out)
           when "variant-title" then variant_title(node, out)
+          when "span" then span_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/html_function/postprocess.rb

@@ -103,6 +103,20 @@ module IsoDoc
         %w(copyright license legal feedback).each do |t|
           authority_cleanup1(docxml, t)
         end
+        coverpage_note_cleanup(docxml)
+      end
+
+      def coverpage_note_cleanup(docxml)
+        if dest = docxml.at("//div[@id = 'coverpage-note-destination']")
+          auth = docxml.xpath("//*[@coverpage]")
+          if auth.empty? then dest.remove
+          else
+            auth.each do |x|
+              dest << x.remove
+            end
+          end
+        end
+        docxml.xpath("//*[@coverpage]").each { |x| x.delete("coverpage") }
       end
 
       def html_cover(docxml)
@@ -166,8 +180,8 @@ module IsoDoc
         FileUtils.rm_rf tmpimagedir
         FileUtils.mkdir tmpimagedir
         docxml.xpath("//*[local-name() = 'img']").each do |i|
-          i["width"], i["height"] = Html2Doc.image_resize(i, image_localfile(i),
-                                                          @maxheight, @maxwidth)
+          i["width"], i["height"] = Html2Doc.new({})
+            .image_resize(i, image_localfile(i), @maxheight, @maxwidth)
           next if /^data:/.match? i["src"]
 
           @datauriimage ? datauri(i) : move_image1(i)

data/lib/isodoc/metadata.rb

@@ -107,7 +107,8 @@ module IsoDoc
     end
 
     def version(isoxml, _out)
-      set(:edition, isoxml&.at(ns("//bibdata/edition"))&.text)
+      set(:edition, isoxml&.at(ns("//bibdata/edition#{NOLANG}"))&.text)
+      set(:edition_display, isoxml&.at(ns("//bibdata/edition#{currlang}"))&.text)
       set(:docyear, isoxml&.at(ns("//bibdata/copyright/from"))&.text)
       set(:draft, isoxml&.at(ns("//bibdata/version/draft"))&.text)
       revdate = isoxml&.at(ns("//bibdata/version/revision-date"))&.text

data/lib/isodoc/presentation_function/bibdata.rb

@@ -79,16 +79,42 @@ module IsoDoc
       hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype")
       hash_translate(bib, @i18n.get["stage_dict"], "./status/stage")
       hash_translate(bib, @i18n.get["substage_dict"], "./status/substage")
+      edition_translate(bib)
     end
 
     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.children = hash[x.text]
+      tag_translate(x, lang, hash[x.text])
+    end
+
+    # does not allow %Spellout and %Ordinal in the ordinal expression to be mixed
+    def edition_translate(bibdata)
+      x = bibdata.at(ns("./edition")) or return
+      /^\d+$/.match?(x.text) or return
+      tag_translate(x, @lang,
+                    @i18n.edition_ordinal.sub(/%(Spellout|Ordinal)?/,
+                                              edition_translate1(x.text.to_i)))
+    end
+
+    def edition_translate1(num)
+      ruleset = case @i18n.edition_ordinal
+                when /%Spellout/ then "SpelloutRules"
+                when /%Ordinal/ then "OrdinalRules"
+                else "Digit"
+                end
+      ruleset == "Digit" and return num.to_s
+      ed = @c.decode(@i18n.edition)
+      @i18n.inflect_ordinal(num, @i18n.inflection&.dig(ed) || {},
+                            ruleset)
+    end
+
+    def tag_translate(tag, lang, value)
+      tag["language"] = ""
+      tag.next = tag.dup
+      tag.next["language"] = lang
+      tag.next.children = value
     end
 
     def i18n_tag(key, value)

data/lib/isodoc/presentation_function/block.rb

@@ -71,7 +71,7 @@ module IsoDoc
 
     # introduce name element
     def note1(elem)
-      return if elem.parent.name == "bibitem"
+      return if elem.parent.name == "bibitem" || elem["notag"] == "true"
 
       n = @xrefs.get[elem["id"]]
       lbl = if n.nil? || n[:label].nil? || n[:label].empty?
@@ -82,6 +82,18 @@ module IsoDoc
       prefix_name(elem, "", lbl, "name")
     end
 
+    def admonition(docxml)
+      docxml.xpath(ns("//admonition")).each do |f|
+        admonition1(f)
+      end
+    end
+
+    def admonition1(elem)
+      return if elem.at(ns("./name")) || elem["notag"] == "true"
+
+      prefix_name(elem, "", @i18n.admonition[elem["type"]]&.upcase, "name")
+    end
+
     def recommendation(docxml)
       docxml.xpath(ns("//recommendation")).each do |f|
         recommendation1(f, lower2cap(@i18n.recommendation))

data/lib/isodoc/presentation_function/section.rb

@@ -1,3 +1,5 @@
+require_relative "../../relaton/render/general"
+
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def clause(docxml)
@@ -40,6 +42,7 @@ module IsoDoc
     def annex(docxml)
       docxml.xpath(ns("//annex")).each do |f|
         annex1(f)
+        @xrefs.klass.single_term_clause?(f) and single_term_clause(f)
       end
     end
 
@@ -51,6 +54,16 @@ module IsoDoc
       prefix_name(elem, "<br/><br/>", lbl, "title")
     end
 
+    def single_term_clause(elem)
+      t = elem.at(ns("./terms | ./definitions | ./references"))
+      t.at(ns("./title")).remove
+      t.xpath(ns(".//clause | .//terms | .//definitions | .//references"))
+        .each do |c|
+          tit = c.at(ns("./title")) or return
+          tit["depth"] = tit["depth"].to_i - 1 unless tit["depth"] == "1"
+        end
+    end
+
     def term(docxml)
       docxml.xpath(ns("//term")).each do |f|
         term1(f)
@@ -64,6 +77,29 @@ module IsoDoc
 
     def references(docxml)
       bibliography_bibitem_number(docxml)
+      docxml.xpath(ns("//references/bibitem")).each do |x|
+        bibitem(x)
+      end
+      @xrefs.parse_inclusions(refs: true).parse(docxml)
+    end
+
+    def bibitem(xml)
+      bibrender(xml)
+    end
+
+    def bibrender(xml)
+      if f = xml.at(ns("./formattedref"))
+        code = render_identifier(bibitem_ref_code(xml))
+        f << " [#{code[:sdo]}] " if code[:sdo]
+      else
+        xml.children =
+          "#{bibrenderer.render(xml.to_xml)}"\
+          "#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
+      end
+    end
+
+    def bibrenderer
+      ::Relaton::Render::IsoDoc::General.new(language: @lang)
     end
 
     def bibliography_bibitem_number_skip(bibitem)

data/lib/isodoc/presentation_xml_convert.rb

@@ -30,11 +30,15 @@ module IsoDoc
       inline docxml
     end
 
+    # parse annex after term, references,
+    # to deal with single-term and single-ref annexes
     def section(docxml)
+      references docxml
+      # triggers xrefs reparse, so put references before all other sections,
+      # which alter titles and thus can alter xrefs
       clause docxml
-      annex docxml
       term docxml
-      references docxml
+      annex docxml
       index docxml
       clausetitle docxml
       floattitle docxml
@@ -50,6 +54,7 @@ module IsoDoc
       formula docxml
       example docxml
       note docxml
+      admonition docxml
       ol docxml
       permission docxml
       requirement docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.8.2".freeze
+  VERSION = "2.1.0.2".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -41,15 +41,14 @@ module IsoDoc
         result = from_xhtml(word_cleanup(to_xhtml(result)))
           .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
         @wordstylesheet = wordstylesheet_update
-        Html2Doc.process(
-          result,
+        Html2Doc.new(
           filename: filename,
           imagedir: @localdir,
           stylesheet: @wordstylesheet&.path,
           header_file: header&.path, dir: dir,
           asciimathdelims: [@openmathdelim, @closemathdelim],
           liststyles: { ul: @ulstyle, ol: @olstyle }
-        )
+        ).process(result)
         header&.unlink
         @wordstylesheet.unlink if @wordstylesheet.is_a?(Tempfile)
       end
@@ -72,7 +71,7 @@ module IsoDoc
       def word_admonition_images(docxml)
         docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
           i["width"], i["height"] =
-            Html2Doc.image_resize(i, image_localfile(i), @maxheight, 300)
+            Html2Doc.new({}).image_resize(i, image_localfile(i), @maxheight, 300)
         end
       end
 

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -174,6 +174,20 @@ module IsoDoc
         %w(copyright license legal feedback).each do |t|
           authority_cleanup1(docxml, t)
         end
+        coverpage_note_cleanup(docxml)
+      end
+
+      def coverpage_note_cleanup(docxml)
+        if dest = docxml.at("//div[@id = 'coverpage-note-destination']")
+          auth = docxml.xpath("//*[@coverpage]")
+          if auth.empty? then dest.remove
+          else
+            auth.each do |x|
+              dest << x.remove
+            end
+          end
+        end
+        docxml.xpath("//*[@coverpage]").each { |x| x.delete("coverpage") }
       end
 
       def generate_header(filename, _dir)

data/lib/isodoc/word_function/table.rb

@@ -2,8 +2,8 @@ module IsoDoc::WordFunction
   module Body
     def remove_bottom_border(td)
       td["style"] =
-        td["style"].gsub(/border-bottom:[^;]+;/, "border-bottom:0pt;").
-        gsub(/mso-border-bottom-alt:[^;]+;/, "mso-border-bottom-alt:0pt;")
+        td["style"].gsub(/border-bottom:[^;]+;/, "border-bottom:0pt;")
+          .gsub(/mso-border-bottom-alt:[^;]+;/, "mso-border-bottom-alt:0pt;")
     end
 
     SW1 = "solid windowtext".freeze
@@ -15,7 +15,7 @@ module IsoDoc::WordFunction
         cols += (td["colspan"] ? td["colspan"].to_i : 1)
       end
       style = "border-top:0pt;mso-border-top-alt:0pt;"\
-        "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;"
+              "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
@@ -34,13 +34,15 @@ module IsoDoc::WordFunction
     end
 
     def table_attrs(node)
-      super.merge(attr_code({
-        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)}",
-        class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
-      }))
+      super.merge(attr_code(
+                    {
+                      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)}",
+                      class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable"),
+                    },
+                  ))
     end
 
     def colgroup(node, t)

data/lib/isodoc/xref/xref_anchor.rb

@@ -3,7 +3,7 @@ require "singleton"
 module IsoDoc
   module XrefGen
     module Anchor
-      class Seen_Anchor
+      class SeenAnchor
         include Singleton
 
         def initialize

data/lib/isodoc/xref/xref_counter.rb

@@ -4,6 +4,7 @@ module IsoDoc
   module XrefGen
     class Counter
       def initialize(num = 0, opts = { numerals: :arabic })
+        @unnumbered = false
         @num = num
         @letter = ""
         @subseq = ""
@@ -112,7 +113,7 @@ module IsoDoc
       end
 
       def increment(node)
-        return self if node["unnumbered"] || node["hidden"]
+        @unnumbered = (node["unnumbered"] || node["hidden"]) and return self
 
         @letter_override = nil
         @number_override = nil
@@ -126,6 +127,8 @@ module IsoDoc
       end
 
       def print
+        return nil if @unnumbered
+
         num = @number_override || @num
         out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
         "#{@base}#{out}#{@letter_override || @letter}"

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -25,11 +25,11 @@ module IsoDoc
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
           .each do |t|
-          # next if labelled_ancestor(t) && t.ancestors("figure").empty?
+          next if blank?(t["id"])
 
           j = subfigure_increment(j, c, t)
-          label = c.print + (j.zero? ? "" : "-#{j}")
-          next if t["id"].nil? || t["id"].empty?
+          label = c.print
+          label &&= label + (j.zero? ? "" : "-#{j}")
 
           @anchors[t["id"]] = anchor_struct(
             label, nil, @labels["figure"], "figure", t["unnumbered"]