debug single-clause annex terms generation

Author: opoudjis

lib/isodoc/iho/xref.rb

@@ -32,15 +32,17 @@ def annex_names(clause, num)
       end
 
       def annex_names_recurse(clause, num)
-        @klass.single_term_clause?(clause) and
-          return annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
+        if @klass.single_term_clause?(clause)
+          annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
                               nil, num.to_s, 1)
+        else
         i = Counter.new
         clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
           .each do |c|
           i.increment(c)
           annex_names1(c, semx(clause, num), i.print, 2)
         end
+        end
       end
 
       # avoid ambiguity of Table 1-1 being in Appendix 1 or Clause 1

spec/isodoc/xref_spec.rb

@@ -2753,6 +2753,8 @@
                <xref target="QQ"/>
                <xref target="QQ1"/>
                <xref target="QQ2"/>
+               <xref target="PPP"/>
+               <xref target="PPP1"/>
                <xref target="R"/>
                </p>
              </foreword>
@@ -2814,6 +2816,10 @@
                <title>An Appendix</title>
              </appendix>
              </annex>
+             <annex id="PPP" inline-header="false" obligation="normative">
+               <title>Annex X</title>
+               <terms id="PPP1"><title>Annex X Terms</title></terms>
+               </annex>
               <bibliography><references id="R" obligation="informative" normative="true">
                <title>Normative References</title>
              </references><clause id="S" obligation="informative">
@@ -2943,6 +2949,14 @@
                  <span class="fmt-element-name">Appendix</span>
                  <semx element="autonum" source="QQ2">1</semx>
               </xref>
+                   <xref target="PPP">
+        <span class="fmt-element-name">Annex</span>
+        <semx element="autonum" source="PPP">B</semx>
+     </xref>
+     <xref target="PPP1">
+        <span class="fmt-element-name">Annex</span>
+        <semx element="autonum" source="PPP1">B</semx>
+     </xref>
               <xref target="R">
                  <span class="fmt-element-name">Section</span>
                  <semx element="autonum" source="R">2</semx>