isodoc 2.12.1 → 2.12.3

data/lib/isodoc/presentation_function/section.rb

@@ -1,26 +1,12 @@
 require_relative "refs"
+require_relative "title"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
-    def middle_title(docxml)
-      s = docxml.at(ns("//sections")) or return
-      t = @meta.get[:doctitle]
-      t.nil? || t.empty? and return
-      s.add_first_child "<p class='zzSTDTitle1'>#{t}</p>"
-    end
-
-    def missing_title(docxml)
-      docxml.xpath(ns("//definitions[not(./title)]")).each do |d|
-        # should only be happening for subclauses
-        d.add_first_child "<title>#{@i18n.symbols}</title>"
-      end
-      docxml.xpath(ns("//foreword[not(./title)]")).each do |d|
-        d.add_first_child "<title>#{@i18n.foreword}</title>"
-      end
-    end
-
     def clause(docxml)
-      docxml.xpath(ns("//clause | //terms | //definitions | //references"))
+      docxml.xpath(ns("//clause | //terms | //definitions | //references | " \
+                      "//introduction | //foreword | //preface/abstract | " \
+                      "//acknowledgements | //colophon | //indexsect "))
         .each do |f|
         f.parent.name == "annex" &&
           @xrefs.klass.single_term_clause?(f.parent) and next
@@ -34,32 +20,23 @@ module IsoDoc
         elem.at("./ancestor::*[@unnumbered = 'true']")
     end
 
+    def clausedelim
+      ret = super
+      ret && !ret.empty? or return ret
+      "<span class='fmt-autonum-delim'>#{ret}</span>"
+    end
+
     def clause1(elem)
       level = @xrefs.anchor(elem["id"], :level, false) ||
         (elem.ancestors("clause, annex").size + 1)
-      t = elem.at(ns("./title")) and t["depth"] = level
-      unnumbered_clause?(elem) and return
-      lbl = @xrefs.anchor(elem["id"], :label,
-                          elem.parent.name != "sections") or return
-      prefix_name(elem, "<tab/>", "#{lbl}#{clausedelim}", "title")
-    end
-
-    def floattitle(docxml)
-      p = "//clause | //annex | //appendix | //introduction | //foreword | " \
-          "//preface/abstract | //acknowledgements | //terms | " \
-          "//definitions | //references | //colophon | //indexsect"
-      docxml.xpath(ns(p)).each { |f| floattitle1(f) }
-      # top-level
-      docxml.xpath(ns("//sections | //preface | //colophon"))
-        .each { |f| floattitle1(f) }
-    end
-
-    # TODO not currently doing anything with the @depth attribute of floating-title
-    def floattitle1(elem)
-      elem.xpath(ns(".//floating-title")).each do |p|
-        p.name = "p"
-        p["type"] = "floating-title"
+      lbl = @xrefs.anchor(elem["id"], :label, elem.parent.name != "sections")
+      if unnumbered_clause?(elem) || !lbl
+        prefix_name(elem, {}, nil, "title")
+      else
+        prefix_name(elem, { caption: "<tab/>" }, "#{lbl}#{clausedelim}",
+                    "title")
       end
+      t = elem.at(ns("./fmt-title")) and t["depth"] = level
     end
 
     def annex(docxml)
@@ -73,10 +50,18 @@ module IsoDoc
 
     def annex1(elem)
       lbl = @xrefs.anchor(elem["id"], :label)
+      # TODO: do not alter title, alter semx/@element = title
       t = elem.at(ns("./title")) and
         t.children = "<strong>#{to_xml(t.children)}</strong>"
-      unnumbered_clause?(elem) and return
-      prefix_name(elem, "<br/><br/>", lbl, "title")
+      if unnumbered_clause?(elem)
+        prefix_name(elem, {}, nil, "title")
+      else
+        prefix_name(elem, { caption: annex_delim(elem) }, lbl, "title")
+      end
+    end
+
+    def annex_delim(_elem)
+      "<br/><br/>"
     end
 
     def single_term_clause_retitle(elem)
@@ -91,7 +76,7 @@ module IsoDoc
       t = elem.at(ns("./terms | ./definitions | ./references"))
       t.xpath(ns(".//clause | .//terms | .//definitions | .//references"))
         .each do |c|
-          tit = c.at(ns("./title")) or return
+          tit = c.at(ns("./fmt-title")) or next
           tit["depth"] = tit["depth"].to_i - 1 unless tit["depth"] == "1"
         end
     end
@@ -100,8 +85,13 @@ module IsoDoc
       docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
     end
 
+    def skip_display_order?(node)
+      node.name == "floating-title"
+    end
+
     def display_order_at(docxml, xpath, idx)
       c = docxml.at(ns(xpath)) or return idx
+      skip_display_order?(c) and return idx
       idx += 1
       idx = preceding_floating_titles(c, idx)
       c["displayorder"] = idx
@@ -110,6 +100,7 @@ module IsoDoc
 
     def display_order_xpath(docxml, xpath, idx)
       docxml.xpath(ns(xpath)).each do |c|
+        skip_display_order?(c) and next
         idx += 1
         idx = preceding_floating_titles(c, idx)
         c["displayorder"] = idx
@@ -117,19 +108,6 @@ module IsoDoc
       idx
     end
 
-    def preceding_floating_titles(node, idx)
-      out = node.xpath("./preceding-sibling::*")
-        .reverse.each_with_object([]) do |p, m|
-        %w(note admonition p).include?(p.name) or break m
-        m << p
-      end
-      out.reject { |c| c["displayorder"] }.reverse_each do |c|
-        c["displayorder"] = idx
-        idx += 1
-      end
-      idx
-    end
-
     def display_order(docxml)
       i = 0
       d = @xrefs.clause_order(docxml)
@@ -143,46 +121,26 @@ module IsoDoc
       end
     end
 
-    def clausetitle(docxml)
-      cjk_extended_title(docxml)
-    end
-
-    def cjk_search
-      lang = %w(zh ja ko).map { |x| "@language = '#{x}'" }.join(" or ")
-      %(Hans Hant Jpan Hang Kore).include?(@script) and
-        lang += " or not(@language)"
-      lang
-    end
-
-    def cjk_extended_title(docxml)
-      l = cjk_search
-      docxml.xpath(ns("//bibdata/title[#{l}] | //floating-title[#{l}] | " \
-                      "//title[@depth = '1' or not(@depth)][#{l}]")).each do |t|
-        t.text.size < 4 or next
-        t.elements.empty? or next # can't be bothered
-        t.children = @i18n.cjk_extend(t.text)
-      end
-    end
-
     def preface_rearrange(doc)
-      preface_move(doc.at(ns("//preface/abstract")),
+      preface_move(doc.xpath(ns("//preface/abstract")),
                    %w(foreword introduction clause acknowledgements), doc)
-      preface_move(doc.at(ns("//preface/foreword")),
+      preface_move(doc.xpath(ns("//preface/foreword")),
                    %w(introduction clause acknowledgements), doc)
-      preface_move(doc.at(ns("//preface/introduction")),
+      preface_move(doc.xpath(ns("//preface/introduction")),
                    %w(clause acknowledgements), doc)
-      preface_move(doc.at(ns("//preface/acknowledgements")),
+      preface_move(doc.xpath(ns("//preface/acknowledgements")),
                    %w(), doc)
     end
 
-    def preface_move(clause, after, _doc)
-      clause or return
-      preface = clause.parent
+    def preface_move(clauses, after, _doc)
+      clauses.empty? and return
+      preface = clauses.first.parent
+      clauses.each do |clause|
       float = preceding_floats(clause)
-      prev = nil
       xpath = after.map { |n| "./self::xmlns:#{n}" }.join(" | ")
       xpath.empty? and xpath = "./self::*[not(following-sibling::*)]"
-      preface_move1(clause, preface, float, prev, xpath)
+      preface_move1(clause, preface, float, nil, xpath)
+      end
     end
 
     def preface_move1(clause, preface, float, prev, xpath)
@@ -192,47 +150,17 @@ module IsoDoc
         x.at(xpath) or next
         clause == prev and break
         prev ||= preface.children.first
-        float << clause
+        prev.next = clause
         float.each { |n| prev.next = n }
         break
       end
     end
 
-    def preceding_floats(clause)
-      ret = []
-      p = clause
-      while prev = p.previous_element
-        if prev.name == "floating-title"
-          ret << prev
-          p = prev
-        else break end
-      end
-      ret
-    end
-
     def rearrange_clauses(docxml)
       preface_rearrange(docxml) # feeds toc_title
       toc_title(docxml)
     end
 
-    def toc_title(docxml)
-      docxml.at(ns("//preface/clause[@type = 'toc']")) and return
-      ins = toc_title_insert_pt(docxml) or return
-      id = UUIDTools::UUID.random_create.to_s
-      ins.previous = <<~CLAUSE
-        <clause type = 'toc' id='_#{id}'><title depth='1'>#{@i18n.table_of_contents}</title></clause>
-      CLAUSE
-    end
-
-    def toc_title_insert_pt(docxml)
-      ins = docxml.at(ns("//preface")) ||
-        docxml.at(ns("//sections | //annex | //bibliography"))
-          &.before("<preface> </preface>")
-          &.previous_element or return nil
-      ins.children.empty? and ins << " "
-      ins.children.first
-    end
-
     def toc(docxml)
       toc_refs(docxml)
     end
@@ -240,7 +168,7 @@ module IsoDoc
     def toc_refs(docxml)
       docxml.xpath(ns("//toc//xref[text()]")).each do |x|
         lbl = @xrefs.anchor(x["target"], :label) or next
-        x.add_first_child "#{lbl}<tab/>"
+        x.add_first_child "#{lbl}<span class='fmt-caption-delim'><tab/></span>"
       end
     end
   end

data/lib/isodoc/presentation_function/sourcecode.rb

@@ -150,10 +150,13 @@ module IsoDoc
     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")
+      if !labelled_ancestor(elem) && # do not number if labelled_ancestor
+          lbl = @xrefs.anchor(elem["id"], :label, false)
+        #a = autonum(elem["id"], lbl)
+        #s = "<span class='fmt-element-name'>#{lower2cap @i18n.figure}</span> #{a}"
+        s = labelled_autonum(lower2cap(@i18n.figure), elem["id"], lbl)&.strip
+      end
+      prefix_name(elem, { caption: block_delim }, s, "name")
     end
   end
 end

data/lib/isodoc/presentation_function/terms.rb

@@ -115,12 +115,11 @@ module IsoDoc
 
     def termnote1(elem)
       lbl = termnote_label(elem)
-      prefix_name(elem, "", lower2cap(lbl), "name")
+      prefix_name(elem, { label: termnote_delim(elem) }, lower2cap(lbl), "name")
     end
 
     def termnote_label(elem)
-      lbl = @xrefs.anchor(elem["id"], :label) || "???"
-      l10n "#{lbl}#{termnote_delim(elem)}"
+      @xrefs.anchor(elem["id"], :label) || "???"
     end
 
     def termdefinition(docxml)
@@ -200,7 +199,7 @@ module IsoDoc
 
     def term1(elem)
       lbl = @xrefs.anchor(elem["id"], :label) or return
-      prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
+      prefix_name(elem, {}, "#{lbl}#{clausedelim}", "name")
     end
   end
 end

data/lib/isodoc/presentation_function/title.rb

@@ -0,0 +1,107 @@
+require_relative "refs"
+
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def middle_title(docxml)
+      s = docxml.at(ns("//sections")) or return
+      t = @meta.get[:doctitle]
+      t.nil? || t.empty? and return
+      s.add_first_child "<p class='zzSTDTitle1'>#{t}</p>"
+    end
+
+    def missing_title(docxml)
+      docxml.xpath(ns("//definitions[not(./title)]")).each do |d|
+        # should only be happening for subclauses
+        d.add_first_child "<title>#{@i18n.symbols}</title>"
+      end
+      docxml.xpath(ns("//foreword[not(./title)]")).each do |d|
+        d.add_first_child "<title>#{@i18n.foreword}</title>"
+      end
+    end
+
+    def floattitle(docxml)
+      docxml.xpath(ns(".//floating-title")).each { |f| floattitle1(f) }
+    end
+
+    # TODO not currently doing anything with the @depth attribute of floating-title
+    def floattitle1(elem)
+      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      p = elem.dup
+      p.children = "<semx element='floating-title' source='#{elem['id']}'>" \
+        "#{to_xml(p.children)}</semx>"
+      elem.next = p
+      p.name = "p"
+      p["type"] = "floating-title"
+      transfer_id(elem, p)
+    end
+
+    def preceding_floating_titles(node, idx)
+      out = node.xpath("./preceding-sibling::*")
+        .reverse.each_with_object([]) do |p, m|
+        %w(note admonition p floating-title).include?(p.name) or break m
+        m << p
+      end
+      #require 'debug'; out.empty? or binding.b
+      out.reject { |c| c["displayorder"] }.reverse_each do |c|
+          skip_display_order?(c) and next
+        c["displayorder"] = idx
+        idx += 1
+      end
+      idx
+    end
+
+    def clausetitle(docxml)
+      cjk_extended_title(docxml)
+    end
+
+    def cjk_search
+      lang = %w(zh ja ko).map { |x| "@language = '#{x}'" }.join(" or ")
+      %(Hans Hant Jpan Hang Kore).include?(@script) and
+        lang += " or not(@language)"
+      lang
+    end
+
+    def cjk_extended_title(doc)
+      l = cjk_search
+      doc.xpath(ns("//bibdata/title[#{l}] | //floating-title[#{l}] | " \
+                   "//fmt-title[@depth = '1' or not(@depth)][#{l}]"))
+        .each do |t|
+        t.text.size < 4 or next
+        t.traverse do |n|
+          n.text? or next
+          n.replace(@i18n.cjk_extend(n.text))
+        end
+      end
+    end
+
+    def preceding_floats(clause)
+      ret = []
+      p = clause
+      while prev = p.previous_element
+        if prev.name == "floating-title"
+          ret << prev
+          p = prev
+        else break end
+      end
+      ret
+    end
+
+    def toc_title(docxml)
+      docxml.at(ns("//preface/clause[@type = 'toc']")) and return
+      ins = toc_title_insert_pt(docxml) or return
+      id = UUIDTools::UUID.random_create.to_s
+      ins.previous = <<~CLAUSE
+        <clause type = 'toc' id='_#{id}'><fmt-title depth='1'>#{@i18n.table_of_contents}</fmt-title></clause>
+      CLAUSE
+    end
+
+    def toc_title_insert_pt(docxml)
+      ins = docxml.at(ns("//preface")) ||
+        docxml.at(ns("//sections | //annex | //bibliography"))
+          &.before("<preface> </preface>")
+          &.previous_element or return nil
+      ins.children.empty? and ins << " "
+      ins.children.first
+    end
+  end
+end

data/lib/isodoc/presentation_function/xrefs.rb

@@ -7,13 +7,14 @@ module IsoDoc
         prefix_container(container_container,
                          anchor_xref(node, container, container: true),
                          node, target)
-      l10n(@i18n.nested_xref.sub("%1", container_label)
-        .sub("%2", linkend))
+      l10n(connectives_spans(@i18n.nested_xref
+        .sub("%1", "<span class='fmt-xref-container'>#{container_label}</span>")
+        .sub("%2", linkend)))
     end
 
     def anchor_value(id)
-      @xrefs.anchor(id, :bare_xref) || @xrefs.anchor(id, :value) ||
-        @xrefs.anchor(id, :label) || @xrefs.anchor(id, :xref)
+      @xrefs.anchor(id, :bare_xref) || @xrefs.anchor(id, :label) ||
+        @xrefs.anchor(id, :value) || @xrefs.anchor(id, :xref)
     end
 
     def anchor_linkend(node, linkend)
@@ -55,14 +56,15 @@ module IsoDoc
 
     def anchor_xref_short(node, target, container)
       if (l = node["label"]) && !container
-        @i18n.l10n("#{l} #{anchor_value(target)}")
+        v = anchor_value(target)
+        @i18n.l10n(%[<span class="fmt-element-name">#{l}</span> #{v}])
       else @xrefs.anchor(target, :xref)
       end
     end
 
     def anchor_xref_full(num, title)
       (!title.nil? && !title.empty?) or return nil
-      l10n("#{num}, #{title}")
+      l10n("#{num}<span class='fmt-comma'>,</span> #{title}")
     end
 
     def prefix_container?(container, node)
@@ -133,9 +135,13 @@ module IsoDoc
     def combine_conn(list)
       list.size == 1 and list.first[:label]
       if list[1..].all? { |l| l[:conn] == "and" }
-        @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "and")
+        connectives_spans(@i18n.boolean_conj(list.map do |l|
+          loc2xref(l)
+        end, "and"))
       elsif list[1..].all? { |l| l[:conn] == "or" }
-        @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "or")
+        connectives_spans(@i18n.boolean_conj(list.map do |l|
+          loc2xref(l)
+        end, "or"))
       else
         ret = loc2xref(list[0])
         list[1..].each { |l| ret = i18n_chain_boolean(ret, l) }
@@ -144,8 +150,9 @@ module IsoDoc
     end
 
     def i18n_chain_boolean(value, entry)
-      @i18n.send("chain_#{entry[:conn]}").sub("%1", value)
-        .sub("%2", loc2xref(entry))
+      connectives_spans(@i18n.send("chain_#{entry[:conn]}")
+        .sub("%1", value)
+        .sub("%2", loc2xref(entry)))
     end
 
     def can_conflate_xref_rendering?(locs)

data/lib/isodoc/presentation_xml_convert.rb

@@ -62,9 +62,9 @@ module IsoDoc
       annex docxml
       clause docxml # feeds clausetitle
       term docxml
-      index docxml
       clausetitle docxml # feeds floattitle
       floattitle docxml # feeds rearrange_clauses
+      index docxml # fed by strip_duplicate_ids
       toc docxml
       display_order docxml
     end
@@ -79,6 +79,7 @@ module IsoDoc
       note docxml
       admonition docxml
       source docxml
+      ul docxml
       ol docxml
       dl docxml
       quote docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.12.1".freeze
+  VERSION = "2.12.3".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -102,40 +102,12 @@ module IsoDoc
         end
       end
 
-      def note_p_parse(node, div)
-        name = node.at(ns("./name"))&.remove
-        div.p class: "Note" do |p|
-          p.span class: "note_label" do |s|
-            name&.children&.each { |n| parse(n, s) }
-          end
-          insert_tab(p, 1)
-          node.first_element_child.children.each { |n| parse(n, p) }
-        end
-        node.element_children[1..].each { |n| parse(n, div) }
+      def note_p_class
+        "Note"
       end
 
-      def note_parse1(node, div)
-        name = node.at(ns("./name"))&.remove
-        div.p class: "Note" do |p|
-          p.span class: "note_label" do |s|
-            name&.children&.each { |n| parse(n, s) }
-          end
-          insert_tab(p, 1)
-        end
-        node.children.each { |n| parse(n, div) }
-      end
-
-      def termnote_parse(node, out)
-        name = node&.at(ns("./name"))&.remove
-        out.div **note_attrs(node) do |div|
-          div.p class: "Note" do |p|
-            if name
-              name.children.each { |n| parse(n, p) }
-              p << " "
-            end
-            para_then_remainder(node.first_element_child, node, p, div)
-          end
-        end
+      def termnote_p_class
+        "Note"
       end
 
       def para_attrs(node)
@@ -164,7 +136,7 @@ module IsoDoc
           div.p do |_p|
             parse(node.at(ns("./stem")), div)
             insert_tab(div, 1)
-            if lbl = node&.at(ns("./name"))&.text
+            if lbl = node&.at(ns("./fmt-name"))&.text
               div << lbl
             end
           end
@@ -185,10 +157,10 @@ module IsoDoc
         page_break(out)
         out.div **attr_code(preface_attrs(clause)) do |div|
           div.p class: "zzContents" do |p|
-            clause.at(ns("./title"))&.children&.each { |c| parse(c, p) }
+            clause.at(ns("./fmt-title"))&.children&.each { |c| parse(c, p) }
           end
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end

data/lib/isodoc/word_function/footnotes.rb

@@ -83,7 +83,7 @@ module IsoDoc
 
       def footnote_parse(node, out)
         return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
-          !node.ancestors.map(&:name).include?("name")
+          !node.ancestors.map(&:name).include?("fmt-name")
 
         fn = node["reference"] || UUIDTools::UUID.random_create.to_s
         return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)

data/lib/isodoc/word_function/lists.rb

@@ -25,13 +25,13 @@ module IsoDoc
 
       def dl_parse_nontable(node, out)
         out.div **attr_code(class: "figdl") do |div|
-        node["id"] and bookmark_parse(node, div)
-        list_title_parse(node, div)
-        node.elements.select { |n| dt_dd?(n) }
-          .each_slice(2) do |dt, dd|
-          dl_parse_nontable1(div, dt, dd)
-        end
-        dl_parse_notes(node, div)
+          node["id"] and bookmark_parse(node, div)
+          list_title_parse(node, div)
+          node.elements.select { |n| dt_dd?(n) }
+            .each_slice(2) do |dt, dd|
+            dl_parse_nontable1(div, dt, dd)
+          end
+          dl_parse_notes(node, div)
         end
       end
 
@@ -58,13 +58,13 @@ module IsoDoc
 
       def ddef_other_paras(out, ddef)
         ddef.elements&.first&.name == "p" or return
-        ddef.children[1..-1].each { |n| parse(n, out) }
+        ddef.children[1..].each { |n| parse(n, out) }
       end
 
       def dl_parse_table(node, out)
         list_title_parse(node, out)
         out.table **attr_code(id: node["id"],
-                              class: (node["class"] || "dl")) do |v|
+                              class: node["class"] || "dl") do |v|
           node.elements.select { |n| dt_dd?(n) }
             .each_slice(2) do |dt, dd|
             dl_parse_table1(v, dt, dd)
@@ -85,7 +85,9 @@ module IsoDoc
       end
 
       def dl_parse_table_notes(node, out)
-        remainder = node.elements.reject { |n| dt_dd?(n) || n.name == "name" }
+        remainder = node.elements.reject do |n|
+          dt_dd?(n) || n.name == "fmt-name"
+        end
         remainder.empty? and return
         out.tr do |tr|
           tr.td colspan: 2 do |td|

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -22,7 +22,6 @@ module IsoDoc
         cover = File.read(@wordcoverpage, encoding: "UTF-8")
         cover = populate_template(cover, :word)
         coverxml = to_word_xhtml_fragment(cover)
-        #ins.children.first.previous = coverxml.to_xml(encoding: "US-ASCII")
         ins.add_first_child coverxml.to_xml(encoding: "US-ASCII")
       end
 
@@ -32,7 +31,6 @@ module IsoDoc
                            docxml, level)
         intro = populate_template(intro, :word)
         introxml = to_word_xhtml_fragment(intro)
-        #ins.children.first.previous = introxml.to_xml(encoding: "US-ASCII")
         ins.add_first_child introxml.to_xml(encoding: "US-ASCII")
       end
 

data/lib/isodoc/word_function/postprocess_table.rb

@@ -44,7 +44,7 @@ module IsoDoc
 
       def word_nested_tables(docxml)
         docxml.xpath("//table").each do |t|
-          t.xpath(".//table").reverse.each do |tt|
+          t.xpath(".//table").reverse_each do |tt|
             t.next = tt.remove
           end
         end

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -169,7 +169,7 @@ module IsoDoc
       def recommmendation_sort_key(header)
         m = /^([^0-9]+) (\d+)/.match(header) || /^([^:]+)/.match(header)
         m ||= [header, nil]
-        ret = "#{recommmendation_sort_key1(m[1])}::"
+        ret = "#{recommmendation_sort_key1(m[1]&.strip)}::"
         m[2] and ret += ("%04d" % m[2].to_i).to_s
         ret
       end