metanorma-itu 1.0.0 → 1.0.5

data/lib/isodoc/itu/html/itu.scss

@@ -25,7 +25,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
         text-align:left;
         mso-pagination:widow-orphan;
         tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-        font-size:10.0pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-fareast-font-family:Calibri;
         mso-bidi-font-family:"Courier New";
@@ -113,7 +113,7 @@ p.SourceTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.AdmonitionTitle
+p.AdmonitionTitle, p.RecommendationTitle
         {mso-style-unhide:no;
         mso-style-qformat:yes;
         mso-style-parent:"";
@@ -762,6 +762,25 @@ p.RecNo, li.RecNo, div.RecNo
 	mso-fareast-language:EN-US;
 	font-weight:bold;
 	mso-bidi-font-weight:normal;}
+p.boilerplateHdr {
+        text-align:center;
+	font-family:$bodyfont;
+	font-size:11.0pt;
+}
+p.boilerplate {
+	font-family:$bodyfont;
+	font-size:11.0pt;
+	text-align:justify;
+         margin-top:6.0pt;
+         margin-bottom:0.0pt;
+}
+p.draftwarningHdr {
+text-align:center;
+font-family:$bodyfont;
+font-weight:bold;
+	font-size:16.0pt;
+        font-style:italic;
+}
 span.addition {
         color: blue;
 }

data/lib/isodoc/itu/html/word_itu_intro.html

@@ -125,162 +125,9 @@ style='mso-ansi-language:EN-US'>
 <p><br clear=all
          style='page-break-before:always'></p>
 
-<p class=MsoNormal align=center style='margin-top:24.0pt;text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>FOREWORD<o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>The
-International Telecommunication Union (ITU) is the United Nations specialized
-agency in the field of tele­com­mu­ni­ca­tions</span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-ansi-language:EN-US'>, information and communication technologies (ICTs).</span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'> The ITU Telecommunication
-Standardization Sector (ITU-T) is a permanent organ of ITU. ITU-T is
-responsible for studying technical, operating and tariff questions and issuing
-Recommendations on them with a view to standardizing telecommunications on a
-worldwide basis.<o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>The <a
-name=iitexte>World Telecommunication Standardization Assembly (WTSA), which
-meets every four years, establishes the topics for study by the ITU‑T study
-groups which, in turn, produce Recommendations on these topics.<o:p></o:p></a></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span
-style='mso-bookmark:iitexte'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>The approval of ITU-T
-Recommendations is covered by the procedure laid down in WTSA Resolution&nbsp;1</span></span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>.<o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>In
-some areas of information technology which fall within ITU-T's purview, the
-necessary standards are prepared on a collaborative basis with ISO and IEC.<o:p></o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>NOTE<o:p></o:p></span></span></p>
-
-<p class=MsoNormal style='margin-top:9.0pt'><span style='mso-bookmark:_Hlk526346232'><span
-lang=EN-GB style='font-size:11.0pt;mso-bidi-font-size:10.0pt'>In <a
-name=iitextea>this Recommendation, the expression &quot;Administration&quot; is
-used for conciseness to indicate both a telecommunication administration and a
-recognized operating agency</a></span></span><span style='mso-bookmark:_Hlk526346232'><span
-style='mso-bookmark:iitextea'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>.<o:p></o:p></span></span></span></p>
-
-<p class=MsoNormal style='margin-top:9.0pt'><span style='mso-bookmark:_Hlk526346232'><span
-style='mso-bookmark:iitextea'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>Compliance with this
-Recommendation is voluntary. However, the Recommendation may contain certain
-mandatory provisions (to ensure, e.g., interoperability or applicability) and
-compliance with the Recommendation is achieved when all of these mandatory
-provisions are met. The words &quot;shall&quot; or some other obligatory
-language such as &quot;must&quot; and the negative equivalents are used to
-express requirements. The use of such words does not suggest that compliance
-with the Recommendation is required of any party</span></span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>.<o:p></o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>INTELLECTUAL PROPERTY RIGHTS</span></span><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;font-family:Symbol;mso-ansi-language:EN-US'><o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>ITU <a
-name=iitexteb>draws attention to the possibility that the practice or
-implementation of this Recommendation may involve the use of a claimed
-Intellectual Property Right. ITU takes no position concerning the evidence,
-validity or applicability of claimed Intellectual Property Rights, whether
-asserted by ITU members or others outside of the Recommendation development
-process.<o:p></o:p></a></span></span></p>
-
-{% if unpublished %}
-<p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>As of the date of approval
-of this Recommendation, ITU [had/had not] received notice of intellectual property,
-protected by patents, which may be required to implement this Recommendation.
-However, implementers are cautioned that this may not represent the latest
-information and are therefore strongly urged to consult the TSB patent database at
-<a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.</span></p>
-{% else %}
-{% if ip_notice_received %}
-<p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>As of the date of approval
-of this Recommendation, ITU had received notice of intellectual property,
-protected by patents, which may be required to implement this Recommendation.
-However, implementers are cautioned that this may not represent the latest
-information and are therefore strongly urged to consult the TSB patent database at
-<a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.</span></p>
-{% else %}
-<p class=MsoNormal><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>As of the date of approval
-of this Recommendation, ITU had not received notice of intellectual property,
-protected by patents, which may be required to implement this Recommendation.
-However, implementers are cautioned that this may not represent the latest
-information and are therefore strongly urged to consult the TSB patent database at
-<a href="http://www.itu.int/ITU-T/ipr/">http://www.itu.int/ITU-T/ipr/</a>.</span></p>
-{% endif %}
-{% endif %}
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'><o:p>&nbsp;</o:p></span></span></p>
-
-<p class=MsoNormal align=center style='text-align:center'><span
-style='mso-bookmark:_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;
-mso-bidi-font-size:10.0pt;font-family:Symbol;mso-ascii-font-family:"Times New Roman";
-mso-hansi-font-family:"Times New Roman";mso-ansi-language:EN-US;mso-char-type:
-symbol;mso-symbol-font-family:Symbol'><span style='mso-char-type:symbol;
-mso-symbol-font-family:Symbol'>ã</span></span></span><span style='mso-bookmark:
-_Hlk526346232'><span lang=EN-US style='font-size:11.0pt;mso-bidi-font-size:
-10.0pt;mso-ansi-language:EN-US'>&nbsp;ITU&nbsp;<a name=iiannee></a>2019<o:p></o:p></span></span></p>
-
-<p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=EN-US
-style='font-size:11.0pt;mso-bidi-font-size:10.0pt;mso-ansi-language:EN-US'>All
-rights reserved. No part of this publication may be reproduced, by any means
-whatsoever, without the prior written permission of ITU.<o:p></o:p></span></span></p>
+<div id="legal"/>
+<div id="license"/>
+<div id="copyright"/>
 
 <b style='mso-bidi-font-weight:normal'><span lang=EN-US style='font-size:12.0pt;
 mso-bidi-font-size:10.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:

data/lib/isodoc/itu/html/word_itu_titlepage.html

@@ -221,21 +221,7 @@
   none;border-bottom:solid windowtext 2.25pt;border-right:solid windowtext 2.25pt;
   mso-border-top-alt:solid windowtext 2.25pt;mso-border-left-alt:solid windowtext 2.25pt;
   padding:0cm 5.4pt 0cm 5.4pt;height:4.0cm;mso-height-rule:exactly'>
-  <p class="MsoNormal" align="center" style='text-align:center'><b
-  style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:normal'><span
-  lang="EN-GB" style='font-size:16.0pt;mso-bidi-font-size:10.0pt'>CAUTION !<o:p></o:p></span></i></b></p>
-  <p class="MsoNormal" align="center" style='margin-top:3.0pt;text-align:center'><span
-  class="SpellE"><b style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:
-  normal'><span lang="EN-GB" style='font-size:16.0pt;mso-bidi-font-size:10.0pt'>PREPUBLISHED</span></i></b></span><b
-  style='mso-bidi-font-weight:normal'><i style='mso-bidi-font-style:normal'><span
-  lang="EN-GB" style='font-size:16.0pt;mso-bidi-font-size:10.0pt'><span
-  style='mso-spacerun:yes'>  </span>{{ doctype  | upcase }}<o:p></o:p></span></i></b></p>
-  <p class="MsoNormal" style='tab-stops:right 17.0cm'><span lang="EN-GB">This
-    prepublication is an unedited version of a recently approved {{doctype}}.
-  It&#xA0;will be replaced by the published version after editing. Therefore,
-  there will be differences between this prepublication and the published
-  version.</span><span lang="EN-GB" style='font-size:9.0pt;mso-bidi-font-size:
-  10.0pt;font-family:"Arial",sans-serif;mso-bidi-font-family:"Times New Roman"'><o:p></o:p></span></p>
+    <div class="draft-warning"/>
   </td>
  </tr>
  {% else %}

data/lib/isodoc/itu/html_convert.rb

@@ -15,12 +15,6 @@ module IsoDoc
         super
       end
 
-      #def convert1(docxml, filename, dir)
-      #  FileUtils.cp html_doc_path('Logo_ITU.jpg'), "#{@localdir}/Logo_ITU.jpg"
-      #  @files_to_delete << "#{@localdir}/Logo_ITU.jpg"
-      #  super
-      #end
-
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Open Sans",sans-serif'),
@@ -55,6 +49,7 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
           abstract docxml, div3
           preface docxml, div3
           middle docxml, div3
@@ -63,7 +58,26 @@ module IsoDoc
         end
       end
 
-      include BaseConvert
+       def html_preface(docxml)
+        super
+        authority_cleanup(docxml)
+        docxml
+      end
+
+       def authority_cleanup(docxml)
+         dest = docxml.at("//div[@class = 'draft-warning']")
+         auth = docxml.at("//div[@id = 'draft-warning']")
+         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+         dest and auth and dest.replace(auth.remove)
+         %w(copyright license legal).each do |t|
+           dest = docxml.at("//div[@id = '#{t}']")
+           auth = docxml.at("//div[@class = '#{t}']")
+           auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+           dest and auth and dest.replace(auth.remove)
+         end
+       end
+
+       include BaseConvert
     end
   end
 end

data/lib/isodoc/itu/pdf_convert.rb

@@ -57,6 +57,7 @@ module IsoDoc
 
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
+          boilerplate docxml, div3
           abstract docxml, div3
           preface docxml, div3
           middle docxml, div3
@@ -65,6 +66,25 @@ module IsoDoc
         end
       end
 
+       def html_preface(docxml)
+        super
+        authority_cleanup(docxml)
+        docxml     
+      end
+
+       def authority_cleanup(docxml)
+         dest = docxml.at("//div[@class = 'draft-warning']")
+         auth = docxml.at("//div[@id = 'draft-warning']")
+         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+         dest and auth and dest.replace(auth.remove)
+         %w(copyright license legal).each do |t|
+           dest = docxml.at("//div[@id = '#{t}']")
+           auth = docxml.at("//div[@class = '#{t}']")
+           auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
+           dest and auth and dest.replace(auth.remove)
+         end
+       end
+
       include BaseConvert
     end
   end

data/lib/isodoc/itu/word_convert.rb

@@ -26,6 +26,7 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2 
+          boilerplate docxml, div2
           abstract docxml, div2
           keywords docxml, div2
           preface docxml, div2
@@ -70,7 +71,9 @@ module IsoDoc
         word_preface_cleanup(docxml)
         word_term_cleanup(docxml)
         word_history_cleanup(docxml)
+        authority_hdr_cleanup(docxml)
         super
+        authority_cleanup(docxml)
         docxml
       end
 
@@ -124,15 +127,6 @@ module IsoDoc
         end
       end
 
-      #def convert1(docxml, filename, dir)
-        #FileUtils.cp html_doc_path('itu-document-comb.png'),
-          #File.join(@localdir, "itu-document-comb.png")
-        #FileUtils.cp html_doc_path('logo.png'), File.join(@localdir, "logo.png")
-        #@files_to_delete << File.join(@localdir, "itu-document-comb.png")
-        #@files_to_delete << File.join(@localdir, "logo.png")
-        #super
-      #end
-
       def default_fonts(options)
         { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
                      '"Times New Roman",serif'),
@@ -161,16 +155,16 @@ module IsoDoc
         end
       end
 
-       def toWord(result, filename, dir, header)
-      result = populate_template(result, :word)
-      result = from_xhtml(word_cleanup(to_xhtml(result)))
-      Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet&.path,
-                       header_file: header&.path, dir: dir,
-                       asciimathdelims: [@openmathdelim, @closemathdelim],
-                       liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
-      header&.unlink
-      @wordstylesheet&.unlink
-    end
+      def toWord(result, filename, dir, header)
+        result = populate_template(result, :word)
+        result = from_xhtml(word_cleanup(to_xhtml(result)))
+        Html2Doc.process(result, filename: filename, stylesheet: @wordstylesheet&.path,
+                         header_file: header&.path, dir: dir,
+                         asciimathdelims: [@openmathdelim, @closemathdelim],
+                         liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
+        header&.unlink
+        @wordstylesheet&.unlink
+      end
 
 =begin
       def eref_parse(node, out)
@@ -189,15 +183,52 @@ module IsoDoc
       end
 =end
 
-def link_parse(node, out)
-      out.a **attr_code(href: node["target"], title: node["alt"], class: "url") do |l|
-        if node.text.empty?
-          l << node["target"].sub(/^mailto:/, "")
-        else
-          node.children.each { |n| parse(n, l) }
+      def link_parse(node, out)
+        out.a **attr_code(href: node["target"], title: node["alt"], class: "url") do |l|
+          if node.text.empty?
+            l << node["target"].sub(/^mailto:/, "")
+          else
+            node.children.each { |n| parse(n, l) }
+          end
+        end
+      end
+
+      def authority_hdr_cleanup(docxml)
+        docxml&.xpath("//div[@id = 'draft-warning']").each do |d|
+          d.xpath(".//h1 | .//h2").each do |p|
+            p.name = "p"
+            p["class"] = "draftwarningHdr"
+          end
+        end
+        %w(copyright license legal).each do |t|
+          docxml&.xpath("//div[@class = '#{t}']").each do |d|
+            p = d&.at("./descendant::h1[2]") and
+              p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
+            d.xpath(".//h1 | .//h2").each do |p|
+              p.name = "p"
+              p["class"] = "boilerplateHdr"
+            end
+          end
+        end
+      end
+
+      def authority_cleanup(docxml)
+        dest = docxml.at("//div[@class = 'draft-warning']")
+        auth = docxml.at("//div[@id = 'draft-warning']")
+        dest and auth and dest.replace(auth.remove)
+        %w(copyright license legal).each do |t|
+          dest = docxml.at("//div[@id = '#{t}']")
+          auth = docxml.at("//div[@class = '#{t}']")
+          next unless auth && dest
+          t == "copyright" and p = auth&.at(".//p[@class = 'Normalaftertitle']") and
+            p["class"] = "boilerplateHdr"
+          auth&.xpath(".//p[not(@class) or @class = 'Normalaftertitle']")&.each do |p|
+            p["class"] = "boilerplate"
+          end
+          auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" unless t == "copyright"
+          dest.replace(auth.remove)
         end
       end
-    end
 
       include BaseConvert
     end

data/lib/isodoc/itu/xref.rb

@@ -46,9 +46,8 @@ module IsoDoc
       end
 
       def initial_anchor_names(d)
-        d.xpath("//xmlns:preface/child::*").each do |c|
-          preface_names(c)
-        end
+        d.xpath(ns("//boilerplate//clause")).each { |c| preface_names(c) }
+        d.xpath("//xmlns:preface/child::*").each { |c| preface_names(c) }
         @hierarchical_assets ?
           hierarchical_asset_names(d.xpath("//xmlns:preface/child::*"), "Preface") :
           sequential_asset_names(d.xpath("//xmlns:preface/child::*"))
@@ -83,7 +82,7 @@ module IsoDoc
       def sequential_figure_names(clause)
         c = IsoDoc::Function::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure[not(@type = 'pseudocode')]")).each do |t|
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
           else
             j = 0
@@ -99,7 +98,7 @@ module IsoDoc
       def hierarchical_figure_names(clause, num)
         c = IsoDoc::Function::XrefGen::Counter.new
         j = 0
-        clause.xpath(ns(".//figure[not(@type = 'pseudocode')]")).each do |t|
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
           else
             j = 0