metanorma-standoc 1.9.4 → 1.10.3

data/spec/asciidoctor/macros_json2text_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe 'Json2Text macros' do
+RSpec.describe "Json2Text macros" do
   it_behaves_like "structured data 2 text preprocessor" do
     let(:extention) { "json" }
     def transform_to_type(data)

data/spec/asciidoctor/macros_plantuml_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc do
   it "processes the PlantUML macro" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)).gsub(%r{plantuml/plantuml[^./]+\.}, "plantuml/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -36,24 +36,27 @@ RSpec.describe Asciidoctor::Standoc do
       @enduml
       ....
     INPUT
-       #{BLANK_HDR}
-       <sections><figure id="_">
-  <image src="plantuml/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-</figure>
-<figure id="_">
-  <image src="plantuml/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-</figure>
-<figure id="_">
-  <image src="plantuml/filename.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-</figure>
-        </sections>
-
-       </standard-document>
+    output = <<~OUTPUT
+             #{BLANK_HDR}
+             <sections><figure id="_">
+        <image src="plantuml/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      <figure id="_">
+        <image src="plantuml/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      <figure id="_">
+        <image src="plantuml/filename.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+              </sections>
+             </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))
+      .gsub(%r{plantuml/plantuml[^./]+\.}, "plantuml/_.")))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the PlantUML macro with imagesdir" do
-      expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)).gsub(%r{spec/assets/[^./]+\.}, "spec/assets/_."))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       = Document title
       Author
       :docfile: test.adoc
@@ -72,18 +75,22 @@ RSpec.describe Asciidoctor::Standoc do
       Alice <-- Bob: another authentication Response
       @enduml
       ....
-   INPUT
-          #{BLANK_HDR}
-          <sections>
-  <figure id="_">
-  <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-</figure>
-</sections>
-</standard-document>
-OUTPUT
-    end
+    INPUT
+    output = <<~OUTPUT
+                #{BLANK_HDR}
+                <sections>
+        <figure id="_">
+        <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+      </figure>
+      </sections>
+      </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))
+      .gsub(%r{spec/assets/[^./]+\.}, "spec/assets/_.")))
+      .to be_equivalent_to xmlpp(output)
+  end
 
-  context 'when lutaml_diagram' do
+  context "when lutaml_diagram" do
     let(:input) do
       <<~"OUTPUT"
         = Document title
@@ -106,13 +113,13 @@ OUTPUT
     end
     let(:output) do
       <<~"OUTPUT"
-      #{BLANK_HDR}
-        <sections>
-        <figure id="_">
-        <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
-        </figure>
-        </sections>
-        </standard-document>
+        #{BLANK_HDR}
+          <sections>
+          <figure id="_">
+          <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+          </figure>
+          </sections>
+          </standard-document>
       OUTPUT
     end
 
@@ -120,12 +127,54 @@ OUTPUT
       expect(
         xmlpp(
           strip_guid(Asciidoctor.convert(input, *OPTIONS))
-                      .gsub(%r{".+spec\/assets\/lutaml\/[^.\/]+\.}, %q("spec/assets/_.))))
-        .to(be_equivalent_to xmlpp(output))
+                      .gsub(%r{".+spec/assets/lutaml/[^./]+\.},
+                            '"spec/assets/_.'),
+        ),
+      )
+        .to(be_equivalent_to(xmlpp(output)))
+    end
+
+    context "when inline macro, path supplied as the second arg" do
+      let(:example_file) { fixtures_path('diagram_definitions.lutaml') }
+      let(:input) do
+        <<~TEXT
+          = Document title
+          Author
+          :docfile: test.adoc
+          :nodoc:
+          :novalid:
+          :no-isobib:
+          :imagesdir: spec/assets
+
+          lutaml_diagram::#{example_file}[]
+
+        TEXT
+      end
+      let(:output) do
+        <<~TEXT
+          #{BLANK_HDR}
+          <sections>
+          <figure id="_">
+          <image src="spec/assets/_.png" id="_" mimetype="image/png" height="auto" width="auto"/>
+          </figure>
+          </sections>
+          </standard-document>
+        TEXT
+      end
+
+      it "correctly renders input" do
+        expect(
+          xmlpp(
+            strip_guid(Asciidoctor.convert(input, *OPTIONS))
+                        .gsub(%r{".+spec/assets/lutaml/[^./]+\.},
+                              '"spec/assets/_.'),
+          ),
+        ).to(be_equivalent_to(xmlpp(output)))
+      end
     end
   end
 
-  context 'when lutaml_uml_attributes_table' do
+  context "when lutaml_uml_attributes_table" do
     let(:example_file) { fixtures_path("diagram_definitions.lutaml") }
     let(:input) do
       <<~"OUTPUT"
@@ -142,59 +191,61 @@ OUTPUT
     end
     let(:output) do
       <<~"OUTPUT"
-      #{BLANK_HDR}
-        <sections>
-          <clause id='_' inline-header='false' obligation='normative'>
-            <title>AttributeProfile</title>
-            <table id='_'>
-              <name>AttributeProfile attributes</name>
-              <thead>
-                <tr>
-                  <th valign='top' align='left'>Name</th>
-                  <th valign='top' align='left'>Definition</th>
-                  <th valign='top' align='left'>Mandatory/ Optional/ Conditional</th>
-                  <th valign='top' align='left'>Max Occur</th>
-                  <th valign='top' align='left'>Data Type</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td valign='top' align='left'>addressClassProfile</td>
-                  <td valign='top' align='left'>TODO: enum ‘s definition</td>
-                  <td valign='top' align='left'>O</td>
-                  <td valign='top' align='left'>1</td>
-                  <td valign='top' align='left'>
-                    <tt>CharacterString</tt>
-                  </td>
-                </tr>
-                <tr>
-                  <td valign='top' align='left'>imlicistAttributeProfile</td>
-                  <td valign='top' align='left'>this is attribute definition with multiply lines</td>
-                  <td valign='top' align='left'>O</td>
-                  <td valign='top' align='left'>1</td>
-                  <td valign='top' align='left'>
-                    <tt>CharacterString</tt>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </clause>
-        </sections>
-        </standard-document>
+        #{BLANK_HDR}
+          <sections>
+            <clause id='_' inline-header='false' obligation='normative'>
+              <title>AttributeProfile</title>
+              <table id='_'>
+                <name>AttributeProfile attributes</name>
+                <thead>
+                  <tr>
+                    <th valign='top' align='left'>Name</th>
+                    <th valign='top' align='left'>Definition</th>
+                    <th valign='top' align='left'>Mandatory/ Optional/ Conditional</th>
+                    <th valign='top' align='left'>Max Occur</th>
+                    <th valign='top' align='left'>Data Type</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td valign='top' align='left'>addressClassProfile</td>
+                    <td valign='top' align='left'></td>
+                    <td valign='top' align='left'>O</td>
+                    <td valign='top' align='left'>1</td>
+                    <td valign='top' align='left'>
+                      <tt>CharacterString</tt>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td valign='top' align='left'>imlicistAttributeProfile</td>
+                    <td valign='top' align='left'>this is attribute definition with multiply lines</td>
+                    <td valign='top' align='left'>O</td>
+                    <td valign='top' align='left'>1</td>
+                    <td valign='top' align='left'>
+                      <tt>CharacterString</tt>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </clause>
+          </sections>
+          </standard-document>
       OUTPUT
     end
 
     it "processes the lutaml_uml_attributes_table macro" do
       expect(
         xmlpp(
-          strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+          strip_guid(Asciidoctor.convert(input, *OPTIONS)),
+        ),
+      )
         .to(be_equivalent_to(xmlpp(output)))
     end
   end
 
   it "processes the PlantUML macro with PlantUML disabled" do
     mock_plantuml_disabled
-    expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to output(%r{PlantUML not installed}).to_stderr
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -208,9 +259,11 @@ OUTPUT
       @enduml
       ....
     INPUT
+    expect { Asciidoctor.convert(input, *OPTIONS) }
+      .to output(%r{PlantUML not installed}).to_stderr
 
     mock_plantuml_disabled
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -224,23 +277,26 @@ OUTPUT
       @enduml
       ....
     INPUT
-       #{BLANK_HDR}
-       <sections>
-         <sourcecode id="_" lang="plantuml">@startuml
-Alice -&gt; Bob: Authentication Request
-Bob --&gt; Alice: Authentication Response
-
-Alice -&gt; Bob: Another authentication Request
-Alice &lt;-- Bob: another authentication Response
-@enduml</sourcecode>
-        </sections>
-       </standard-document>
+    output = <<~OUTPUT
+             #{BLANK_HDR}
+             <sections>
+               <sourcecode id="_" lang="plantuml">@startuml
+      Alice -&gt; Bob: Authentication Request
+      Bob --&gt; Alice: Authentication Response
+
+      Alice -&gt; Bob: Another authentication Request
+      Alice &lt;-- Bob: another authentication Response
+      @enduml</sourcecode>
+              </sections>
+             </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the PlantUML macro with localdir unwritable" do
     mock_localdir_unwritable
-    expect { Asciidoctor.convert(<<~"INPUT", *OPTIONS) }.to output(%r{not writable for PlantUML}).to_stderr
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -254,9 +310,11 @@ Alice &lt;-- Bob: another authentication Response
       @enduml
       ....
     INPUT
+    expect { Asciidoctor.convert(input, *OPTIONS) }
+      .to output(%r{not writable for PlantUML}).to_stderr
 
     mock_localdir_unwritable
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [plantuml]
@@ -270,26 +328,29 @@ Alice &lt;-- Bob: another authentication Response
       @enduml
       ....
     INPUT
-       #{BLANK_HDR}
-       <sections>
-         <sourcecode id="_" lang="plantuml">@startuml
-Alice -&gt; Bob: Authentication Request
-Bob --&gt; Alice: Authentication Response
-
-Alice -&gt; Bob: Another authentication Request
-Alice &lt;-- Bob: another authentication Response
-@enduml</sourcecode>
-        </sections>
-       </standard-document>
+    output = <<~OUTPUT
+             #{BLANK_HDR}
+             <sections>
+               <sourcecode id="_" lang="plantuml">@startuml
+      Alice -&gt; Bob: Authentication Request
+      Bob --&gt; Alice: Authentication Response
+
+      Alice -&gt; Bob: Another authentication Request
+      Alice &lt;-- Bob: another authentication Response
+      @enduml</sourcecode>
+              </sections>
+             </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   private
 
   def mock_plantuml_disabled
-    expect(Asciidoctor::Standoc::PlantUMLBlockMacroBackend).to receive(:plantuml_installed?) do
+    expect(Asciidoctor::Standoc::PlantUMLBlockMacroBackend)
+      .to receive(:plantuml_installed?) do
       raise "PlantUML not installed"
-      false
     end
   end
 

data/spec/asciidoctor/macros_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe Asciidoctor::Standoc do
   it "processes the Asciidoctor::Standoc inline macros" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       alt:[term1]
       deprecated:[term1]
@@ -15,6 +15,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Bibliography
       * [[[ref1,XYZ 123]]] _Title_
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
       <preface>
           <foreword id='_' obligation='informative'>
@@ -48,10 +49,12 @@ RSpec.describe Asciidoctor::Standoc do
       </bibliography>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the Asciidoctor::Standoc index macros" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       index:also[]
       index:see[A]
@@ -67,6 +70,7 @@ RSpec.describe Asciidoctor::Standoc do
 
       Text [[id3]]
     INPUT
+    output = <<~OUTPUT
                   #{BLANK_HDR}
         <sections>
           <p id='_'>
@@ -117,16 +121,19 @@ RSpec.describe Asciidoctor::Standoc do
         </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the Asciidoctor::Standoc variant macros" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       == lang:en[English] lang:fr-Latn[Français]
 
       this lang:en[English] lang:fr-Latn[Français] section is lang:en[silly]  lang:fr[fou]
 
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
       <sections>
         <clause id='_' inline-header='false' obligation='normative'>
@@ -150,134 +157,142 @@ RSpec.describe Asciidoctor::Standoc do
       </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the Asciidoctor::Standoc concept macros" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       {{clause1}}
+      term:[clause1]
       {{clause1,w\[o\]rd}}
+      term:[clause1,w[o&#93;rd]
       {{clause1,w\[o\]rd,term}}
       {{blah}}
+      term:[blah]
       {{blah,word}}
-      {{blah,word,term}}
-      {{blah,clause=3.1}}
-      {{blah,clause=3.1,word}}
-      {{blah,clause=3.1,word,term}}
-      {{blah,clause=3.1,figure=a}}
-      {{blah,clause=3.1,figure=a,word}}
-      {{blah,clause=3.1,figure=a,word,term}}
-      {{IEV:135-13-13}}
-      {{IEV:135-13-13,word}}
-      {{IEV:135-13-13,word,term}}
+      term:[blah,word]
+      {{blah,term,word}}
+      {{blah,term,word,xref}}
+      {{blah,term,word,xref,option="noital,noref"}}
 
       [[clause1]]
       == Clause
       Terms are defined here
-
-      [bibliography]
-      == Bibliography
-      * [[[blah,blah]]] _Blah_
     INPUT
+    output = <<~OUTPUT
       #{BLANK_HDR}
       <preface>
         <foreword id='_' obligation='informative'>
           <title>Foreword</title>
           <p id='_'>
-            <concept>
-              <xref target='clause1'/>
-            </concept>
-            <concept>
-              <xref target='clause1'>w[o]rd</xref>
-            </concept>
-            <concept term='term'>
-              <xref target='clause1'>w[o]rd</xref>
-            </concept>
-            <concept>
-              <eref/>
-            </concept>
-            <concept>
-              <eref>word</eref>
-            </concept>
-            <concept term='term'>
-              <eref>word</eref>
-            </concept>
-            <concept>
-              <eref>
-              <localityStack>
-                <locality type='clause'>
-                  <referenceFrom>3.1</referenceFrom>
-                </locality>
-              </localityStack>
-              </eref>
-            </concept>
-            <concept>
-              <eref>
-              <localityStack>
-                <locality type='clause'>
-                  <referenceFrom>3.1</referenceFrom>
-                </locality>
-              </localityStack>
-                word
-              </eref>
-            </concept>
-            <concept term='term'>
-              <eref>
-              <localityStack>
-                <locality type='clause'>
-                  <referenceFrom>3.1</referenceFrom>
-                </locality>
-              </localityStack>
-                word
-              </eref>
-            </concept>
-            <concept>
-              <eref>
-              <localityStack>
-                <locality type='clause'>
-                  <referenceFrom>3.1</referenceFrom>
-                </locality>
-                <locality type='figure'>
-                  <referenceFrom>a</referenceFrom>
-                </locality>
-              </localityStack>
-              </eref>
-            </concept>
-            <concept>
-              <eref>
-              <localityStack>
-                <locality type='clause'>
-                  <referenceFrom>3.1</referenceFrom>
-                </locality>
-                <locality type='figure'>
-                  <referenceFrom>a</referenceFrom>
-                </locality>
-              </localityStack>
-                word
-              </eref>
-            </concept>
-            <concept term='term'>
-              <eref>
-              <localityStack>
-                <locality type='clause'>
-                  <referenceFrom>3.1</referenceFrom>
-                </locality>
-                <locality type='figure'>
-                  <referenceFrom>a</referenceFrom>
-                </locality>
-              </localityStack>
-                word
-              </eref>
-            </concept>
-            <concept>
-              <termref base='IEV' target='135-13-13'/>
-            </concept>
-            <concept>
-              <termref base='IEV' target='135-13-13'>word</termref>
-            </concept>
-            <concept term='term'>
-              <termref base='IEV' target='135-13-13'>word</termref>
-            </concept>
+          <concept>
+          <strong>
+          term
+          <tt>clause1</tt>
+          not resolved via ID
+          <tt>clause1</tt>
+        </strong>
+          </concept>
+          <concept>
+          <strong>
+          term
+          <tt>clause1</tt>
+          not resolved via ID
+          <tt>clause1</tt>
+        </strong>
+          </concept>
+          <concept>
+          <strong>
+          term
+          <tt>clause1</tt>, display <tt>w[o]rd</tt>
+          not resolved via ID
+          <tt>clause1</tt>
+          </strong>
+          </concept>
+          <concept>
+          <strong>
+          term
+          <tt>clause1</tt>, display <tt>w[o]rd</tt>
+          not resolved via ID
+          <tt>clause1</tt>
+          </strong>
+          </concept>
+          <concept>
+          <strong>
+          term
+          <tt>clause1</tt>, display <tt>w[o]rd</tt>
+          not resolved via ID
+          <tt>clause1</tt>
+        </strong>
+          </concept>
+             <concept>
+                <strong>
+                  term
+                  <tt>blah</tt>
+                   not resolved via ID
+                  <tt>blah</tt>
+                </strong>
+              </concept>
+              <concept>
+                <strong>
+                  term
+                  <tt>blah</tt>
+                   not resolved via ID
+                  <tt>blah</tt>
+                </strong>
+              </concept>
+              <concept>
+                <strong>
+                  term
+                  <tt>blah</tt>
+                  , display
+                  <tt>word</tt>
+                   not resolved via ID
+                  <tt>blah</tt>
+                </strong>
+              </concept>
+              <concept>
+                <strong>
+                  term
+                  <tt>blah</tt>
+                  , display
+                  <tt>word</tt>
+                   not resolved via ID
+                  <tt>blah</tt>
+                </strong>
+              </concept>
+              <concept>
+                <strong>
+                  term
+                  <tt>blah</tt>
+                  , display
+                  <tt>term</tt>
+                   not resolved via ID
+                  <tt>blah</tt>
+                </strong>
+              </concept>
+              <concept>
+                 <strong>
+                   term
+                   <tt>blah</tt>
+                   , display
+                   <tt>term</tt>
+                    not resolved via ID
+                   <tt>blah</tt>
+                 </strong>
+               </concept>
+               <concept ital='false' ref='false'>
+                 <strong>
+                   term
+                   <tt>blah</tt>
+                   , display
+                   <tt>term</tt>
+                    not resolved via ID
+                   <tt>blah</tt>
+                 </strong>
+               </concept>
           </p>
         </foreword>
       </preface>
@@ -287,23 +302,438 @@ RSpec.describe Asciidoctor::Standoc do
           <p id='_'>Terms are defined here</p>
         </clause>
       </sections>
-      <bibliography>
-        <references id='_' obligation='informative' normative="false">
-          <title>Bibliography</title>
-          <bibitem id='blah'>
-            <formattedref format='application/x-isodoc+xml'>
-              <em>Blah</em>
-            </formattedref>
-            <docidentifier>blah</docidentifier>
-          </bibitem>
-        </references>
-      </bibliography>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes the Asciidoctor::Standoc concept macros for acronyms" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      {{Clause1}}
+      {{Clause1,Clause 1}}
+      {{Clause 2}}
+      {{Clause 2,Clause 1}}
+      {{<<Clause2>>,Clause 2}}
+      symbol:[Clause1]
+      symbol:[Clause1,word]
+      symbol:[Clause 2]
+      symbol:[Clause 2,word]
+      {{<<Clause2>>,word}}
+      {{<<Clause2>>,word,term}}
+      {{<<Clause2>>,word,term,xref}}
+      {{<<Clause2>>,word,term,xref,option="noital,noref"}}
+      {{<<Clause2>>,word,term,xref,option="ital,ref"}}
+
+      == Terms and definitions
+      === Clause1
+      == Symbols and Abbreviated Terms
+      Clause1:: A
+      [[Clause2]]Clause 2:: C
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+       <preface>
+                 <foreword id='_' obligation='informative'>
+                   <title>Foreword</title>
+                   <p id='_'>
+                                  <concept>
+                 <refterm>Clause1</refterm>
+                 <renderterm>Clause1</renderterm>
+                 <xref target='term-clause1'/>
+               </concept>
+               <concept>
+                 <refterm>Clause1</refterm>
+                 <renderterm>Clause 1</renderterm>
+                 <xref target='term-clause1'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>Clause 2</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>Clause 1</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>Clause 2</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>Clause1</refterm>
+                 <renderterm>Clause1</renderterm>
+                 <xref target='symbol-clause1'/>
+               </concept>
+               <concept>
+                 <refterm>Clause1</refterm>
+                 <renderterm>word</renderterm>
+                 <xref target='symbol-clause1'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>Clause 2</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>Clause 2</refterm>
+                 <renderterm>word</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>word</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>term</renderterm>
+                 <xref target='Clause2'/>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>term</renderterm>
+                 <xref target='Clause2'>xref</xref>
+               </concept>
+                <concept ital='false' ref='false'>
+                  <refterm>word</refterm>
+                  <renderterm>term</renderterm>
+                  <xref target='Clause2'>xref</xref>
+                </concept>
+                <concept ital='true' ref='true'>
+                 <refterm>word</refterm>
+                 <renderterm>term</renderterm>
+                 <xref target='Clause2'>xref</xref>
+               </concept>
+                   </p>
+                 </foreword>
+               </preface>
+               <sections>
+                 <terms id='_' obligation='normative'>
+                   <title>Terms and definitions</title>
+                   <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
+                   <term id='term-clause1'>
+                     <preferred>Clause1</preferred>
+                   </term>
+                 </terms>
+                 <definitions id='_' obligation='normative'>
+                   <title>Symbols and abbreviated terms</title>
+                   <dl id='_'>
+                     <dt id="symbol-clause1">Clause1</dt>
+                     <dd>
+                       <p id='_'>A</p>
+                     </dd>
+                     <dt id='Clause2'>Clause 2</dt>
+                     <dd>
+                       <p id='_'>C</p>
+                     </dd>
+                   </dl>
+                 </definitions>
+               </sections>
+             </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes the concept macros with xrefs" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      {{<<clause1>>}}
+      {{<<clause1>>,w\[o\]rd}}
+      {{<<clause1>>,term,w\[o\]rd}}
+      {{<<clause1>>,term,w\[o\]rd,Clause #1}}
+
+      [[clause1]]
+      == Clause
+      Terms are defined here
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+            <preface>
+                   <foreword id='_' obligation='informative'>
+             <title>Foreword</title>
+             <p id='_'>
+               <concept>
+                 <xref target='clause1'/>
+               </concept>
+               <concept>
+                 <refterm>w[o]rd</refterm>
+                 <renderterm>w[o]rd</renderterm>
+                 <xref target='clause1'/>
+               </concept>
+               <concept>
+                 <refterm>term</refterm>
+                 <renderterm>w[o]rd</renderterm>
+                 <xref target='clause1'/>
+               </concept>
+               <concept>
+                 <refterm>term</refterm>
+                 <renderterm>w[o]rd</renderterm>
+                 <xref target='clause1'>Clause #1</xref>
+               </concept>
+             </p>
+           </foreword>
+      </preface>
+      <sections>
+        <clause id='clause1' inline-header='false' obligation='normative'>
+          <title>Clause</title>
+          <p id='_'>Terms are defined here</p>
+        </clause>
+      </sections>
+            </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes the concept macros with erefs" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      {{<<blah>>}}
+      {{<<blah>>,word}}
+      {{<<blah>>,term,word}}
+      {{<<blah>>,term,word,Clause #1}}
+      {{<<blah,clause=3.1>>}}
+      {{<<blah,clause=3.1>>,word}}
+      {{<<blah,clause=3.1>>,term,word}}
+      {{<<blah,clause=3.1,figure=a>>}}
+      {{<<blah,clause=3.1,figure=a>>,word}}
+      {{<<blah,clause=3.1,figure=a>>,term,word,Clause #1}}
+
+      [bibliography]
+      == Bibliography
+      * [[[blah,blah]]] _Blah_
+    INPUT
+    output = <<~OUTPUT
+      #{BLANK_HDR}
+      <preface>
+           <foreword id='_' obligation='informative'>
+             <title>Foreword</title>
+             <p id='_'>
+               <concept>
+                 <eref bibitemid='blah'/>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>word</renderterm>
+                 <eref bibitemid='blah'/>
+               </concept>
+               <concept>
+                 <refterm>term</refterm>
+                 <renderterm>word</renderterm>
+                 <eref bibitemid='blah'/>
+               </concept>
+               <concept>
+                 <refterm>term</refterm>
+                 <renderterm>word</renderterm>
+                 <eref bibitemid='blah'>Clause #1</eref>
+               </concept>
+               <concept>
+                 <eref bibitemid='blah'>
+                   <localityStack>
+                     <locality type='clause'>
+                       <referenceFrom>3.1</referenceFrom>
+                     </locality>
+                   </localityStack>
+                 </eref>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>word</renderterm>
+                 <eref bibitemid='blah'>
+                   <localityStack>
+                     <locality type='clause'>
+                       <referenceFrom>3.1</referenceFrom>
+                     </locality>
+                   </localityStack>
+                 </eref>
+               </concept>
+               <concept>
+                 <refterm>term</refterm>
+                 <renderterm>word</renderterm>
+                 <eref bibitemid='blah'>
+                   <localityStack>
+                     <locality type='clause'>
+                       <referenceFrom>3.1</referenceFrom>
+                     </locality>
+                   </localityStack>
+                 </eref>
+               </concept>
+               <concept>
+                 <eref bibitemid='blah'>
+                   <localityStack>
+                     <locality type='clause'>
+                       <referenceFrom>3.1</referenceFrom>
+                     </locality>
+                     <locality type='figure'>
+                       <referenceFrom>a</referenceFrom>
+                     </locality>
+                   </localityStack>
+                 </eref>
+               </concept>
+               <concept>
+                 <refterm>word</refterm>
+                 <renderterm>word</renderterm>
+                 <eref bibitemid='blah'>
+                   <localityStack>
+                     <locality type='clause'>
+                       <referenceFrom>3.1</referenceFrom>
+                     </locality>
+                     <locality type='figure'>
+                       <referenceFrom>a</referenceFrom>
+                     </locality>
+                   </localityStack>
+                 </eref>
+               </concept>
+               <concept>
+                 <refterm>term</refterm>
+                 <renderterm>word</renderterm>
+                 <eref bibitemid='blah'>
+                   <localityStack>
+                     <locality type='clause'>
+                       <referenceFrom>3.1</referenceFrom>
+                     </locality>
+                     <locality type='figure'>
+                       <referenceFrom>a</referenceFrom>
+                     </locality>
+                   </localityStack>
+                   Clause #1
+                 </eref>
+               </concept>
+             </p>
+           </foreword>
+         </preface>
+         <sections> </sections>
+         <bibliography>
+           <references id='_' normative='false' obligation='informative'>
+             <title>Bibliography</title>
+             <bibitem id='blah'>
+               <formattedref format='application/x-isodoc+xml'>
+                 <em>Blah</em>
+               </formattedref>
+               <docidentifier>blah</docidentifier>
+             </bibitem>
+           </references>
+         </bibliography>
+       </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes the concept macros with termbase" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      {{<<IEV:135-13-13>>}}
+      {{<<IEV:135-13-13>>,word}}
+      {{<<IEV:135-13-13>>,term,word}}
+      {{<<IEV:135-13-13>>,term,word,Clause #1}}
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+            <sections>
+        <p id='_'>
+             <concept>
+               <termref base='IEV' target='135-13-13'/>
+             </concept>
+             <concept>
+               <refterm>word</refterm>
+               <renderterm>word</renderterm>
+               <termref base='IEV' target='135-13-13'/>
+             </concept>
+             <concept>
+               <refterm>term</refterm>
+               <renderterm>word</renderterm>
+               <termref base='IEV' target='135-13-13'/>
+             </concept>
+             <concept>
+               <refterm>term</refterm>
+               <renderterm>word</renderterm>
+               <termref base='IEV' target='135-13-13'>Clause #1</termref>
+             </concept>
+        </p>
+      </sections>
+          </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes the concept macros with disambiguation for math symbols" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+      [[clause1]]
+
+      == Symbols and Abbreviated Terms
+      stem:[|~ x ~|]:: A function that returns the smallest integer greater than or equal to stem:[x]; also known as the _ceiling_ function.
+      stem:[|__ x __|]:: A function that returns the largest integer less than or equal to stem:[x]; also known as the _floor_ function.
+    INPUT
+    output = <<~OUTPUT
+            #{BLANK_HDR}
+            <sections>
+        <definitions id='clause1' obligation='normative'>
+          <title>Symbols and abbreviated terms</title>
+          <dl id='_'>
+            <dt id='symbol-_-_x_-'>
+              <stem type='MathML'>
+                <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                  <mo>&#8970;</mo>
+                  <mi>x</mi>
+                  <mo>&#8971;</mo>
+                </math>
+              </stem>
+            </dt>
+            <dd>
+              <p id='_'>
+                A function that returns the largest integer less than or equal to
+                <stem type='MathML'>
+                  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                    <mi>x</mi>
+                  </math>
+                </stem>
+                ; also known as the
+                <em>floor</em>
+                 function.
+              </p>
+            </dd>
+            <dt id='symbol-_-_x_--1'>
+              <stem type='MathML'>
+                <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                  <mo>&#8968;</mo>
+                  <mi>x</mi>
+                  <mo>&#8969;</mo>
+                </math>
+              </stem>
+            </dt>
+            <dd>
+              <p id='_'>
+                A function that returns the smallest integer greater than or equal
+                to
+                <stem type='MathML'>
+                  <math xmlns='http://www.w3.org/1998/Math/MathML'>
+                    <mi>x</mi>
+                  </math>
+                </stem>
+                ; also known as the
+                <em>ceiling</em>
+                 function.
+              </p>
+            </dd>
+          </dl>
+        </definitions>
+      </sections>
+            </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the TODO custom admonition" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
       TODO: Note1
 
@@ -315,6 +745,7 @@ RSpec.describe Asciidoctor::Standoc do
       [TODO]
       Note3
     INPUT
+    output = <<~OUTPUT
            #{BLANK_HDR}
            <sections><review reviewer="(Unknown)" id="_" date="#{Date.today}T00:00:00Z">
         <p id="_"/>
@@ -327,10 +758,12 @@ RSpec.describe Asciidoctor::Standoc do
       </review></sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "generates pseudocode examples, with formatting and initial indentation" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [pseudocode,subsequence="A",number="3",keep-with-next=true,keep-lines-together=true]
@@ -342,6 +775,7 @@ RSpec.describe Asciidoctor::Standoc do
         _C_
       ====
     INPUT
+    output = <<~OUTPUT
               #{BLANK_HDR}
               <sections>
         <figure id="_"  subsequence='A' class="pseudocode" unnumbered="true" number="3" keep-with-next="true" keep-lines-together="true">
@@ -351,10 +785,12 @@ RSpec.describe Asciidoctor::Standoc do
       </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "supplies line breaks in pseudocode" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [pseudocode]
@@ -366,6 +802,7 @@ RSpec.describe Asciidoctor::Standoc do
       E
       ====
     INPUT
+    output = <<~OUTPUT
               #{BLANK_HDR}
               <sections>
       <figure id='_' class='pseudocode'>
@@ -383,10 +820,12 @@ RSpec.describe Asciidoctor::Standoc do
       </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "skips embedded blocks when supplying line breaks in pseudocode" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       [pseudocode]
@@ -397,6 +836,7 @@ RSpec.describe Asciidoctor::Standoc do
       ++++
       ====
     INPUT
+    output = <<~OUTPUT
               #{BLANK_HDR}
               <sections>
       <figure id='_' class='pseudocode'>
@@ -449,14 +889,17 @@ RSpec.describe Asciidoctor::Standoc do
       </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the Ruby markups" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       ruby:楽聖少女[がくせいしょうじょ]
     INPUT
+    output = <<~OUTPUT
            #{BLANK_HDR}
            <sections>
              <p id="_">
@@ -465,10 +908,12 @@ RSpec.describe Asciidoctor::Standoc do
            </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the footnoteblock macro" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       footnoteblock:[id1]
@@ -487,6 +932,7 @@ RSpec.describe Asciidoctor::Standoc do
       * C
       --
     INPUT
+    output = <<~OUTPUT
                   #{BLANK_HDR}
                   <sections>
                     <p id="_">
@@ -521,10 +967,12 @@ RSpec.describe Asciidoctor::Standoc do
                   </sections>
              </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes the footnoteblock macro with failed reference" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
       footnoteblock:[id1]
@@ -543,6 +991,7 @@ RSpec.describe Asciidoctor::Standoc do
       * C
       --
     INPUT
+    output = <<~OUTPUT
            #{BLANK_HDR}
        <sections>
           <p id='_'>
@@ -578,13 +1027,15 @@ RSpec.describe Asciidoctor::Standoc do
         </sections>
       </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   it "processes input form macros" do
-    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    input = <<~INPUT
       #{ASCIIDOC_BLANK_HDR}
 
-      [form,id=N0,name=N1,action="/action_page.php"]
+      [form,id=N0,name=N1,action="/action_page.php",class="checkboxes"]
       --
       label:fname[First name:] +
       input:text[id=fname,name=fname] +
@@ -619,9 +1070,10 @@ RSpec.describe Asciidoctor::Standoc do
       input:submit[value="Submit"]
       --
     INPUT
+    output = <<~OUTPUT
         #{BLANK_HDR}
         <sections>
-        <form id='_' name='N1' action='/action_page.php'>
+        <form id='_' name='N1' action='/action_page.php' class="checkboxes">
         <p id='_'>
           <label for='fname'>First name:</label>
           <br/>
@@ -675,6 +1127,107 @@ RSpec.describe Asciidoctor::Standoc do
               </sections>
              </standard-document>
     OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
+  end
+
+  it "processes ToC form macros" do
+    input = <<~INPUT
+      #{ASCIIDOC_BLANK_HDR}
+
+      [[clause1]]
+      == Clause 1
+
+      [[clause1A]]
+      === Clause 1A
+
+      [[clause1Aa]]
+      ==== Clause 1Aa
+
+      [[clause1Ab]]
+      ==== Clause 1Ab
+
+      [[clause1B]]
+      === Clause 1B
+
+      [[clause1Ba]]
+      ==== Clause 1Ba
+
+      [[clause2]]
+      == Clause 2
+
+      And introducing:
+      toc:["//clause[@id = 'clause1'\\]/clause/title","//clause[@id = 'clause1'\\]/clause/clause/title:2"]
+
+      toc:["//clause[@id = 'clause1'\\]/clause/title"]
+    INPUT
+    output = <<~OUTPUT
+                  #{BLANK_HDR}
+                  <sections>
+              <clause id='clause1' inline-header='false' obligation='normative'>
+                <title>Clause 1</title>
+                <clause id='clause1A' inline-header='false' obligation='normative'>
+                  <title>Clause 1A</title>
+                  <clause id='clause1Aa' inline-header='false' obligation='normative'>
+                    <title>Clause 1Aa</title>
+                  </clause>
+                  <clause id='clause1Ab' inline-header='false' obligation='normative'>
+                    <title>Clause 1Ab</title>
+                  </clause>
+                </clause>
+                <clause id='clause1B' inline-header='false' obligation='normative'>
+                  <title>Clause 1B</title>
+                  <clause id='clause1Ba' inline-header='false' obligation='normative'>
+                    <title>Clause 1Ba</title>
+                  </clause>
+                </clause>
+              </clause>
+              <clause id='clause2' inline-header='false' obligation='normative'>
+                <title>Clause 2</title>
+                <p id='_'>And introducing: </p>
+      <toc>
+        <ul id='_'>
+          <li>
+            <xref target='clause1A'>Clause 1A</xref>
+          </li>
+          <li>
+            <ul id='_'>
+              <li>
+                <xref target='clause1Aa'>Clause 1Aa</xref>
+              </li>
+              <li>
+                <xref target='clause1Ab'>Clause 1Ab</xref>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <xref target='clause1B'>Clause 1B</xref>
+          </li>
+          <li>
+            <ul id='_'>
+              <li>
+                <xref target='clause1Ba'>Clause 1Ba</xref>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </toc>
+      <toc>
+        <ul id='_'>
+          <li>
+            <xref target='clause1A'>Clause 1A</xref>
+          </li>
+          <li>
+            <xref target='clause1B'>Clause 1B</xref>
+          </li>
+        </ul>
+      </toc>
+              </clause>
+            </sections>
+                  </standard-document>
+    OUTPUT
+    expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
+      .to be_equivalent_to xmlpp(output)
   end
 
   describe "term inline macros" do
@@ -683,8 +1236,8 @@ RSpec.describe Asciidoctor::Standoc do
         strip_guid(
           Asciidoctor.convert(
             input, *OPTIONS
-          )
-        )
+          ),
+        ),
       )
     end
     let(:input) do
@@ -692,11 +1245,13 @@ RSpec.describe Asciidoctor::Standoc do
         #{ASCIIDOC_BLANK_HDR}
         == Terms and Definitions
 
-        === name2
+        === name
 
         == Main
 
         term:[name,name2] is a term
+
+        {{name,name2}} is a term
       XML
     end
     let(:output) do
@@ -706,17 +1261,27 @@ RSpec.describe Asciidoctor::Standoc do
           <terms id='_' obligation='normative'>
             <title>Terms and definitions</title>
             <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
-            <term id='term-name2'>
-              <preferred>name2</preferred>
+            <term id='term-name'>
+              <preferred>name</preferred>
             </term>
           </terms>
           <clause id='_' inline-header='false' obligation='normative'>
             <title>Main</title>
             <p id='_'>
-              <em>name</em>
-              (
-              <xref target='term-name2'/>
-              ) is a term
+            <concept>
+              <refterm>name</refterm>
+              <renderterm>name2</renderterm>
+              <xref target='term-name'/>
+            </concept>
+             is a term
+            </p>
+            <p id='_'>
+            <concept>
+              <refterm>name</refterm>
+              <renderterm>name2</renderterm>
+              <xref target='term-name'/>
+            </concept>
+             is a term
             </p>
           </clause>
         </sections>
@@ -740,6 +1305,8 @@ RSpec.describe Asciidoctor::Standoc do
           == Main
 
           term:[name] is a term
+
+          {{name}} is a term
         XML
       end
       let(:output) do
@@ -756,10 +1323,20 @@ RSpec.describe Asciidoctor::Standoc do
             <clause id='_' inline-header='false' obligation='normative'>
               <title>Main</title>
               <p id='_'>
-                <em>name</em>
-                (
-                <xref target='term-name' />
-                ) is a term
+              <concept>
+              <refterm>name</refterm>
+              <renderterm>name</renderterm>
+              <xref target='term-name'/>
+              </concept>
+              is a term
+              </p>
+              <p id='_'>
+              <concept>
+              <refterm>name</refterm>
+              <renderterm>name</renderterm>
+              <xref target='term-name'/>
+              </concept>
+              is a term
               </p>
             </clause>
           </sections>
@@ -792,6 +1369,8 @@ RSpec.describe Asciidoctor::Standoc do
 
           term:[name] is a term
           term:[name2] is a term
+          {{name}} is a term
+          {{name2}} is a term
         XML
       end
       let(:output) do
@@ -815,14 +1394,30 @@ RSpec.describe Asciidoctor::Standoc do
             <clause id='term-name2' inline-header='false' obligation='normative'>
               <title>Second</title>
               <p id='_'>
-                <em>name</em>
-                (
-                <xref target='term-name-1' />
-                ) is a term
-                <em>name2</em>
-                  (
-                <xref target='term-name2-1' />
-                ) is a term
+               <concept>
+                 <refterm>name</refterm>
+                 <renderterm>name</renderterm>
+                 <xref target='term-name-1'/>
+               </concept>
+                is a term
+               <concept>
+                 <refterm>name2</refterm>
+                 <renderterm>name2</renderterm>
+                 <xref target='term-name2-1'/>
+               </concept>
+                is a term
+               <concept>
+                 <refterm>name</refterm>
+                 <renderterm>name</renderterm>
+                 <xref target='term-name-1'/>
+               </concept>
+                is a term
+               <concept>
+                 <refterm>name2</refterm>
+                 <renderterm>name2</renderterm>
+                 <xref target='term-name2-1'/>
+               </concept>
+                is a term
               </p>
             </clause>
           </sections>
@@ -854,12 +1449,19 @@ RSpec.describe Asciidoctor::Standoc do
           term:[name identity] is a term
 
           Moreover, term:[missing] is a term
+
+
+          {{name check}} is a term
+
+          {{name identity}} is a term
+
+          Moreover, {{missing}} is a term
         XML
       end
       let(:output) do
         <<~XML
-          #{BLANK_HDR}
-            <sections>
+             #{BLANK_HDR}
+                    <sections>
               <terms id='_' obligation='normative'>
                 <title>Terms and definitions</title>
                 <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
@@ -871,18 +1473,61 @@ RSpec.describe Asciidoctor::Standoc do
                   <definition>
                     <p id='_'>paragraph</p>
                     <p id='_'>
-                      <em>name check</em>
-                       (
-                      <xref target='name-check'/>
-                      ) is a term
-                      </p>
-                      <p id='_'>
-                      <em>name identity</em>
-                       (
-                      <xref target='term-name-identity'/>
-                      ) is a term
-                      </p>
-                      <p id="_">Moreover, (<strong>term “missing” not resolved</strong>) is a term</p>
+                      <concept>
+                        <refterm>name check</refterm>
+                        <renderterm>name check</renderterm>
+                        <xref target='name-check'/>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      <concept>
+                        <refterm>name identity</refterm>
+                        <renderterm>name identity</renderterm>
+                        <xref target='term-name-identity'/>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      Moreover,
+                      <concept>
+                        <strong>
+                          term
+                          <tt>missing</tt>
+                           not resolved via ID
+                          <tt>missing</tt>
+                        </strong>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      <concept>
+                        <refterm>name check</refterm>
+                        <renderterm>name check</renderterm>
+                        <xref target='name-check'/>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      <concept>
+                        <refterm>name identity</refterm>
+                        <renderterm>name identity</renderterm>
+                        <xref target='term-name-identity'/>
+                      </concept>
+                       is a term
+                    </p>
+                    <p id='_'>
+                      Moreover,
+                      <concept>
+                        <strong>
+                          term
+                          <tt>missing</tt>
+                           not resolved via ID
+                          <tt>missing</tt>
+                        </strong>
+                      </concept>
+                       is a term
+                    </p>
                   </definition>
                 </term>
               </terms>