metanorma-standoc 1.11.2 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a5cc91caf1f8d674aeff3b46209557d7be11087bf59728df07a73b26cec880a
-  data.tar.gz: 7b674d7c013a3e5aee09394c085ee40dbbed6e241ffb14a14b363ca5956636f5
+  metadata.gz: 7756f8b45a6897bf3a40e48df348a746bc75b30820597fa8ceadedcbbceb89d9
+  data.tar.gz: e62b62dd699df95d46bd13c18656bf3504c3a34936ff0a094d224d12a9f44987
 SHA512:
-  metadata.gz: dab0eafeeb100111eecdd7ae0eeb3a23dd1b60acdbf1fc884a7fba6084db22bc816c8255c230a16eb4ab0fc68555378586106145545672a5b39d444e8a3f97c8
-  data.tar.gz: 1f6ffc49435ffebec0441fafbf4a6eb629216270d0d8fd38d68ad15a5d99e4e3162f3d685229827e0eb1df2a2c6d43aaf475795cbcdb143b772d5589787248ff
+  metadata.gz: 9776d2bfd161b5500e5ac9e8ea47a9597befe1642880a18fdc86839ceee0688e879d37de0bd9000420294f6a0094f455c840643e091a11da0b65489434a44bf9
+  data.tar.gz: 4f4d5f119ce92541ee1a89320fdc094352f3ca2ac885f1d52438279e4f70b995d0f87b4f7d034bafc63f05e2192b9ae8b7f4063dd1972525d773ec2f66e27dd1

data/Gemfile

@@ -9,3 +9,5 @@ gemspec
 if File.exist? 'Gemfile.devel'
   eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
 end
+
+gem "reline", "~> 0.2.8.pre.11"

data/lib/asciidoctor/standoc/base.rb

@@ -8,6 +8,7 @@ require "relaton"
 require "fileutils"
 require "metanorma-utils"
 require "isodoc/xslfo_convert"
+require_relative "render"
 
 module Asciidoctor
   module Standoc
@@ -24,85 +25,6 @@ module Asciidoctor
         self.class::XML_NAMESPACE
       end
 
-      def html_extract_attributes(node)
-        {
-          script: node.attr("script"),
-          bodyfont: node.attr("body-font"),
-          headerfont: node.attr("header-font"),
-          monospacefont: node.attr("monospace-font"),
-          i18nyaml: node.attr("i18nyaml"),
-          scope: node.attr("scope"),
-          htmlstylesheet: node.attr("htmlstylesheet"),
-          htmlstylesheet_override: node.attr("htmlstylesheet-override"),
-          htmlcoverpage: node.attr("htmlcoverpage"),
-          htmlintropage: node.attr("htmlintropage"),
-          scripts: node.attr("scripts"),
-          scripts_override: node.attr("scripts-override"),
-          scripts_pdf: node.attr("scripts-pdf"),
-          datauriimage: node.attr("data-uri-image") != "false",
-          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
-          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
-          break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
-          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
-          bare: node.attr("bare"),
-          sectionsplit: node.attr("sectionsplit"),
-          baseassetpath: node.attr("base-asset-path"),
-          aligncrosselements: node.attr("align-cross-elements"),
-        }
-      end
-
-      def html_converter(node)
-        IsoDoc::HtmlConvert.new(html_extract_attributes(node))
-      end
-
-      def pdf_converter(node)
-        return nil if node.attr("no-pdf")
-
-        IsoDoc::Standoc::PdfConvert.new(doc_extract_attributes(node))
-      end
-
-      def doc_extract_attributes(node)
-        attrs = {
-          script: node.attr("script"),
-          bodyfont: node.attr("body-font"),
-          headerfont: node.attr("header-font"),
-          monospacefont: node.attr("monospace-font"),
-          i18nyaml: node.attr("i18nyaml"),
-          scope: node.attr("scope"),
-          wordstylesheet: node.attr("wordstylesheet"),
-          wordstylesheet_override: node.attr("wordstylesheet-override"),
-          standardstylesheet: node.attr("standardstylesheet"),
-          header: node.attr("header"),
-          wordcoverpage: node.attr("wordcoverpage"),
-          wordintropage: node.attr("wordintropage"),
-          ulstyle: node.attr("ulstyle"),
-          olstyle: node.attr("olstyle"),
-          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
-          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
-          break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
-          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
-          bare: node.attr("bare"),
-          baseassetpath: node.attr("base-asset-path"),
-          aligncrosselements: node.attr("align-cross-elements"),
-        }
-
-        if fonts_manifest = node.attr(FONTS_MANIFEST)
-          attrs[IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS] = {
-            IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => fonts_manifest,
-          }
-        end
-
-        attrs
-      end
-
-      def doc_converter(node)
-        IsoDoc::WordConvert.new(doc_extract_attributes(node))
-      end
-
-      def presentation_xml_converter(node)
-        IsoDoc::PresentationXMLConvert.new(html_extract_attributes(node))
-      end
-
       def init(node)
         @fn_number ||= 0
         @draft = false
@@ -124,6 +46,7 @@ module Asciidoctor
         @output_dir = outputdir node
         @no_isobib_cache = node.attr("no-isobib-cache")
         @no_isobib = node.attr("no-isobib")
+        @index_terms = node.attr("index-terms")
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
         @bibdb = nil
@@ -136,31 +59,12 @@ module Asciidoctor
         init_bib_caches(node)
         init_iev_caches(node)
         @lang = (node.attr("language") || "en")
-        @script = (node.attr("script") || default_script(node.attr("language")))
+        @script = (node.attr("script") ||
+                   Metanorma::Utils.default_script(node.attr("language")))
         @isodoc = isodoc(@lang, @script, node.attr("i18nyaml"))
         @i18n = @isodoc.i18n
       end
 
-      def default_fonts(node)
-        b = node.attr("body-font") ||
-          (node.attr("script") == "Hans" ? '"Source Han Sans",serif' : '"Cambria",serif')
-        h = node.attr("header-font") ||
-          (node.attr("script") == "Hans" ? '"Source Han Sans",sans-serif' : '"Cambria",serif')
-        m = node.attr("monospace-font") || '"Courier New",monospace'
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
-      end
-
-      def outputs(node, ret)
-        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
-        presentation_xml_converter(node).convert("#{@filename}.xml")
-        html_converter(node).convert("#{@filename}.presentation.xml",
-                                     nil, false, "#{@filename}.html")
-        doc_converter(node).convert("#{@filename}.presentation.xml",
-                                    nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
-                                     nil, false, "#{@filename}.pdf")
-      end
-
       def document(node)
         init(node)
         ret = makexml(node).to_xml(encoding: "US-ASCII", indent: 2)

data/lib/asciidoctor/standoc/cleanup.rb

@@ -48,6 +48,7 @@ module Asciidoctor
         termdef_cleanup(xmldoc)
         RelatonIev::iev_cleanup(xmldoc, @bibdb)
         element_name_cleanup(xmldoc)
+        index_cleanup(xmldoc)
         bpart_cleanup(xmldoc)
         quotesource_cleanup(xmldoc)
         callout_cleanup(xmldoc)

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -89,8 +89,7 @@ module Asciidoctor
       def note_cleanup(xmldoc)
         q = "//note[following-sibling::*[not(local-name() = 'note')]]"
         xmldoc.xpath(q).each do |n|
-          next if n["keep-separate"] == "true"
-          next unless n.ancestors("table").empty?
+          next if n["keep-separate"] == "true" || !n.ancestors("table").empty?
 
           prev = n.previous_element || next
           n.parent = prev if ELEMS_ALLOW_NOTES.include? prev.name

data/lib/asciidoctor/standoc/cleanup_inline.rb

@@ -159,15 +159,25 @@ module Asciidoctor
       end
 
       def contenthash_id_cleanup(doc)
-        ids = doc.xpath("//*[@id]").each_with_object({}) do |x, m|
+        ids = contenthash_id_make(doc)
+        contenthash_id_update_refs(doc, ids)
+      end
+
+      def contenthash_id_make(doc)
+        doc.xpath("//*[@id]").each_with_object({}) do |x, m|
           next unless guid?(x["id"])
 
           m[x["id"]] = contenthash(x)
           x["id"] = m[x["id"]]
         end
-        [%w(review from), %(review to), %(callout target), %(eref bibitemid),
-         %(citation bibitemid), %(xref target), %(xref to)].each do |a|
-          doc.xpath("//#{a[0]}").each { |x| ids[a[1]] and x[a[1]] = ids[a[1]] }
+      end
+
+      def contenthash_id_update_refs(doc, ids)
+        [%w(review from), %w(review to), %w(callout target), %w(eref bibitemid),
+         %w(citation bibitemid), %w(xref target), %w(xref to)].each do |a|
+          doc.xpath("//#{a[0]}").each do |x|
+            ids[x[a[1]]] and x[a[1]] = ids[x[a[1]]]
+          end
         end
       end
 

data/lib/asciidoctor/standoc/cleanup_reqt.rb

@@ -48,10 +48,10 @@ module Asciidoctor
       end
 
       def requirement_description_wrap(reqt, text)
-        return if text.element? && (reqt_subpart(text.name) ||
+        return if (text.element? && (reqt_subpart(text.name) ||
                 %w(requirement recommendation
-                   permission).include?(text.name)) ||
-          text.text.strip.empty?
+                   permission).include?(text.name))) ||
+          (text.text.strip.empty? && !text.at(".//xref | .//eref | .//link"))
 
         t = Nokogiri::XML::Element.new("description", reqt)
         text.before(t)

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -27,7 +27,8 @@ module Asciidoctor
       end
 
       TERMDEF_BLOCKS =
-        "./p | ./ol | ./dl | ./ul | ./figure | ./formula | ./table".freeze
+        "./p | ./ol | ./dl[not(@metadata = 'true')] | ./ul | ./figure | "\
+        "./formula | ./table".freeze
 
       def generate_termdefinitions(xmldoc)
         xmldoc.xpath("//term[not(definition)]").each do |d|
@@ -113,6 +114,27 @@ module Asciidoctor
         term_children_cleanup(xmldoc)
         termdocsource_cleanup(xmldoc)
       end
+
+      def index_cleanup(xmldoc)
+        return unless @index_terms
+
+        xmldoc.xpath("//preferred").each do |p|
+          index_cleanup1(p.at("./expression/name | ./letter-symbol/name"),
+                         p.xpath("./field-of-application | ./usage-info")
+            &.map(&:text)&.join(", "))
+        end
+        xmldoc.xpath("//definitions/dl/dt").each do |p|
+          index_cleanup1(p, "")
+        end
+      end
+
+      def index_cleanup1(term, fieldofappl)
+        return unless term
+
+        idx = term.children.dup
+        fieldofappl.empty? or idx << ", &#x3c;#{fieldofappl}&#x3e;"
+        term << "<index><primary>#{idx.to_xml}</primary></index>"
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/cleanup_terms_designations.rb

@@ -37,7 +37,8 @@ module Asciidoctor
       def term_dl_to_metadata(xmldoc)
         xmldoc.xpath("//term[dl[@metadata = 'true']]").each do |t|
           t.xpath("./dl[@metadata = 'true']").each do |dl|
-            prev = dl_to_designation(dl) or next
+            prev = related2pref(dl_to_designation(dl)) or next
+            #require "debug"; binding.b if prev.parent.name == "related"
             term_dl_to_designation_metadata(prev, dl)
             term_dl_to_term_metadata(prev, dl)
             term_dl_to_expression_metadata(prev, dl)
@@ -58,7 +59,7 @@ module Asciidoctor
 
       def term_dl_to_designation_metadata(prev, dlist)
         %w(absent geographic-area).each do |a|
-          dl_to_attrs(related2pref(prev), dlist, a)
+          dl_to_attrs(prev, dlist, a)
         end
         %w(field-of-application usage-info).reverse.each do |a|
           dl_to_elems(prev.at("./expression"), prev, dlist, a)
@@ -75,15 +76,28 @@ module Asciidoctor
       end
 
       def term_dl_to_expression_metadata(prev, dlist)
-        %w(language script type isInternational).each do |a|
-          dl_to_attrs(prev, dlist, a)
+        term_dl_to_expression_root_metadata(prev, dlist)
+        term_dl_to_expression_name_metadata(prev, dlist)
+        term_to_letter_symbol(prev, dlist)
+      end
+
+      def term_dl_to_expression_root_metadata(prev, dlist)
+        %w(isInternational).each do |a|
+          p = prev.at("./expression | ./letter-symbol | ./graphical-symbol")
+          dl_to_attrs(p, dlist, a)
         end
+        %w(language script type).each do |a|
+          p = prev.at("./expression") or next
+          dl_to_attrs(p, dlist, a)
+        end
+      end
+
+      def term_dl_to_expression_name_metadata(prev, dlist)
         %w(abbreviation-type pronunciation).reverse.each do |a|
           dl_to_elems(prev.at("./expression/name"), prev, dlist, a)
         end
         g = dlist.at("./dt[text()='grammar']/following::dd//dl") and
           term_dl_to_expression_grammar(prev, g)
-        term_to_letter_symbol(prev, dlist)
       end
 
       def term_dl_to_expression_grammar(prev, dlist)
@@ -172,7 +186,7 @@ module Asciidoctor
       end
 
       def related2pref(elem)
-        elem.name == "related" ? elem = elem.at("./preferred") : elem
+        elem&.name == "related" ? elem = elem.at("./preferred") : elem
       end
     end
   end

data/lib/asciidoctor/standoc/front.rb

@@ -94,7 +94,7 @@ module Asciidoctor
 
       def metadata_script(node, xml)
         xml.script (node.attr("script") ||
-                    default_script(node.attr("language")))
+                    Metanorma::Utils.default_script(node.attr("language")))
       end
 
       def relaton_relations

data/lib/asciidoctor/standoc/isodoc.rng

@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>

data/lib/asciidoctor/standoc/render.rb

@@ -0,0 +1,117 @@
+module Asciidoctor
+  module Standoc
+    module Base
+      def html_extract_attributes(node)
+        {
+          script: node.attr("script"),
+          bodyfont: node.attr("body-font"),
+          headerfont: node.attr("header-font"),
+          monospacefont: node.attr("monospace-font"),
+          i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
+          htmlstylesheet: node.attr("htmlstylesheet"),
+          htmlstylesheet_override: node.attr("htmlstylesheet-override"),
+          htmlcoverpage: node.attr("htmlcoverpage"),
+          htmlintropage: node.attr("htmlintropage"),
+          scripts: node.attr("scripts"),
+          scripts_override: node.attr("scripts-override"),
+          scripts_pdf: node.attr("scripts-pdf"),
+          datauriimage: node.attr("data-uri-image") != "false",
+          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
+          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
+          break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
+          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
+          bare: node.attr("bare"),
+          sectionsplit: node.attr("sectionsplit"),
+          baseassetpath: node.attr("base-asset-path"),
+          aligncrosselements: node.attr("align-cross-elements"),
+        }
+      end
+
+      def html_converter(node)
+        IsoDoc::HtmlConvert.new(html_extract_attributes(node))
+      end
+
+      def pdf_converter(node)
+        return nil if node.attr("no-pdf")
+
+        IsoDoc::Standoc::PdfConvert.new(pdf_extract_attributes(node))
+      end
+
+      def doc_extract_attributes(node)
+        attrs = {
+          script: node.attr("script"),
+          bodyfont: node.attr("body-font"),
+          headerfont: node.attr("header-font"),
+          monospacefont: node.attr("monospace-font"),
+          i18nyaml: node.attr("i18nyaml"),
+          scope: node.attr("scope"),
+          wordstylesheet: node.attr("wordstylesheet"),
+          wordstylesheet_override: node.attr("wordstylesheet-override"),
+          standardstylesheet: node.attr("standardstylesheet"),
+          header: node.attr("header"),
+          wordcoverpage: node.attr("wordcoverpage"),
+          wordintropage: node.attr("wordintropage"),
+          ulstyle: node.attr("ulstyle"),
+          olstyle: node.attr("olstyle"),
+          htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
+          doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
+          break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
+          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
+          bare: node.attr("bare"),
+          baseassetpath: node.attr("base-asset-path"),
+          aligncrosselements: node.attr("align-cross-elements"),
+        }
+
+        if fonts_manifest = node.attr(FONTS_MANIFEST)
+          attrs[IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS] = {
+            IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => fonts_manifest,
+          }
+        end
+
+        attrs
+      end
+
+      def pdf_extract_attributes(node)
+        attrs =
+          %w(pdf-encrypt pdf-encryption-length pdf-user-password
+             pdf-owner-password pdf-allow-copy-content pdf-allow-edit-content
+             pdf-allow-assemble-document pdf-allow-edit-annotations
+             pdf-allow-print pdf-allow-print-hq pdf-allow-fill-in-forms
+             pdf-allow-access-content pdf-encrypt-metadata)
+            .each_with_object({}) do |x, m|
+            m[x.gsub(/-/, "").to_i] = node.attr(x)
+          end
+        html_extract_attributes(node).merge(attrs)
+      end
+
+      def doc_converter(node)
+        IsoDoc::WordConvert.new(doc_extract_attributes(node))
+      end
+
+      def presentation_xml_converter(node)
+        IsoDoc::PresentationXMLConvert.new(html_extract_attributes(node))
+      end
+
+      def default_fonts(node)
+        b = node.attr("body-font") ||
+          (node.attr("script") == "Hans" ? '"Source Han Sans",serif' : '"Cambria",serif')
+        h = node.attr("header-font") ||
+          (node.attr("script") == "Hans" ? '"Source Han Sans",sans-serif' : '"Cambria",serif')
+        m = node.attr("monospace-font") || '"Courier New",monospace'
+        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"
+      end
+
+      def outputs(node, ret)
+        File.open("#{@filename}.xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert("#{@filename}.xml")
+        html_converter(node).convert("#{@filename}.presentation.xml",
+                                     nil, false, "#{@filename}.html")
+        doc_converter(node).convert("#{@filename}.presentation.xml",
+                                    nil, false, "#{@filename}.doc")
+        pdf_converter(node)&.convert("#{@filename}.presentation.xml",
+                                     nil, false, "#{@filename}.pdf")
+      end
+    end
+  end
+end

data/lib/asciidoctor/standoc/section.rb

@@ -54,8 +54,12 @@ module Asciidoctor
                           node.level == 1
                           true
                         end),
-                preface: (
-                           node.role == "preface" || node.attr("style") == "preface" ? true : nil) }
+                tag: node&.attr("tag"),
+                "multilingual-rendering": node&.attr("multilingual-rendering"),
+                preface: (if node.role == "preface" ||
+                          node.attr("style") == "preface"
+                            true
+                          end) }
         return ret unless node.attributes["change"]
 
         ret.merge(change: node.attributes["change"],

data/lib/asciidoctor/standoc/utils.rb

@@ -64,22 +64,6 @@ module Asciidoctor
         conv
       end
 
-      def default_script(lang)
-        case lang
-        when "ar", "fa" then "Arab"
-        when "ur" then "Aran"
-        when "ru", "bg" then "Cyrl"
-        when "hi" then "Deva"
-        when "el" then "Grek"
-        when "zh" then "Hans"
-        when "ko" then "Kore"
-        when "he" then "Hebr"
-        when "ja" then "Jpan"
-        else
-          "Latn"
-        end
-      end
-
       def dl_to_attrs(elem, dlist, name)
         e = dlist.at("./dt[text()='#{name}']") or return
         val = e.at("./following::dd/p") || e.at("./following::dd") or return

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.11.2".freeze
+    VERSION = "1.11.3".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "latexmath"
   spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "metanorma-utils", "~> 1.2.0"
+  spec.add_dependency "metanorma-utils", "~> 1.2.8"
   spec.add_dependency "relaton-cli", "~> 1.9.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"

data/spec/asciidoctor/blocks_spec.rb

@@ -1444,7 +1444,7 @@ OUTPUT
       ====
     INPUT
     output = <<~"OUTPUT"
-                  #{BLANK_HDR}
+     #{BLANK_HDR}
              <sections>
         <recommendation id="_" unnumbered="true" type="verification" model="ogc" tag='X' multilingual-rendering='common'>
         <label>/ogc/recommendation/wfs/2</label>
@@ -1452,7 +1452,8 @@ OUTPUT
       <subject>developer, implementer</subject>
       <inherit>/ss/584/2015/level/1</inherit>
       <inherit>/ss/584/2015/level/2</inherit>
-        <description><p id="_">I recommend this</p></description>
+        <description><p id="_">I recommend this</p>
+      </description>
       </recommendation>
              </sections>
              </standard-document>
@@ -1470,6 +1471,9 @@ OUTPUT
       .Title
       ====
       I recommend this
+
+      . http://www.example.com[]
+      . <<ABC>>
       ====
     INPUT
     output = <<~OUTPUT
@@ -1478,7 +1482,20 @@ OUTPUT
         <requirement id="ABC" subsequence="A" number="3" keep-with-next="true" keep-lines-together="true" tag='X' multilingual-rendering='common'>
               <title>Title</title>
         <inherit>/ss/584/2015/level/1 &amp; /ss/584/2015/level/2</inherit>
-        <description><p id="_">I recommend this</p></description>
+        <description><p id="_">I recommend this</p>
+                       <ol id='_' type='arabic'>
+                 <li>
+                   <p id='_'>
+                     <link target='http://www.example.com'/>
+                   </p>
+                 </li>
+                 <li>
+                   <p id='_'>
+                     <xref target='ABC'/>
+                   </p>
+                 </li>
+               </ol>
+      </description>
       </requirement>
              </sections>
              </standard-document>
@@ -1526,6 +1543,9 @@ OUTPUT
       [.permission]
       =====
       I also permit this
+
+      . List
+      . List
       =====
 
       [requirement,type="general",label="/req/core/quantities-uom"]
@@ -1541,7 +1561,16 @@ OUTPUT
         <p id="_">Example 2</p>
       </example></description>
       <permission id="_">
-        <description><p id="_">I also permit this</p></description>
+        <description><p id="_">I also permit this</p>
+                  <ol id='_' type='arabic'>
+            <li>
+              <p id='_'>List</p>
+            </li>
+            <li>
+              <p id='_'>List</p>
+            </li>
+          </ol>
+        </description>
       </permission>
       <requirement id='_' type='general'>
       <label>/req/core/quantities-uom</label>

data/spec/asciidoctor/cleanup_blocks_spec.rb

@@ -1015,4 +1015,28 @@ RSpec.describe Asciidoctor::Standoc do
     expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "updates anchor reference along with anchor to match content" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [[samplecode]]
+      .Sample Code
+      ====
+
+      [source,ruby]
+      --
+      puts "Hello, world."
+      %w{a b c}.each do |x| <1>
+        puts x
+      end
+      --
+      <1> This is an annotation
+      ====
+    INPUT
+    output = Nokogiri::XML(Asciidoctor.convert(input, *OPTIONS))
+    callout_id = output.at("//xmlns:callout/@target").text
+    annotation_id = output.at("//xmlns:annotation/@id").text
+    expect(callout_id).to eq(annotation_id)
+  end
 end