isodoc 0.5.5 → 0.5.7

data/lib/isodoc/xref_gen.rb

@@ -1,3 +1,5 @@
+require "roman-numerals"
+
 module IsoDoc
   class Convert
     @anchors = {}
@@ -6,39 +8,6 @@ module IsoDoc
       @anchors
     end
 
-    def back_anchor_names(docxml)
-      docxml.xpath(ns("//annex")).each_with_index do |c, i|
-        annex_names(c, (65 + i).chr.to_s)
-      end
-      docxml.xpath(ns("//bibitem")).each do |ref|
-        reference_names(ref)
-      end
-    end
-
-    def initial_anchor_names(d)
-      introduction_names(d.at(ns("//introduction")))
-      section_names(d.at(ns("//clause[title = 'Scope']")), "1", 1)
-      section_names(d.at(ns(
-        "//references[title = 'Normative References']")), "2", 1)
-      section_names(d.at(ns("//sections/terms")), "3", 1)
-      middle_section_asset_names(d)
-    end
-
-    def middle_section_asset_names(d)
-      middle_sections = "//clause[title = 'Scope'] | "\
-        "//foreword | //introduction | "\
-        "//references[title = 'Normative References'] | //sections/terms | "\
-        "//sections/symbols-abbrevs | //clause[parent::sections]"
-      sequential_asset_names(d.xpath(ns(middle_sections)))
-    end
-
-    def clause_names(docxml, sect_num)
-      q = "//clause[parent::sections][not(xmlns:title = 'Scope')]"
-      docxml.xpath(ns(q)).each_with_index do |c, i|
-        section_names(c, (i + sect_num).to_s, 1)
-      end
-    end
-
     def termnote_label(n)
       @termnote_lbl.gsub(/%/, n.to_s)
     end
@@ -54,6 +23,17 @@ module IsoDoc
       end
     end
 
+    def termexample_anchor_names(docxml)
+      docxml.xpath(ns("//term[termexample]")).each do |t|
+        t.xpath(ns("./termexample")).each_with_index do |n, i|
+          @anchors[n["id"]] =
+            { label: (i + 1).to_s,
+              xref: l10n("#{@anchors[t['id']][:xref]}, "\
+                         "#{@note_xref_lbl} #{i + 1}") }
+        end
+      end
+    end
+
     SECTIONS_XPATH =
       "//foreword | //introduction | //sections/terms | //annex | "\
       "//sections/clause | //references[not(ancestor::references)]".freeze
@@ -90,6 +70,41 @@ module IsoDoc
       end
     end
 
+    def list_anchor_names(sections)
+      sections.each do |s|
+        notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//subsection//ol")) -
+          s.xpath(ns(".//ol//ol"))
+        notes.each_with_index do |n, i|
+          idx = notes.size == 1 ? "" : " #{i + 1}"
+          @anchors[n["id"]] = anchor_struct(idx, s, @list_lbl)
+          list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
+        end
+        list_anchor_names(s.xpath(ns("./subsection")))
+      end
+    end
+
+    def listlabel(depth, i)
+      return i.to_s if [2, 7].include? depth
+      return (96 + i).chr.to_s if [1, 6].include? depth
+      return (64 + i).chr.to_s if [4, 9].include? depth
+      return RomanNumerals.to_roman(i).downcase if [3, 8].include? depth
+      return RomanNumerals.to_roman(i).upcase if [5, 10].include? depth
+      return i.to_s
+    end
+
+    def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
+      list.xpath(ns("./li")).each_with_index do |li, i|
+        label = listlabel(depth, i + 1)
+        label = "#{prev_label}.#{label}" unless prev_label.empty?
+        label = "#{list_anchor[:xref]} #{label}" if refer_list
+        li["id"] && @anchors[li["id"]] = { xref: "#{label})", 
+                                           container: list_anchor[:container] }
+        li.xpath(ns("./ol")).each do |ol|
+          list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
+        end
+      end
+    end
+
     def middle_anchor_names(docxml)
       symbols_abbrevs = docxml.at(ns("//sections/symbols-abbrevs"))
       sect_num = 4
@@ -99,6 +114,7 @@ module IsoDoc
       end
       clause_names(docxml, sect_num)
       termnote_anchor_names(docxml)
+      termexample_anchor_names(docxml)
     end
 
     # extract names for all anchors, xref and label
@@ -111,6 +127,7 @@ module IsoDoc
                                         "//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)))
     end
 
     def sequential_figure_names(clause)
@@ -167,51 +184,5 @@ module IsoDoc
         @anchors[t["id"]] = anchor_struct("#{num}.#{i + 1}", t, @formula_lbl)
       end
     end
-
-    def introduction_names(clause)
-      return if clause.nil?
-      clause.xpath(ns("./subsection")).each_with_index do |c, i|
-        section_names1(c, "0.#{i + 1}", 2)
-      end
-    end
-
-    def section_names(clause, num, lvl)
-      return if clause.nil?
-      @anchors[clause["id"]] =
-        { label: num, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
-      clause.xpath(ns("./subsection | ./term  | ./terms | ./symbols-abbrevs")).
-        each_with_index do |c, i|
-        section_names1(c, "#{num}.#{i + 1}", lvl + 1)
-      end
-    end
-
-    def section_names1(clause, num, level)
-      @anchors[clause["id"]] =
-        { label: num, level: level, xref: num }
-      # subclauses are not prefixed with "Clause"
-      clause.xpath(ns("./subsection | ./terms | ./term | ./symbols-abbrevs")).
-        each_with_index do |c, i|
-        section_names1(c, "#{num}.#{i + 1}", level + 1)
-      end
-    end
-
-    def annex_names(clause, num)
-      obl = l10n("(#{@inform_annex_lbl})")
-      obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
-      label = l10n("<b>#{@annex_lbl} #{num}</b><br/>#{obl}")
-      @anchors[clause["id"]] =
-        { label: label, xref: "#{@annex_lbl} #{num}", level: 1 }
-      clause.xpath(ns("./subsection")).each_with_index do |c, i|
-        annex_names1(c, "#{num}.#{i + 1}", 2)
-      end
-      hierarchical_asset_names(clause, num)
-    end
-
-    def annex_names1(clause, num, level)
-      @anchors[clause["id"]] = { label: num, xref: num, level: level }
-      clause.xpath(ns(".//subsection")).each_with_index do |c, i|
-        annex_names1(c, "#{num}.#{i + 1}", level + 1)
-      end
-    end
   end
 end

data/lib/isodoc/xref_sect_gen.rb

@@ -0,0 +1,82 @@
+module IsoDoc
+  class Convert
+    def back_anchor_names(docxml)
+      docxml.xpath(ns("//annex")).each_with_index do |c, i|
+        annex_names(c, (65 + i).chr.to_s)
+      end
+      docxml.xpath(ns("//bibitem")).each do |ref|
+        reference_names(ref)
+      end
+    end
+
+    def initial_anchor_names(d)
+      introduction_names(d.at(ns("//introduction")))
+      section_names(d.at(ns("//clause[title = 'Scope']")), "1", 1)
+      section_names(d.at(ns(
+        "//references[title = 'Normative References']")), "2", 1)
+      section_names(d.at(ns("//sections/terms")), "3", 1)
+      middle_section_asset_names(d)
+    end
+
+    def middle_section_asset_names(d)
+      middle_sections = "//clause[title = 'Scope'] | "\
+        "//foreword | //introduction | "\
+        "//references[title = 'Normative References'] | //sections/terms | "\
+        "//sections/symbols-abbrevs | //clause[parent::sections]"
+      sequential_asset_names(d.xpath(ns(middle_sections)))
+    end
+
+    def clause_names(docxml, sect_num)
+      q = "//clause[parent::sections][not(xmlns:title = 'Scope')]"
+      docxml.xpath(ns(q)).each_with_index do |c, i|
+        section_names(c, (i + sect_num).to_s, 1)
+      end
+    end
+
+    def introduction_names(clause)
+      return if clause.nil?
+      clause.xpath(ns("./subsection")).each_with_index do |c, i|
+        section_names1(c, "0.#{i + 1}", 2)
+      end
+    end
+
+    def section_names(clause, num, lvl)
+      return if clause.nil?
+      @anchors[clause["id"]] =
+        { label: num, xref: l10n("#{@clause_lbl} #{num}"), level: lvl }
+      clause.xpath(ns("./subsection | ./term  | ./terms | ./symbols-abbrevs")).
+        each_with_index do |c, i|
+        section_names1(c, "#{num}.#{i + 1}", lvl + 1)
+      end
+    end
+
+    def section_names1(clause, num, level)
+      @anchors[clause["id"]] =
+        { label: num, level: level, xref: num }
+      # subclauses are not prefixed with "Clause"
+      clause.xpath(ns("./subsection | ./terms | ./term | ./symbols-abbrevs")).
+        each_with_index do |c, i|
+        section_names1(c, "#{num}.#{i + 1}", level + 1)
+      end
+    end
+
+    def annex_names(clause, num)
+      obl = l10n("(#{@inform_annex_lbl})")
+      obl = l10n("(#{@norm_annex_lbl})") if clause["obligation"] == "normative"
+      label = l10n("<b>#{@annex_lbl} #{num}</b><br/>#{obl}")
+      @anchors[clause["id"]] =
+        { label: label, xref: "#{@annex_lbl} #{num}", level: 1 }
+      clause.xpath(ns("./subsection")).each_with_index do |c, i|
+        annex_names1(c, "#{num}.#{i + 1}", 2)
+      end
+      hierarchical_asset_names(clause, num)
+    end
+
+    def annex_names1(clause, num, level)
+      @anchors[clause["id"]] = { label: num, xref: num, level: level }
+      clause.xpath(ns(".//subsection")).each_with_index do |c, i|
+        annex_names1(c, "#{num}.#{i + 1}", level + 1)
+      end
+    end
+  end
+end

data/spec/assets/header.html

@@ -0,0 +1,7 @@
+
+/* an empty header */
+
+START DOC ID: {{ docnumber }}: END DOC ID
+
+FILENAME: {{ filename }}
+

data/spec/assets/html.css

@@ -0,0 +1,2 @@
+
+/* another empty stylesheet */

data/spec/assets/htmlcover.html

@@ -0,0 +1,4 @@
+
+/* an empty html cover page */
+
+

data/spec/assets/htmlintro.html

@@ -0,0 +1,5 @@
+
+/* an empty html intro page */
+
+<ul id="toc-list"></ul>
+

data/spec/assets/i18n.yaml

@@ -0,0 +1,2 @@
+foreword: Enkonduko
+

data/spec/assets/iso.xml

@@ -0,0 +1,8 @@
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <foreword>
+    <note>
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword>
+    </iso-standard>
+

data/spec/assets/std.css

@@ -0,0 +1,2 @@
+
+/* a third empty stylesheet */

data/spec/assets/word.css

@@ -0,0 +1,2 @@
+
+/* one empty stylesheet */

data/spec/assets/wordcover.html

@@ -0,0 +1,3 @@
+
+/* an empty word cover page */
+

data/spec/assets/wordintro.html

@@ -0,0 +1,4 @@
+
+/* an empty word intro page */
+
+WORDTOC

data/spec/isodoc/blocks_spec.rb

@@ -18,18 +18,18 @@ RSpec.describe IsoDoc do
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="" class="Note">
-                   <p class="Note">NOTE<span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note">NOTE&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -45,6 +45,44 @@ RSpec.describe IsoDoc do
     <foreword>
     <note id="note1">
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
+</note>
+    </foreword>
+    </iso-standard>
+INPUT
+       <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+           <body lang="EN-US" link="blue" vlink="#954F72">
+             <div class="WordSection1">
+               <p>&#160;</p>
+             </div>
+             <br/>
+             <div class="WordSection2">
+               <br/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <div id="note1" class="Note">
+                   <p class="Note">NOTE&#160; These results are based on a study carried out on three different types of kernel.</p>
+                 </div>
+               </div>
+               <p>&#160;</p>
+             </div>
+             <br/>
+             <div class="WordSection3">
+               <p class="zzSTDTitle1"/>
+             </div>
+           </body>
+         </head>
+       </html>
+    OUTPUT
+  end
+
+    it "processes sequences of notes" do
+    expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <foreword>
+    <note id="note1">
+  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
 </note>
     <note id="note2">
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
@@ -59,21 +97,21 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="note1" class="Note">
-                   <p class="Note">NOTE  1<span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note">NOTE  1&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                  <div id="note2" class="Note">
-                   <p class="Note">NOTE  2<span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note">NOTE  2&#160; These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -101,19 +139,19 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="" class="Note">
-                   <p class="Note">NOTE<span style="mso-tab-count:1">&#160; </span>These results are based on a study carried out on three different types of kernel.</p>
+                   <p class="Note">NOTE&#160; These results are based on a study carried out on three different types of kernel.</p>
                    <p class="Note" id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a">These results are based on a study carried out on three different types of kernel.</p>
                  </div>
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -145,12 +183,12 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="" class="Note"><p class="Note">NOTE<span style="mso-tab-count:1">&#160; </span></p>
+                 <div id="" class="Note"><p class="Note">NOTE&#160; </p>
            <dl><dt><p class="Note">A</p></dt><dd><p class="Note">B</p></dd></dl>
            <ul>
            <li>C</li></ul>
@@ -158,7 +196,7 @@ INPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -191,9 +229,9 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="figureA-1" class="figure">
@@ -204,7 +242,7 @@ INPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -231,9 +269,9 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <table id="samplecode" class="example">
@@ -247,7 +285,7 @@ INPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -278,9 +316,9 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <table id="samplecode" class="example">
@@ -301,7 +339,7 @@ INPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -329,16 +367,16 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p id="samplecode" class="Sourcecode"><br/>&#160;&#160;&#160;&#160;<br/>&#160;&#160;puts&#160;x<br/><p class="FigureTitle" align="center"><b>Ruby code</b></p></p>
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -370,9 +408,9 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p id="_" class="Sourcecode">puts&#160;"Hello,&#160;world."&#160; &lt;1&gt;<br/>&#160;&#160;&#160;%w{a&#160;b&#160;c}.each&#160;do&#160;|x|<br/>&#160;&#160;&#160;&#160;&#160;puts&#160;x&#160; &lt;2&gt;<br/>&#160;&#160;&#160;end<span class="zzMoveToFollowing">&lt;1&gt; </span>
@@ -383,7 +421,7 @@ INPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -410,9 +448,9 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div class="Admonition"><title>CAUTION</title>
@@ -421,7 +459,7 @@ INPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -455,12 +493,12 @@ INPUT
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><span class="stem">(#(r = 1 %)#)</span><span style="mso-tab-count:1">&#160; </span>(1)</div>
+                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
                  <p>where</p>
                  <dl>
                    <dt>
@@ -473,7 +511,7 @@ INPUT
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -489,7 +527,49 @@ INPUT
     <foreword>
     <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
 Fictitious<br/>
-World
+World</p>
+    <p align="justify">Justify</p>
+    </foreword>
+    </iso-standard>
+    INPUT
+           <html xmlns:epub="http://www.idpf.org/2007/ops">
+         <head>
+           <title>test</title>
+           <body lang="EN-US" link="blue" vlink="#954F72">
+             <div class="WordSection1">
+               <p>&#160;</p>
+             </div>
+             <br/>
+             <div class="WordSection2">
+               <br/>
+               <div>
+                 <h1 class="ForewordTitle">Foreword</h1>
+                 <p id="_08bfe952-d57f-4150-9c95-5d52098cc2a8" align="left" style="text-align:left">Vache Equipment<br/>
+       Fictitious<br/>
+       World
+           </p>
+           <p style="text-align:justify">Justify</p>
+               </div>
+               <p>&#160;</p>
+             </div>
+             <br/>
+             <div class="WordSection3">
+               <p class="zzSTDTitle1"/>
+             </div>
+           </body>
+         </head>
+       </html>
+    OUTPUT
+  end
+
+    it "processes paragraph alignments (Word)" do
+    expect(IsoDoc::WordConvert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <foreword>
+    <p align="left" id="_08bfe952-d57f-4150-9c95-5d52098cc2a8">Vache Equipment<br/>
+Fictitious<br/>
+World</p>
+    <p align="justify">Justify</p>
     </foreword>
     </iso-standard>
     INPUT
@@ -502,13 +582,14 @@ World
              </div>
              <br clear="all" class="section"/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br  clear="all" style="mso-special-character:line-break;page-break-before:always"/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p id="_08bfe952-d57f-4150-9c95-5d52098cc2a8" align="left" style="text-align:left">Vache Equipment<br/>
        Fictitious<br/>
        World
            </p>
+           <p style="text-align:justify">Justify</p>
                </div>
                <p>&#160;</p>
              </div>
@@ -522,6 +603,8 @@ World
     OUTPUT
   end
 
+
+
   it "processes blockquotes" do
     expect(IsoDoc::Convert.new({}).convert_file(<<~"INPUT", "test", true)).to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -542,9 +625,9 @@ World
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
-               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+               <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div class="Quote" id="_044bd364-c832-4b78-8fea-92242402a1d1">
@@ -555,7 +638,7 @@ World
                </div>
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
              </div>
@@ -585,14 +668,14 @@ World
              <div class="WordSection1">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection2">
                <p>&#160;</p>
              </div>
-             <br clear="all" class="section"/>
+             <br/>
              <div class="WordSection3">
                <p class="zzSTDTitle1"/>
-               <div><h1>3.<span style="mso-tab-count:1">&#160; </span>Terms and Definitions</h1><p>For the purposes of this document,
+               <div><h1>3.&#160; Terms and Definitions</h1><p>For the purposes of this document,
            the following terms and definitions apply.</p>
        <p>ISO and IEC maintain terminological databases for use in
        standardization at the following addresses:</p>