diff --git a/Gemfile.devel b/Gemfile.devel
deleted file mode 100644
index bb528fc..0000000
--- a/Gemfile.devel
+++ /dev/null
@@ -1,2 +0,0 @@
-gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc", branch: "fix/primary-docidentifier"
-gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "main"
diff --git a/lib/metanorma/ieee/isodoc.rng b/lib/metanorma/ieee/isodoc.rng
index 481fe0d..24fd0d1 100644
--- a/lib/metanorma/ieee/isodoc.rng
+++ b/lib/metanorma/ieee/isodoc.rng
@@ -156,44 +156,7 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <attribute name="target">
-          <data type="string">
-            <param name="pattern">\i\c*|\c+#\c+</param>
-          </data>
-        </attribute>
-        <optional>
-          <attribute name="to">
-            <data type="string">
-              <param name="pattern">\i\c*|\c+#\c+</param>
-            </data>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="type">
-            <ref name="ReferenceFormat"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="case">
-            <choice>
-              <value>capital</value>
-              <value>lowercase</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="droploc">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="style">
-            <ref name="XrefStyleType"/>
-          </attribute>
-        </optional>
+        <ref name="XrefAttributes"/>
         <ref name="XrefBody"/>
       </element>
     </define>
@@ -407,26 +370,7 @@
     </define>
     <define name="figure">
       <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="number"/>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="class"/>
-        </optional>
-        <optional>
-          <attribute name="width"/>
-        </optional>
+        <ref name="FigureAttributes"/>
         <ref name="BlockAttributes"/>
         <optional>
           <ref name="tname"/>
@@ -2453,6 +2397,49 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefAttributes">
+    <attribute name="target">
+      <data type="string">
+        <param name="pattern">\i\c*|\c+#\c+</param>
+      </data>
+    </attribute>
+    <optional>
+      <attribute name="to">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="case">
+        <choice>
+          <value>capital</value>
+          <value>lowercase</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="droploc">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="style">
+        <ref name="XrefStyleType"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="label"/>
+    </optional>
+  </define>
   <define name="XrefBody">
     <zeroOrMore>
       <ref name="XrefTarget"/>
@@ -2531,6 +2518,28 @@
       <attribute name="columns"/>
     </optional>
   </define>
+  <define name="FigureAttributes">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <optional>
+      <attribute name="unnumbered">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="subsequence"/>
+    </optional>
+    <optional>
+      <attribute name="class"/>
+    </optional>
+    <optional>
+      <attribute name="width"/>
+    </optional>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>
diff --git a/lib/metanorma/ieee/version.rb b/lib/metanorma/ieee/version.rb
index db61cca..6ac9dee 100644
--- a/lib/metanorma/ieee/version.rb
+++ b/lib/metanorma/ieee/version.rb
@@ -1,5 +1,5 @@
 module Metanorma
   module IEEE
-    VERSION = "1.2.5".freeze
+    VERSION = "1.2.6".freeze
   end
 end
diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb
index 32dffc0..3355b76 100644
--- a/spec/isodoc/terms_spec.rb
+++ b/spec/isodoc/terms_spec.rb
@@ -75,7 +75,7 @@
     INPUT
 
     presxml = <<~PRESXML
-           <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
+      <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
          <preface>
            <clause type="toc" id="_" displayorder="1">
              <title depth="1">Contents</title>
@@ -88,7 +88,7 @@
              <p>For the purposes of this document, the following terms and definitions apply.</p>
              <term id="paddy1">
              <p><strong>paddy</strong>, &lt;rice&gt;, &lt;in agriculture, dated&gt;: rice retaining its husk after threshing  (<origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality><span class="std_publisher">ISO </span><span class="std_docNumber">7301</span>:<span class="std_year">2011</span>, 3.1</origin>, modified
-            –
+            &#x2014;
            The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here)</p>
                <termexample id="_" keep-with-next="true" keep-lines-together="true">
                  <name>Example  1</name>
@@ -109,7 +109,7 @@
 
          ;
            <origin citeas=""><termref base="IEV" target="xyz"/></origin>, adapted
-            –
+            &#x2014;
              with adjustments</termsource>
              </term>
              <term id="paddy">
@@ -152,7 +152,7 @@
              <p>For the purposes of this document, the following terms and definitions apply.</p>
              <p class="TermNum" id="paddy1"/>
              <p><b>paddy</b>, &lt;rice&gt;, &lt;in agriculture, dated&gt;: rice retaining its husk after threshing  (<span class="std_publisher">ISO </span><span class="std_docNumber">7301</span>:<span class="std_year">2011</span>, 3.1, modified
-            –
+            &#x2014;
            The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here)</p>
              <div id="_" class="example" style="page-break-after: avoid;page-break-inside: avoid;">
                <p class="example-title">Example  1:</p>
@@ -173,7 +173,7 @@
 
          ;
            Termbase IEV, term ID xyz, adapted
-            –
+            &#x2014;
              with adjustments</p>
              <p class="TermNum" id="paddy"/>
              <p><b>paddy</b>: rice retaining its husk after threshing <i>Syn:</i><b>paddy rice</b>, &lt;in agriculture&gt;; <b>rough rice</b>. (<span class="std_publisher">ISO </span><span class="std_docNumber">7301</span>:<span class="std_year">2011</span>, 3.1)</p>
@@ -229,7 +229,7 @@
              <p>For the purposes of this document, the following terms and definitions apply.</p>
              <p class="TermNum" id="paddy1"/>
              <p><b>paddy</b>, &lt;rice&gt;, &lt;in agriculture, dated&gt;: rice retaining its husk after threshing  (<span class="std_publisher">ISO </span><span class="std_docNumber">7301</span>:<span class="std_year">2011</span>, 3.1, modified
-            –
+            &#x2014;
            The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here)</p>
              <div id="_" class="example" style="page-break-after: avoid;page-break-inside: avoid;">
                <p class="example-title">Example  1:</p>
@@ -250,7 +250,7 @@
 
          ;
            Termbase IEV, term ID xyz, adapted
-            –
+            &#x2014;
              with adjustments</p>
              <p class="TermNum" id="paddy"/>
              <p><b>paddy</b>: rice retaining its husk after threshing <i>Syn:</i><b>paddy rice</b>, &lt;in agriculture&gt;; <b>rough rice</b>. (<span class="std_publisher">ISO </span><span class="std_docNumber">7301</span>:<span class="std_year">2011</span>, 3.1)</p>
@@ -448,7 +448,7 @@
                   <locality type='clause'>
                     <referenceFrom>3.1</referenceFrom>
                   </locality>
-                  <span class="std_publisher">ISO&#xa0;</span><span class="std_docNumber">7301</span>:<span class="std_year">2011</span>, 3.1</origin>, modified &#x2013; The term "cargo rice" is shown as deprecated, and
+                  <span class="std_publisher">ISO&#xa0;</span><span class="std_docNumber">7301</span>:<span class="std_year">2011</span>, 3.1</origin>, modified &#x2014; The term "cargo rice" is shown as deprecated, and
                 Note 1 to entry is not included here (<origin citeas=''>
                   <termref base='IEV' target='xyz'>t1</termref>
                 </origin>)
@@ -518,13 +518,13 @@
              <term id="paddy1">
                <p><strong>paddy</strong>, &lt;rice&gt;: <p><strong>(A)</strong> rice retaining its <xref target="paddy1"><em>husk</em></xref> after threshing
          <origin bibitemid="ISO7301" type="inline" citeas="ISO 7301:2011"><locality type="clause"><referenceFrom>3.1</referenceFrom></locality><span class="std_publisher">ISO&#xa0;</span><span class="std_docNumber">7301</span>:<span class="std_year">2011</span>,  3.1</origin>, modified
-            –
+            &#x2014;
            The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
 
        </p><p><strong>(B)</strong> rice retaining its husk after threshing, mark 2</p>  (<origin citeas=""><termref base="IEV" target="xyz">t1</termref></origin>
          ;
            <origin citeas=""><termref base="IEV" target="xyz"/></origin>, modified
-            –
+            &#x2014;
              with adjustments)</p>
                <termexample id="_" keep-with-next="true" keep-lines-together="true">
                  <name>Example  1</name>
@@ -612,7 +612,7 @@
                 <origin citeas=''>
                   <termref base='IEV' target='xyz'/>
                 </origin>
-                , modified &#x2013; with adjustments)
+                , modified &#x2014; with adjustments)
               </p>
               <termexample id='_' keep-with-next='true' keep-lines-together='true'>
                 <name>Example 1</name>