spec/isodoc/xref_spec.rb in isodoc-1.0.28 vs spec/isodoc/xref_spec.rb in isodoc-1.0.29
- old
+ new
@@ -766,30 +766,30 @@
</p>
</div>
<br/>
<div class="Section3" id="intro">
<h1 class="IntroTitle">Introduction</h1>
- <div id="N1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (1)</p></div>
+ <div id="N1"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (1)</p></div></div>
<div id="xyz"><h2>Preparatory</h2>
- <div id="N2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div>
+ <div id="N2"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div></div>
</div>
</div>
<p class="zzSTDTitle1"/>
<div id="scope">
<h1>1.  Scope</h1>
- <div id="N" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (2)</p></div>
+ <div id="N"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (2)</p></div></div>
<p>
<a href="#N">Formula (2)</a>
</p>
</div>
<div id="terms"><h1>2.  </h1>
</div>
<div id="widgets">
<h1>3.  Widgets</h1>
<div id="widgets1"><h2>3.1. </h2>
- <div id="note1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (3)</p></div>
- <div id="note2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (4)</p></div>
+ <div id="note1"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (3)</p></div></div>
+ <div id="note2"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (4)</p></div></div>
<p> <a href="#note1">Formula (3)</a> <a href="#note2">Formula (4)</a> </p>
</div>
</div>
<br/>
<div id="annex1" class="Section3">
@@ -800,15 +800,15 @@
<br/>
<br/>
<b/>
</h1>
<div id="annex1a"><h2>A.1. </h2>
- <div id="AN" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.1)</p></div>
+ <div id="AN"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.1)</p></div></div>
</div>
<div id="annex1b"><h2>A.2. </h2>
- <div id="Anote1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div>
- <div id="Anote2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.2)</p></div>
+ <div id="Anote1"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div></div>
+ <div id="Anote2"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (A.2)</p></div></div>
</div>
</div>
</div>
</body>
</html>
@@ -895,23 +895,23 @@
</p>
</div>
<br/>
<div class="Section3" id="intro">
<h1 class="IntroTitle">Introduction</h1>
- <div class="require"><p class="RecommendationTitle">Requirement 1:</p>
+ <div class="require" id="N1"><p class="RecommendationTitle">Requirement 1:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<div id="xyz"><h2>Preparatory</h2>
- <div class="require"><p class="RecommendationTitle">Requirement:</p>
+ <div class="require" id="N2"><p class="RecommendationTitle">Requirement:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
</div>
<p class="zzSTDTitle1"/>
<div id="scope">
<h1>1.  Scope</h1>
- <div class="require"><p class="RecommendationTitle">Requirement 2:</p>
+ <div class="require" id="N"><p class="RecommendationTitle">Requirement 2:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<p>
<a href="#N">Requirement 2</a>
</p>
@@ -919,14 +919,14 @@
<div id="terms"><h1>2.  </h1>
</div>
<div id="widgets">
<h1>3.  Widgets</h1>
<div id="widgets1"><h2>3.1. </h2>
- <div class="require"><p class="RecommendationTitle">Requirement 3:</p>
+ <div class="require" id="note1"><p class="RecommendationTitle">Requirement 3:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
- <div class="require"><p class="RecommendationTitle">Requirement 4:</p>
+ <div class="require" id="note2"><p class="RecommendationTitle">Requirement 4:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<p> <a href="#note1">Requirement 3</a> <a href="#note2">Requirement 4</a> </p>
</div>
</div>
@@ -939,19 +939,19 @@
<br/>
<br/>
<b/>
</h1>
<div id="annex1a"><h2>A.1. </h2>
- <div class="require"><p class="RecommendationTitle">Requirement A.1:</p>
+ <div class="require" id="AN"><p class="RecommendationTitle">Requirement A.1:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
<div id="annex1b"><h2>A.2. </h2>
- <div class="require"><p class="RecommendationTitle">Requirement:</p>
+ <div class="require" id="Anote1"><p class="RecommendationTitle">Requirement:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
- <div class="require"><p class="RecommendationTitle">Requirement A.2:</p>
+ <div class="require" id="Anote2"><p class="RecommendationTitle">Requirement A.2:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
</div>
</div>
@@ -1040,23 +1040,23 @@
</p>
</div>
<br/>
<div class="Section3" id="intro">
<h1 class="IntroTitle">Introduction</h1>
- <div class="recommend"><p class="RecommendationTitle">Recommendation 1:</p>
+ <div class="recommend" id="N1"><p class="RecommendationTitle">Recommendation 1:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<div id="xyz"><h2>Preparatory</h2>
- <div class="recommend"><p class="RecommendationTitle">Recommendation:</p>
+ <div class="recommend" id="N2"><p class="RecommendationTitle">Recommendation:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
</div>
<p class="zzSTDTitle1"/>
<div id="scope">
<h1>1.  Scope</h1>
- <div class="recommend"><p class="RecommendationTitle">Recommendation 2:</p>
+ <div class="recommend" id="N"><p class="RecommendationTitle">Recommendation 2:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<p>
<a href="#N">Recommendation 2</a>
</p>
@@ -1064,14 +1064,14 @@
<div id="terms"><h1>2.  </h1>
</div>
<div id="widgets">
<h1>3.  Widgets</h1>
<div id="widgets1"><h2>3.1. </h2>
- <div class="recommend"><p class="RecommendationTitle">Recommendation 3:</p>
+ <div class="recommend" id="note1"><p class="RecommendationTitle">Recommendation 3:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
- <div class="recommend"><p class="RecommendationTitle">Recommendation 4:</p>
+ <div class="recommend" id="note2"><p class="RecommendationTitle">Recommendation 4:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<p> <a href="#note1">Recommendation 3</a> <a href="#note2">Recommendation 4</a> </p>
</div>
</div>
@@ -1084,19 +1084,19 @@
<br/>
<br/>
<b/>
</h1>
<div id="annex1a"><h2>A.1. </h2>
- <div class="recommend"><p class="RecommendationTitle">Recommendation A.1:</p>
+ <div class="recommend" id="AN"><p class="RecommendationTitle">Recommendation A.1:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
<div id="annex1b"><h2>A.2. </h2>
- <div class="recommend"><p class="RecommendationTitle">Recommendation:</p>
+ <div class="recommend" id="Anote1"><p class="RecommendationTitle">Recommendation:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
- <div class="recommend"><p class="RecommendationTitle">Recommendation A.2:</p>
+ <div class="recommend" id="Anote2"><p class="RecommendationTitle">Recommendation A.2:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
</div>
</div>
@@ -1185,23 +1185,23 @@
</p>
</div>
<br/>
<div class="Section3" id="intro">
<h1 class="IntroTitle">Introduction</h1>
- <div class="permission"><p class="RecommendationTitle">Permission 1:</p>
+ <div class="permission" id="N1"><p class="RecommendationTitle">Permission 1:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<div id="xyz"><h2>Preparatory</h2>
- <div class="permission"><p class="RecommendationTitle">Permission:</p>
+ <div class="permission" id="N2"><p class="RecommendationTitle">Permission:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
</div>
<p class="zzSTDTitle1"/>
<div id="scope">
<h1>1.  Scope</h1>
- <div class="permission"><p class="RecommendationTitle">Permission 2:</p>
+ <div class="permission" id="N"><p class="RecommendationTitle">Permission 2:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<p>
<a href="#N">Permission 2</a>
</p>
@@ -1209,14 +1209,14 @@
<div id="terms"><h1>2.  </h1>
</div>
<div id="widgets">
<h1>3.  Widgets</h1>
<div id="widgets1"><h2>3.1. </h2>
- <div class="permission"><p class="RecommendationTitle">Permission 3:</p>
+ <div class="permission" id="note1"><p class="RecommendationTitle">Permission 3:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
- <div class="permission"><p class="RecommendationTitle">Permission 4:</p>
+ <div class="permission" id="note2"><p class="RecommendationTitle">Permission 4:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
<p> <a href="#note1">Permission 3</a> <a href="#note2">Permission 4</a> </p>
</div>
</div>
@@ -1229,19 +1229,19 @@
<br/>
<br/>
<b/>
</h1>
<div id="annex1a"><h2>A.1. </h2>
- <div class="permission"><p class="RecommendationTitle">Permission A.1:</p>
+ <div class="permission" id="AN"><p class="RecommendationTitle">Permission A.1:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
<div id="annex1b"><h2>A.2. </h2>
- <div class="permission"><p class="RecommendationTitle">Permission:</p>
+ <div class="permission" id="Anote1"><p class="RecommendationTitle">Permission:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
- <div class="permission"><p class="RecommendationTitle">Permission A.2:</p>
+ <div class="permission" id="Anote2"><p class="RecommendationTitle">Permission A.2:</p>
<span class="stem">(#(r = 1 %)#)</span>
</div>
</div>
</div>
</div>
@@ -1315,32 +1315,32 @@
</p>
</div>
<p class="zzSTDTitle1"/>
<div id="xyz">
<h1>1.  Preparatory</h1>
- <div class="permission"><p class="RecommendationTitle">Permission 1:</p>
-<div class="permission"><p class="RecommendationTitle">Permission 1-1:</p>
-<div class="permission"><p class="RecommendationTitle">Permission 1-1-1:</p>
+ <div class="permission" id="N1"><p class="RecommendationTitle">Permission 1:</p>
+<div class="permission" id="N2"><p class="RecommendationTitle">Permission 1-1:</p>
+<div class="permission" id="N"><p class="RecommendationTitle">Permission 1-1-1:</p>
</div>
</div>
-<div class="require"><p class="RecommendationTitle">Requirement 1-1:</p>
+<div class="require" id="Q1"><p class="RecommendationTitle">Requirement 1-1:</p>
</div>
-<div class="recommend"><p class="RecommendationTitle">Recommendation 1-1:</p>
+<div class="recommend" id="R1"><p class="RecommendationTitle">Recommendation 1-1:</p>
</div>
</div>
</div>
<br/>
<div id="Axyz" class="Section3">
<h1 class="Annex"><b>Annex A</b><br/>(informative)<br/><br/><b>Preparatory</b></h1>
- <div class="permission"><p class="RecommendationTitle">Permission A.1:</p>
-<div class="permission"><p class="RecommendationTitle">Permission A.1-1:</p>
-<div class="permission"><p class="RecommendationTitle">Permission A.1-1-1:</p>
+ <div class="permission" id="AN1"><p class="RecommendationTitle">Permission A.1:</p>
+<div class="permission" id='AN2'><p class="RecommendationTitle">Permission A.1-1:</p>
+<div class="permission" id="AN"><p class="RecommendationTitle">Permission A.1-1-1:</p>
</div>
</div>
-<div class="require"><p class="RecommendationTitle">Requirement A.1-1:</p>
+<div class="require" id="AQ1"><p class="RecommendationTitle">Requirement A.1-1:</p>
</div>
-<div class="recommend"><p class="RecommendationTitle">Recommendation A.1-1:</p>
+<div class="recommend" id='AR1'><p class="RecommendationTitle">Recommendation A.1-1:</p>
</div>
</div>
</div>
</div>
</body>
@@ -1599,13 +1599,13 @@
<div id="scope">
<h1>1.  Scope</h1>
</div>
<div id="terms"><h1>2.  </h1>
<p class="TermNum" id="_waxy_rice">2.1.</p><p class="Terms" style="text-align:left;">waxy rice</p>
- <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><p class="TermNum" id="_nonwaxy_rice">2.2.</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
- <div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
- <div class="Note"><p>Note 2 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div></div>
+ <div id="note1" class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><p class="TermNum" id="_nonwaxy_rice">2.2.</p><p class="Terms" style="text-align:left;">nonwaxy rice</p>
+ <div id="note2" class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
+ <div id="note3" class="Note"><p>Note 2 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div></div>
</div>
</body>
</html>
OUTPUT
end
@@ -2255,7 +2255,127 @@
</div>
</body>
</html>
OUTPUT
end
+
+ it "realises numbering overrides" do
+ expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+ <iso-standard xmlns="http://riboseinc.com/isoxml">
+ <preface>
+ <foreword id="fwd">
+ <p>
+ <xref target="N1"/>
+ <xref target="N2"/>
+ <xref target="N3"/>
+ <xref target="N4"/>
+ <xref target="N5"/>
+ <xref target="N6"/>
+ <xref target="N7"/>
+ <xref target="N8"/>
+ <xref target="N9"/>
+ <xref target="N10"/>
+ </p>
+ </foreword>
+ <introduction id="intro">
+ <figure id="N1"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N2" number="A"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N3"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N4" number="7"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N5"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N6" subsequence="B"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N7" subsequence="B" number="c"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N8" subsequence="B"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N9" subsequence="C" number="20f"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ <figure id="N10" subsequence="C"> <name>Split-it-right sample divider</name>
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+ </figure>
+ </introduction>
+ </iso-standard>
+INPUT
+ #{HTML_HDR}
+ <br/>
+ <div id='fwd'>
+ <h1 class='ForewordTitle'>Foreword</h1>
+ <p>
+ <a href='#N1'>Figure 1</a>
+ <a href='#N2'>Figure A</a>
+ <a href='#N3'>Figure 2</a>
+ <a href='#N4'>Figure 7</a>
+ <a href='#N5'>Figure 8</a>
+ <a href='#N6'>Figure 9a</a>
+ <a href='#N7'>Figure 9c</a>
+ <a href='#N8'>Figure 9d</a>
+ <a href='#N9'>Figure 20f</a>
+ <a href='#N10'>Figure 20g</a>
+ </p>
+ </div>
+ <br/>
+ <div class='Section3' id='intro'>
+ <h1 class='IntroTitle'>Introduction</h1>
+ <div id='N1' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 1 — Split-it-right sample divider</p>
+ </div>
+ <div id='N2' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure A — Split-it-right sample divider</p>
+ </div>
+ <div id='N3' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 2 — Split-it-right sample divider</p>
+ </div>
+ <div id='N4' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 7 — Split-it-right sample divider</p>
+ </div>
+ <div id='N5' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 8 — Split-it-right sample divider</p>
+ </div>
+ <div id='N6' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 9a — Split-it-right sample divider</p>
+ </div>
+ <div id='N7' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 9c — Split-it-right sample divider</p>
+ </div>
+ <div id='N8' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 9d — Split-it-right sample divider</p>
+ </div>
+ <div id='N9' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 20f — Split-it-right sample divider</p>
+ </div>
+ <div id='N10' class='figure'>
+ <img src='rice_images/rice_image1.png' height='auto' width='auto'/>
+ <p class='FigureTitle' style='text-align:center;'>Figure 20g — Split-it-right sample divider</p>
+ </div>
+ </div>
+ <p class='zzSTDTitle1'/>
+ </div>
+ </body>
+ </html>
+OUTPUT
+ end
end