isodoc 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79d66a49cb5bec7550c58e49fb9a278281d4f74ee4f49f92710ebeed8f2dab95
-  data.tar.gz: 2b7f2d96af993dc95c62b84f38f755c756eb060741428a8d76ab6ed2739dedfc
+  metadata.gz: 61c4078b846eee8f29ef7322bcb1ac497c0418c4d7eaaba8d79ff4549b4d5b47
+  data.tar.gz: 311efba07534c2f7a6c35af286478a3beb31f082f50424ce4fdbfe0956eebb95
 SHA512:
-  metadata.gz: 3caa283c8fcda23c1d8203666ebe8c259491338b893343cf113de6ba2f05afe965ca774214ea97451b3542438b645c4dd74ec98b43584673f1ad8a11d4120614
-  data.tar.gz: '05924a7a7e0d532cc862718102c76f03a13f1cbf6e34fa4d9a3590da3553949a603df6d8db1a7a4aa736ec730055855686c12e48dd63a38b2b62312daa95bf68'
+  metadata.gz: f30695762aa1626b376317e3e928b4dab2d7dca5493f8d9990df4d8daf6b1d7f958e21f3217e227a974b9af1db1c46921a1c9250f25164f63cd3c4edd6ba73d8
+  data.tar.gz: 20e1f4f1e19a51c828ad06d07814c5af1d37213b37615376e68bafddf0f9bcd5fba7cf991571de5f38bb8983b10f7be45eb8720b76f45bbc0899028e8267b6f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (1.0.6)
+    isodoc (1.0.7)
       asciimath
       html2doc (~> 0.9.0)
       htmlentities (~> 4.3.4)
@@ -28,7 +28,7 @@ GEM
       nokogiri (>= 1.4.3)
     ffi (1.11.1)
     formatador (0.2.5)
-    guard (2.15.1)
+    guard (2.16.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -42,7 +42,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.9.0)
+    html2doc (0.9.1)
       asciimath (~> 1.0.9)
       htmlentities (~> 4.3.4)
       image_size
@@ -58,7 +58,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.0.13)
-    metanorma (0.3.15)
+    metanorma (0.3.16)
       asciidoctor
       htmlentities
     method_source (0.9.2)
@@ -67,7 +67,7 @@ GEM
     mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)

data/README.adoc

@@ -1,10 +1,11 @@
 = isodoc: Processor to generate HTML/Word from Metanorma XML
 
 image:https://img.shields.io/gem/v/isodoc.svg["Gem Version", link="https://rubygems.org/gems/isodoc"]
-image:https://github.com/metanorma/isodoc/workflows/macos/badge.svg["Build Status", link="https://github.com/metanorma/isodoc/actions?workflow=macos"]
-image:https://github.com/metanorma/isodoc/workflows/ubuntu/badge.svg["Build Status", link="https://github.com/metanorma/isodoc/actions?workflow=ubuntu"]
-image:https://github.com/metanorma/isodoc/workflows/windows/badge.svg["Build Status", link="https://github.com/metanorma/isodoc/actions?workflow=windows"]
+image:https://travis-ci.com/metanorma/isodoc.svg["Build Status", link="https://travis-ci.com/metanorma/isodoc"]
+image:https://ci.appveyor.com/api/projects/status/f93bvu6qfwxij07x?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/isodoc"]
 image:https://codeclimate.com/github/metanorma/isodoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/isodoc"]
+image:https://img.shields.io/github/issues-pr-raw/metanorma/isodoc.svg["Pull Requests", link="https://github.com/metanorma/isodoc/pulls"]
+image:https://img.shields.io/github/commits-since/metanorma/isodoc/latest.svg["Commits since latest",link="https://github.com/metanorma/isodoc/releases"]
 
 == Purpose
 

data/lib/isodoc/base_style/blocks.scss

@@ -55,6 +55,23 @@
   overflow: auto;
 }
 
+@mixin pseudocodeBlock($colorBg, $colorFg: null) {
+  .SourceTitle {
+    @include blockTitle();
+  }
+
+  @if $colorFg {
+    color: $colorFg;
+  }
+
+  background-color: $colorBg;
+  font-size: 0.8em;
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
+
 @mixin exampleBlock($colorBg, $colorText, $padding: .5em, $offsetContent: 1.5em) {
   background-color: $colorBg;
 

data/lib/isodoc/function/blocks.rb

@@ -58,6 +58,8 @@ module IsoDoc::Function
     end
 
     def figure_parse(node, out)
+      return pseudocode_parse(node, out) if node["class"] == "pseudocode" ||
+        node["type"] == "pseudocode"
       @in_figure = true
       out.div **attr_code(id: node["id"], class: "figure") do |div|
         node.children.each do |n|
@@ -69,6 +71,18 @@ module IsoDoc::Function
       @in_figure = false
     end
 
+    def pseudocode_parse(node, out)
+        @in_figure = true
+        name = node.at(ns("./name"))
+        out.div **attr_code(id: node["id"], class: "pseudocode") do |div|
+          node.children.each do |n|
+            parse(n, div) unless n.name == "name"
+          end
+          sourcecode_name_parse(node, div, name) if name
+        end
+        @in_figure = false
+      end
+
     def example_label(node, div, name)
       n = get_anchors[node["id"]]
       div.p **{ class: "example-title" } do |p|

data/lib/isodoc/function/inline.rb

@@ -23,22 +23,17 @@ module IsoDoc::Function
     end
 
     def prefix_container(container, linkend, _target)
-      #l10n(get_anchors[container][:xref] + ", " + linkend)
       l10n(anchor(container, :xref) + ", " + linkend)
     end
 
     def anchor_linkend(node, linkend)
-      if node["citeas"].nil? && node["bibitemid"] #&&
-          #get_anchors.has_key?(node["bibitemid"])
-        #return get_anchors.dig(node["bibitemid"] ,:xref)
+      if node["citeas"].nil? && node["bibitemid"] 
         return anchor(node["bibitemid"] ,:xref) || "???"
-      #elsif node["target"] && get_anchors.has_key?(node["target"])
       elsif node["target"] && !/.#./.match(node["target"])
-        #linkend = get_anchors[node["target"]][:xref]
         linkend = anchor(node["target"], :xref)
-        #container = get_anchors[node["target"]][:container]
         container = anchor(node["target"], :container, false)
-        (container && get_note_container_id(node) != container) &&
+        (container && get_note_container_id(node) != container &&
+         @anchors[node["target"]]) &&
           linkend = prefix_container(container, linkend, node["target"])
       end
       linkend || "???"
@@ -47,8 +42,6 @@ module IsoDoc::Function
     def get_linkend(node)
       link = anchor_linkend(node, docid_l10n(node["target"] || node["citeas"]))
       link += eref_localities(node.xpath(ns("./locality")), link)
-      #text = node.children.select { |c| c.text? && !c.text.empty? }
-      #link = text.join(" ") unless text.nil? || text.empty?
       contents = node.children.select { |c| c.name != "locality" }
       return link if contents.nil? || contents.empty?
       Nokogiri::XML::NodeSet.new(node.document, contents).to_xml

data/lib/isodoc/function/lists.rb

@@ -35,7 +35,6 @@ module IsoDoc::Function
     end
 
     def ol_parse(node, out)
-      # style = ol_style(node["type"])
       style = ol_depth(node)
       out.ol **attr_code(type: style, id: node["id"] ) do |ol|
         node.children.each { |n| parse(n, ol) }

data/lib/isodoc/function/terms.rb

@@ -43,8 +43,6 @@ module IsoDoc::Function
       out.div **{ class: "Note" } do |div|
         first = node.first_element_child
         div.p do |p|
-          #anchor = get_anchors[node['id']]
-          #p << "#{anchor&.dig(:label) || '???'}: "
           p << "#{anchor(node['id'], :label) || '???'}: "
           para_then_remainder(first, node, p, div)
         end

data/lib/isodoc/function/xref_gen.rb

@@ -133,9 +133,8 @@ module IsoDoc::Function
     def anchor_names(docxml)
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
-      # preempt clause notes with all other types of note
-      note_anchor_names(docxml.xpath(ns("//table | //example | //formula | "\
-                                        "//figure")))
+      # preempt clause notes with all other types of note (ISO default)
+      note_anchor_names(docxml.xpath(ns("//table | //figure")))
       note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
@@ -144,7 +143,7 @@ module IsoDoc::Function
     def sequential_figure_names(clause)
       c = Counter.new
       j = 0
-      clause.xpath(ns(".//figure")).each do |t|
+      clause.xpath(ns(".//figure[not(@class = 'pseudocode')]")).each do |t|
         if t.parent.name == "figure" then j += 1
         else
           j = 0
@@ -250,7 +249,7 @@ module IsoDoc::Function
     def hierarchical_figure_names(clause, num)
       c = Counter.new
       j = 0
-      clause.xpath(ns(".//figure")).each do |t|
+      clause.xpath(ns(".//figure[not(@class = 'pseudocode')]")).each do |t|
         if t.parent.name == "figure" then j += 1
         else
           j = 0

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.6".freeze
+  VERSION = "1.0.7".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -49,30 +49,36 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def word_admonition_images(docxml)
       docxml.xpath("//div[@class = 'Admonition']//img").each do |i|
         i["width"], i["height"] =
-          Html2Doc.image_resize(i, File.join(@localdir, i["src"]), @maxheight, 300)
+          Html2Doc.image_resize(i, File.join(@localdir, i["src"]),
+                                @maxheight, 300)
       end
     end
 
     def word_cleanup(docxml)
       word_annex_cleanup(docxml)
       word_preface(docxml)
+      word_table_align(docxml)
       word_table_separator(docxml)
       word_admonition_images(docxml)
       word_list_continuations(docxml)
       word_example_cleanup(docxml)
+      word_pseudocode_cleanup(docxml)
       word_image_caption(docxml)
       docxml
     end
 
+    def style_update(node, css)
+      node["style"] = node["style"] ?  node["style"].sub(/;?$/, ";#{css}") : css
+    end
+
     def word_image_caption(docxml)
-      docxml.xpath("//p[@class = 'FigureTitle' or @class = 'SourceTitle']").each do |t|
+      docxml.xpath("//p[@class = 'FigureTitle' or @class = 'SourceTitle']").
+        each do |t|
         if t.previous_element.name == "img"
           img = t.previous_element
           t.previous_element.swap("<p class=\'figure\'>#{img.to_xml}</p>")
         end
-        t.previous_element["style"] = t.previous_element["style"] ?
-          t.previous_element["style"].sub(/;?$/, ";page-break-after:avoid;") :
-          "page-break-after:avoid;"
+        style_update(t.previous_element, "page-break-after:avoid;")
       end
     end
 
@@ -81,19 +87,26 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       list_add(docxml.xpath("//ol[not(ancestor::ul) and not(ancestor::ol)]"), 1)
     end
 
-    def list_add(xpath, level)
+    def list_add(xpath, lvl)
       xpath.each do |list|
-        (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |li|
-          li.xpath("./p | ./div/p").each_with_index do |p, i|
+        (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |l|
+          l.xpath("./p | ./div/p").each_with_index do |p, i|
             next if p == 0
-            p["class"] = "ListContLevel#{level}"
+            p["class"] = "ListContLevel#{lvl}"
           end
-          list_add(li.xpath(".//ul") - li.xpath(".//ul//ul | .//ol//ul"), level + 1)
-          list_add(li.xpath(".//ol") - li.xpath(".//ul//ol | .//ol//ol"), level + 1)
+          list_add(l.xpath(".//ul") - l.xpath(".//ul//ul | .//ol//ul"), lvl + 1)
+          list_add(l.xpath(".//ol") - l.xpath(".//ul//ol | .//ol//ol"), lvl + 1)
         end
       end
     end
 
+    def word_table_align(docxml)
+      docxml.xpath("//td[@align]/p | //th[@align]/p").each do |p|
+        next if p["align"]
+        style_update(p, "text-align: #{p.parent["align"]}")
+      end
+    end
+
     EMPTY_PARA = "<p style='margin-top:0cm;margin-right:0cm;"\
       "margin-bottom:0cm;margin-left:0.0pt;margin-bottom:.0001pt;"\
       "line-height:1.0pt;mso-line-height-rule:exactly'>"\
@@ -120,6 +133,12 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       end
     end
 
+    def word_pseudocode_cleanup(docxml)
+      docxml.xpath("//div[@class = 'pseudocode']//p[not(@class)]").each do |p|
+        p["class"] = "pseudocode"
+      end
+    end
+
     def word_preface(docxml)
       word_cover(docxml) if @wordcoverpage
       word_intro(docxml, @wordToClevels) if @wordintropage
@@ -138,7 +157,8 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def word_intro(docxml, level)
-      intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"), docxml, level)
+      intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"),
+                         docxml, level)
       intro = populate_template(intro, :word)
       introxml = to_word_xhtml_fragment(intro)
       docxml.at('//div[@class="WordSection2"]').children.first.previous =

data/spec/isodoc/blocks_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 RSpec.describe IsoDoc do
   it "processes unlabelled notes" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -27,7 +27,7 @@ RSpec.describe IsoDoc do
   end
 
   it "processes unlabelled notes (Word)" do
-    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -64,7 +64,7 @@ RSpec.describe IsoDoc do
 
 
   it "processes labelled notes" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note id="note1">
@@ -89,7 +89,7 @@ INPUT
   end
 
     it "processes sequences of notes" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note id="note1">
@@ -120,7 +120,7 @@ INPUT
   end
 
   it "processes multi-para notes" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -147,7 +147,7 @@ INPUT
   end
 
   it "processes non-para notes" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -180,7 +180,7 @@ INPUT
   end
 
   it "processes non-para notes (Word)" do
-    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <note>
@@ -223,7 +223,7 @@ INPUT
   end
 
   it "processes figures" do
-    expect(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <figure id="figureA-1">
@@ -283,7 +283,7 @@ B</pre>
   end
 
   it "processes figures (Word)" do
-    expect(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <figure id="figureA-1">
@@ -345,7 +345,7 @@ B</pre>
   end
 
   it "processes examples" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
@@ -373,7 +373,7 @@ B</pre>
 
 
   it "processes sequences of examples" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
@@ -414,7 +414,7 @@ B</pre>
   end
 
   it "processes sourcecode" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <sourcecode lang="ruby" id="samplecode">
@@ -438,7 +438,7 @@ B</pre>
   end
 
   it "processes sourcecode (Word)" do
-    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <sourcecode lang="ruby" id="samplecode">
@@ -479,7 +479,7 @@ B</pre>
   end
 
   it "processes sourcecode with escapes preserved" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <sourcecode id="samplecode">
@@ -503,7 +503,7 @@ B</pre>
   end
 
   it "processes sourcecode with annotations" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <sourcecode id="_">puts "Hello, world." <callout target="A">1</callout>
@@ -531,7 +531,7 @@ B</pre>
   end
 
   it "processes admonitions" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
@@ -556,7 +556,7 @@ B</pre>
   end
 
   it "processes admonitions with titles" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <admonition id="_70234f78-64e5-4dfc-8b6f-f3f037348b6a" type="caution">
@@ -583,7 +583,7 @@ B</pre>
 
 
   it "processes formulae" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
@@ -629,7 +629,7 @@ B</pre>
   end
 
   it "processes paragraph alignments" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
@@ -657,7 +657,7 @@ World</p>
   end
 
   it "processes paragraph alignments (Word)" do
-    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
@@ -698,7 +698,7 @@ World</p>
 
 
   it "processes blockquotes" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <quote id="_044bd364-c832-4b78-8fea-92242402a1d1">
@@ -728,7 +728,7 @@ World</p>
   end
 
   it "processes term domains" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <sections>
     <terms>
@@ -754,7 +754,7 @@ World</p>
   end
 
   it "processes permissions" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <permission id="_">
@@ -840,7 +840,7 @@ World</p>
   end
 
     it "processes requirements" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <requirement id="A" unnumbered="true">
@@ -925,7 +925,7 @@ World</p>
   end
 
       it "processes recommendation" do
-    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <recommendation id="_" obligation="shall,could">
@@ -1009,5 +1009,53 @@ World</p>
     OUTPUT
   end
 
+ it "processes pseudocode" do
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+<itu-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>en</language>
+    </bibdata>
+        <preface><foreword>
+  <figure id="_" class="pseudocode"><name>Label</name><p id="_">  <strong>A</strong><br/>
+        <smallcap>B</smallcap></p>
+<p id="_">  <em>C</em></p></figure>
+</preface></itu-standard>
+INPUT
+    #{HTML_HDR}
+             <br/>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <div id="_" class="pseudocode"><p id="_">&#160;&#160;<b>A</b><br/>
+       &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;<span style="font-variant:small-caps;">B</span></p>
+       <p id="_">&#160;&#160;<i>C</i></p><p class="SourceTitle" style="text-align:center;">Label</p></div>
+             </div>
+             <p class="zzSTDTitle1"/>
+           </div>
+         </body>
+</html>
+OUTPUT
+  end
+
+  it "processes pseudocode (Word)" do
+    FileUtils.rm_f "test.doc"
+    IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", false)
+<itu-standard xmlns="http://riboseinc.com/isoxml">
+    <bibdata>
+    <language>en</language>
+    </bibdata>
+        <preface><foreword>
+  <figure id="_" class="pseudocode"><name>Label</name><p id="_">  <strong>A</strong><br/>
+        <smallcap>B</smallcap></p>
+<p id="_">  <em>C</em></p></figure>
+</preface></itu-standard>
+INPUT
+    expect(xmlpp( File.read("test.doc").gsub(%r{^.*<h1 class="ForewordTitle">Foreword</h1>}m, "").gsub(%r{</div>.*}m, "</div>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+            <div class="pseudocode"><a name="_" id="_"></a><p class="pseudocode"><a name="_" id="_"></a>&#xA0;&#xA0;<b>A</b><br/>
+       &#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;&#xA0;<span style="font-variant:small-caps;">B</span></p>
+       <p class="pseudocode" style="page-break-after:avoid;"><a name="_" id="_"></a>&#xA0;&#xA0;<i>C</i></p><p class="SourceTitle" style="text-align:center;">Label</p></div>
+OUTPUT
+  end
+
+
 
 end