metanorma-iso 1.9.2 → 1.9.6

data/lib/asciidoctor/iso/section.rb

@@ -15,7 +15,7 @@ module Asciidoctor
       end
 
       def appendix_parse(attrs, xml, node)
-        attrs["inline-header".to_sym] = node.option? "inline-header"
+        attrs[:"inline-header"] = node.option? "inline-header"
         set_obligation(attrs, node)
         xml.appendix **attr_code(attrs) do |xml_section|
           xml_section.title { |name| name << node.title }
@@ -38,6 +38,12 @@ module Asciidoctor
 
         super
       end
+
+      def term_def_subclause_parse(attrs, xml, node)
+        node.role == "term" and
+          return term_def_subclause_parse1(attrs, xml, node)
+        super
+      end
     end
   end
 end

data/lib/asciidoctor/iso/validate_section.rb

@@ -32,10 +32,10 @@ module Asciidoctor
       end
 
       ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated "\
-        "Terms section in the standard".freeze
+                            "Terms section in the standard".freeze
 
       NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can "\
-        "only contain a definition list".freeze
+                               "only contain a definition list".freeze
 
       def symbols_validate(root)
         f = root.xpath("//definitions")
@@ -87,7 +87,7 @@ module Asciidoctor
           },
           {
             msg: "Normative References must be followed by "\
-            "Terms and Definitions",
+                 "Terms and Definitions",
             val: ["./self::terms | .//terms"],
           },
         ].freeze
@@ -127,17 +127,20 @@ module Asciidoctor
         end
         elem&.at("./self::clause") ||
           @log.add("Style", elem, "Document must contain clause after "\
-                   "Terms and Definitions")
+                                  "Terms and Definitions")
         elem&.at("./self::clause[@type = 'scope']") &&
-          @log.add("Style", elem, "Scope must occur before Terms and Definitions")
+          @log.add("Style", elem,
+                   "Scope must occur before Terms and Definitions")
         elem = names.shift
         while elem&.name == "clause"
           elem&.at("./self::clause[@type = 'scope']")
-          @log.add("Style", elem, "Scope must occur before Terms and Definitions")
+          @log.add("Style", elem,
+                   "Scope must occur before Terms and Definitions")
           elem = names.shift
         end
         %w(annex references).include? elem&.name or
-          @log.add("Style", elem, "Only annexes and references can follow clauses")
+          @log.add("Style", elem,
+                   "Only annexes and references can follow clauses")
         [names, elem]
       end
 
@@ -146,7 +149,8 @@ module Asciidoctor
           elem = names.shift
         end
         %w(annex references).include? elem&.name or
-          @log.add("Style", elem, "Only annexes and references can follow terms and clauses")
+          @log.add("Style", elem,
+                   "Only annexes and references can follow terms and clauses")
         [names, elem]
       end
 
@@ -155,25 +159,19 @@ module Asciidoctor
           elem = names.shift
           if elem.nil?
             @log.add("Style", nil, "Document must include (references) "\
-                     "Normative References")
+                                   "Normative References")
           end
         end
         elem&.at("./self::references[@normative = 'true']") ||
           @log.add("Style", nil, "Document must include (references) "\
-                   "Normative References")
+                                 "Normative References")
         elem = names&.shift
         elem&.at("./self::references[@normative = 'false']") ||
-          @log.add("Style", elem, "Final section must be (references) Bibliography")
+          @log.add("Style", elem,
+                   "Final section must be (references) Bibliography")
         names.empty? ||
-          @log.add("Style", elem, "There are sections after the final Bibliography")
-      end
-
-      def style_warning(node, msg, text = nil)
-        return if @novalid
-
-        w = msg
-        w += ": #{text}" if text
-        @log.add("Style", node, w)
+          @log.add("Style", elem,
+                   "There are sections after the final Bibliography")
       end
 
       NORM_ISO_WARN = "non-ISO/IEC reference not expected as normative".freeze

data/lib/asciidoctor/iso/validate_style.rb

@@ -70,18 +70,18 @@ module Asciidoctor
         style(node, extract_text(node))
       end
 
-      def style_regex(re, warning, n, text)
-        (m = re.match(text)) && style_warning(n, warning, m[:num])
+      def style_regex(regex, warning, n, text)
+        (m = regex.match(text)) && style_warning(n, warning, m[:num])
       end
 
       # style check with a regex on a token
       # and a negative match on its preceding token
-      def style_two_regex_not_prev(n, text, re, re_prev, warning)
+      def style_two_regex_not_prev(n, text, regex, re_prev, warning)
         return if text.nil?
 
         arr = Tokenizer::WhitespaceTokenizer.new.tokenize(text)
         arr.each_index do |i|
-          m = re.match arr[i]
+          m = regex.match arr[i]
           m_prev = i.zero? ? nil : re_prev.match(arr[i - 1])
           if !m.nil? && m_prev.nil?
             style_warning(n, warning, m[:num])
@@ -132,22 +132,22 @@ module Asciidoctor
 
       # leaving out as problematic: N J K C S T H h d B o E
       SI_UNIT = "(m|cm|mm|km|μm|nm|g|kg|mgmol|cd|rad|sr|Hz|Hz|MHz|Pa|hPa|kJ|"\
-        "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|"\
-        "bit|kB|MB|Hart|nat|Sh|var)".freeze
+                "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|"\
+                "bit|kB|MB|Hart|nat|Sh|var)".freeze
 
       # ISO/IEC DIR 2, 9.3
       def style_units(node, text)
         style_regex(/\b(?<num>[0-9][0-9,]*\s+[\u00b0\u2032\u2033])/,
                     "space between number and degrees/minutes/seconds",
                     node, text)
-        style_regex(/\b(?<num>[0-9][0-9,]*#{SI_UNIT})\b/,
+        style_regex(/\b(?<num>[0-9][0-9,]*#{SI_UNIT})\b/o,
                     "no space between number and SI unit", node, text)
         style_non_std_units(node, text)
       end
 
       NONSTD_UNITS = {
-        "sec": "s", "mins": "min", "hrs": "h", "hr": "h", "cc": "cm^3",
-        "lit": "l", "amp": "A", "amps": "A", "rpm": "r/min"
+        sec: "s", mins: "min", hrs: "h", hr: "h", cc: "cm^3",
+        lit: "l", amp: "A", amps: "A", rpm: "r/min"
       }.freeze
 
       # ISO/IEC DIR 2, 9.3
@@ -157,6 +157,14 @@ module Asciidoctor
                       "non-standard unit (should be #{v})", node, text)
         end
       end
+
+      def style_warning(node, msg, text = nil)
+        return if @novalid
+
+        w = msg
+        w += ": #{text}" if text
+        @log.add("Style", node, w)
+      end
     end
   end
 end

data/lib/isodoc/iso/html/isodoc.css

@@ -1,4 +1,3 @@
-@charset "UTF-8";
 p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -208,7 +207,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle {
   mso-style-name: "Annex Table Title";
   mso-style-unhide: no;
   mso-style-qformat: yes;
-  mso-style-parent: "Παράγραφος λίστας";
+  mso-style-parent: "List Paragraph";
   mso-style-link: "Annex Table Title Char";
   margin-top: 0cm;
   margin-right: 0cm;

data/lib/isodoc/iso/html/isodoc.scss

@@ -197,7 +197,7 @@ p.AnnexTableTitle, li.AnnexTableTitle, div.AnnexTableTitle
 	{mso-style-name:"Annex Table Title";
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
-	mso-style-parent:"Παράγραφος λίστας";
+	mso-style-parent:"List Paragraph";
 	mso-style-link:"Annex Table Title Char";
 	margin-top:0cm;
 	margin-right:0cm;

data/lib/isodoc/iso/html/wordstyle.css

@@ -130,7 +130,7 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText {
 p.MsoList, li.MsoList, div.MsoList {
   mso-style-priority: 4;
   mso-style-unhide: no;
-  mso-style-parent: "MsoListParagraph";
+  mso-style-parent: "List Paragraph";
   margin-top: 0cm;
   margin-right: 0cm;
   margin-bottom: 6.0pt;
@@ -151,7 +151,7 @@ p.MsoList, li.MsoList, div.MsoList {
 p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst {
   mso-style-priority: 4;
   mso-style-unhide: no;
-  mso-style-parent: "MsoListParagraph";
+  mso-style-parent: "List Paragraph";
   mso-style-type: export-only;
   margin-top: 0cm;
   margin-right: 0cm;
@@ -173,7 +173,7 @@ p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst {
 p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle {
   mso-style-priority: 4;
   mso-style-unhide: no;
-  mso-style-parent: "MsoListParagraph";
+  mso-style-parent: "List Paragraph";
   mso-style-type: export-only;
   margin-top: 0cm;
   margin-right: 0cm;
@@ -195,7 +195,7 @@ p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle {
 p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast {
   mso-style-priority: 4;
   mso-style-unhide: no;
-  mso-style-parent: "MsoListParagraph";
+  mso-style-parent: "List Paragraph";
   mso-style-type: export-only;
   margin-top: 0cm;
   margin-right: 0cm;
@@ -217,6 +217,7 @@ p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast {
 p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
   mso-style-priority: 34;
   mso-style-unhide: no;
+  mso-style-name: "List Paragraph";
   mso-style-qformat: yes;
   margin-top: 0cm;
   margin-right: 0cm;
@@ -292,6 +293,7 @@ h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 1";
   mso-style-link: "Heading 1 Char";
   mso-style-next: Normal;
   margin-top: 13.5pt;
@@ -360,6 +362,7 @@ h1.Annex {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 2";
   mso-style-parent: "Heading 1";
   mso-style-link: "Heading 2 Char";
   mso-style-next: Normal;
@@ -396,6 +399,7 @@ h2 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 3";
   mso-style-parent: "Heading 1";
   mso-style-link: "Heading 3 Char";
   mso-style-next: Normal;
@@ -432,6 +436,7 @@ h3 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 4";
   mso-style-parent: "Heading 3";
   mso-style-link: "Heading 4 Char";
   mso-style-next: Normal;
@@ -466,6 +471,7 @@ h4 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 5";
   mso-style-parent: "Heading 4";
   mso-style-link: "Heading 5 Char";
   mso-style-next: Normal;
@@ -500,6 +506,7 @@ h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 6";
   mso-style-parent: "Heading 5";
   mso-style-link: "Heading 6 Char";
   mso-style-next: Normal;
@@ -533,6 +540,7 @@ h6 {
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 1";
   mso-style-next: Normal;
   margin-top: 6.0pt;
   margin-right: 25.0pt;
@@ -555,6 +563,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
   mso-style-noshow: yes;
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 2";
   mso-style-parent: "TOC 1";
   mso-style-next: Normal;
   margin-top: 0cm;
@@ -578,6 +587,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
   mso-style-noshow: yes;
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 3";
   mso-style-parent: "TOC 2";
   mso-style-next: Normal;
   margin-top: 0cm;
@@ -683,6 +693,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
 
 span.MsoFootnoteReference {
   mso-style-priority: 99;
+  mso-style-name: "Footnote Reference";
   vertical-align: super; }
 
 p.MsoCaption, li.MsoCaption, div.MsoCaption {
@@ -1084,6 +1095,7 @@ span.BodyTextChar, span.Char3 {
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   mso-style-noshow: yes;
   mso-style-priority: 99;
+  mso-style-name: "Comment Text";
   mso-style-link: "Comment Text Char";
   margin-top: 0cm;
   margin-right: 0cm;

data/lib/isodoc/iso/html/wordstyle.scss

@@ -118,7 +118,7 @@ p.MsoBlockText, li.MsoBlockText, div.MsoBlockText
 p.MsoList, li.MsoList, div.MsoList
 	{mso-style-priority:4;
 	mso-style-unhide:no;
-	mso-style-parent:"MsoListParagraph";
+	mso-style-parent:"List Paragraph";
 	margin-top:0cm;
 	margin-right:0cm;
 	margin-bottom:6.0pt;
@@ -138,7 +138,7 @@ p.MsoList, li.MsoList, div.MsoList
 p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst
 	{mso-style-priority:4;
 	mso-style-unhide:no;
-	mso-style-parent:"MsoListParagraph";
+	mso-style-parent:"List Paragraph";
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
@@ -159,7 +159,7 @@ p.MsoListCxSpFirst, li.MsoListCxSpFirst, div.MsoListCxSpFirst
 p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle
 	{mso-style-priority:4;
 	mso-style-unhide:no;
-	mso-style-parent:"MsoListParagraph";
+	mso-style-parent:"List Paragraph";
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
@@ -180,7 +180,7 @@ p.MsoListCxSpMiddle, li.MsoListCxSpMiddle, div.MsoListCxSpMiddle
 p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast
 	{mso-style-priority:4;
 	mso-style-unhide:no;
-	mso-style-parent:"MsoListParagraph";
+	mso-style-parent:"List Paragraph";
 	mso-style-type:export-only;
 	margin-top:0cm;
 	margin-right:0cm;
@@ -201,6 +201,7 @@ p.MsoListCxSpLast, li.MsoListCxSpLast, div.MsoListCxSpLast
 p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
 	{mso-style-priority:34;
 	mso-style-unhide:no;
+	mso-style-name:"List Paragraph";
 	mso-style-qformat:yes;
 	margin-top:0cm;
 	margin-right:0cm;
@@ -272,6 +273,7 @@ h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 1";
 	mso-style-link:"Heading 1 Char";
 	mso-style-next:Normal;
 	margin-top:13.5pt;
@@ -338,6 +340,7 @@ h1.Annex
         {mso-style-priority:2;
         mso-style-unhide:no;
         mso-style-qformat:yes;
+	mso-style-name:"Heading 2";
         mso-style-parent:"Heading 1";
         mso-style-link:"Heading 2 Char";
         mso-style-next:Normal;
@@ -373,6 +376,7 @@ h2
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 3";
 	mso-style-parent:"Heading 1";
 	mso-style-link:"Heading 3 Char";
 	mso-style-next:Normal;
@@ -407,6 +411,7 @@ h3      {mso-list:l1 level3 lfo6;
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 4";
 	mso-style-parent:"Heading 3";
 	mso-style-link:"Heading 4 Char";
 	mso-style-next:Normal;
@@ -439,6 +444,7 @@ h4      {mso-list:l1 level4 lfo6;
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 5";
 	mso-style-parent:"Heading 4";
 	mso-style-link:"Heading 5 Char";
 	mso-style-next:Normal;
@@ -471,6 +477,7 @@ h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 6";
 	mso-style-parent:"Heading 5";
 	mso-style-link:"Heading 6 Char";
 	mso-style-next:Normal;
@@ -502,6 +509,7 @@ h6      {mso-list:l1 level6 lfo6;
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 1";
 	mso-style-next:Normal;
 	margin-top:6.0pt;
 	margin-right:25.0pt;
@@ -523,6 +531,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	{mso-style-noshow:yes;
 	mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 2";
 	mso-style-parent:"TOC 1";
 	mso-style-next:Normal;
 	margin-top:0cm;
@@ -545,6 +554,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	{mso-style-noshow:yes;
 	mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 3";
 	mso-style-parent:"TOC 2";
 	mso-style-next:Normal;
 	margin-top:0cm;
@@ -645,6 +655,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
         mso-ansi-language:EN-GB;}
 span.MsoFootnoteReference
 	{mso-style-priority:99;
+        mso-style-name:"Footnote Reference";
 	vertical-align:super;}
 p.MsoCaption, li.MsoCaption, div.MsoCaption
 	{mso-style-priority:35;
@@ -1022,6 +1033,7 @@ span.BodyTextChar, span.Char3
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	{mso-style-noshow:yes;
 	mso-style-priority:99;
+	mso-style-name:"Comment Text";
 	mso-style-link:"Comment Text Char";
 	margin-top:0cm;
 	margin-right:0cm;

data/lib/isodoc/iso/index.rb

@@ -7,12 +7,13 @@ module IsoDoc
 
       def index(docxml)
         unless docxml.at(ns("//index"))
-          docxml.xpath(ns("//indexsect")).each { |i| i.remove }
+          docxml.xpath(ns("//indexsect")).each(&:remove)
           return
         end
         i = docxml.at(ns("//indexsect")) ||
           docxml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}</title></indexsect>").first
-        index = sort_indexterms(docxml.xpath(ns("//index")), docxml.xpath(ns("//index-xref[@also = 'false']")),
+        index = sort_indexterms(docxml.xpath(ns("//index")),
+                                docxml.xpath(ns("//index-xref[@also = 'false']")),
                                 docxml.xpath(ns("//index-xref[@also = 'true']")))
         index1(docxml, i, index)
       end
@@ -20,10 +21,12 @@ module IsoDoc
       def index1(docxml, i, index)
         c = i.add_child("<ul></ul>").first
         index.keys.sort.each do |k|
-          #c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
-          words = index[k].keys.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
+          # c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
+          words = index[k].keys.each_with_object({}) do |w, v|
+            v[sortable(w).downcase] = w
+          end
           words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            #c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
+            # c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
             c.add_child index_entries(words, index[k], w)
           end
         end
@@ -31,8 +34,8 @@ module IsoDoc
         @xrefs.bookmark_anchor_names(docxml)
       end
 
-      def sortable(s)
-        HTMLEntities.new.decode(Nokogiri::XML.fragment(s).text)
+      def sortable(str)
+        HTMLEntities.new.decode(Nokogiri::XML.fragment(str).text)
       end
 
       def index_entries_opt
@@ -40,8 +43,12 @@ module IsoDoc
       end
 
       def index_entries(words, index, primary)
-        ret = index_entries_head(words[primary], index.dig(words[primary], nil, nil), index_entries_opt)
-        words2 = index[words[primary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        ret = index_entries_head(words[primary],
+                                 index.dig(words[primary], nil, nil),
+                                 index_entries_opt)
+        words2 = index[words[primary]]&.keys&.reject do |k|
+                   k.nil?
+                 end&.each_with_object({}) { |w, v| v[w.downcase] = w }
         unless words2.empty?
           ret += "<ul>"
           words2.keys.localize(@lang.to_sym).sort.to_a.each do |w|
@@ -53,12 +60,18 @@ module IsoDoc
       end
 
       def index_entries2(words, index, secondary)
-        ret = index_entries_head(words[secondary], index.dig(words[secondary], nil), index_entries_opt)
-        words3 = index[words[secondary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        ret = index_entries_head(words[secondary],
+                                 index.dig(words[secondary], nil),
+                                 index_entries_opt)
+        words3 = index[words[secondary]]&.keys&.reject do |k|
+                   k.nil?
+                 end&.each_with_object({}) { |w, v| v[w.downcase] = w }
         unless words3.empty?
           ret += "<ul>"
           words3.keys.localize(@lang.to_sym).sort.to_a.each do |w|
-            ret += (index_entries_head(words3[w], index[words[secondary]][words3[w]], index_entries_opt) + "</li>")
+            ret += (index_entries_head(words3[w],
+                                       index[words[secondary]][words3[w]],
+                                       index_entries_opt) + "</li>")
           end
           ret += "</ul>"
         end
@@ -68,10 +81,18 @@ module IsoDoc
       def index_entries_head(head, entries, opt)
         ret = "<li>#{head}"
         xref = entries&.dig(:xref)&.join(", ")
-        see_sort = entries&.dig(:see)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
-        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| see_sort[k] }&.join(", ")
-        also_sort = entries&.dig(:also)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
-        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| also_sort[k] }&.join(", ")
+        see_sort = entries&.dig(:see)&.each_with_object({}) do |w, v|
+          v[sortable(w).downcase] = w
+        end
+        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
+                see_sort[k]
+              end&.join(", ")
+        also_sort = entries&.dig(:also)&.each_with_object({}) do |w, v|
+          v[sortable(w).downcase] = w
+        end
+        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map do |k|
+                 also_sort[k]
+               end&.join(", ")
         ret += "#{opt[:xref_lbl]} #{xref}" if xref
         ret += "#{opt[:see_lbl]} #{see}" if see
         ret += "#{opt[:also_lbl]} #{also}" if also
@@ -96,8 +117,8 @@ module IsoDoc
         end
       end
 
-      def extract_indexsee(v, terms, label)
-        terms.each_with_object(v) do |t, v|
+      def extract_indexsee(val, terms, label)
+        terms.each_with_object(val) do |t, v|
           term = t&.at(ns("./primary"))&.children&.to_xml
           term2 = t&.at(ns("./secondary"))&.children&.to_xml
           term3 = t&.at(ns("./tertiary"))&.children&.to_xml
@@ -110,8 +131,11 @@ module IsoDoc
         end
       end
 
-      def xml_encode_attr(s)
-        HTMLEntities.new.encode(s, :basic, :hexadecimal).gsub(/\&#x([^;]+);/) { |x| "&#x#{$1.upcase};" }
+      def xml_encode_attr(str)
+        HTMLEntities.new.encode(str, :basic, :hexadecimal)
+          .gsub(/&#x([^;]+);/) do |_x|
+          "&#x#{$1.upcase};"
+        end
       end
 
       # attributes are decoded into UTF-8, elements in extract_indexsee are still in entities
@@ -130,10 +154,10 @@ module IsoDoc
         end
       end
 
-      def index2bookmark(t)
-        t.name = "bookmark"
-        t.children.each { |x| x.remove }
-        t["id"] = "_#{UUIDTools::UUID.random_create}"
+      def index2bookmark(node)
+        node.name = "bookmark"
+        node.children.each(&:remove)
+        node["id"] = "_#{UUIDTools::UUID.random_create}"
       end
     end
   end