metanorma-ieee 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6977149e490025d36902d366eaa5b7e4be29e631310089d7284a0c720cf97e1f
-  data.tar.gz: 54547196925d0c2a1105e006c5f9d44af24620934e86878ee2b4a42bab849840
+  metadata.gz: 62bafd0727fc5b10d3a146196f4317b9d158802d918c7c3a7e407d689348bac9
+  data.tar.gz: ffd4fbc73ea2b2af25abf3b4b21863e07e79706fc2f2bf8403a75b804e8eb7cf
 SHA512:
-  metadata.gz: 0174ce5cfcd8e09c41cd04f0226df41d7fe6572923eb0d447ea03e5eab60a47e231427447fd53fa32c839539b0a46bbbfba0e9e49da8aef4440e1b9b7252fd3d
-  data.tar.gz: bf031bcefafd8c806124623a0471de4f67f43dad2ade47a5e281375c955507ba797a1d9f2966b90ef7518f26ae6e3a7ac7552ac1af66605c98715e76981eebb1
+  metadata.gz: 52bc01c58e681f92ed46c3241db36244fbb805d6ec81678e90ad07b5ad9b7c89c1a528fbfbe411af74a9b7d58c01f032b2bdebaaaa7996dc313fe052ba73e7f0
+  data.tar.gz: 6fb175826c51f3b48ceb6a7b330560f166d358a24412109b09b77f04f84a66bcdc2e75bff43d2d277767257cd619e33265218dd399c47eee842b85799b274ab0

data/lib/isodoc/ieee/html/html_ieee_titlepage.html

@@ -8,16 +8,8 @@
 {% if corr %}
 <div class="doctitle-part">Corrigenda {{ corr }}</div>
 {% endif %}
-{%if updates or merges %}
-<div class="doctitle-part">(Revision of {{ updates | join: ", " }}<br/>Incorporating {{ merges | join: ", " }})</div>
-{%else%}
-{%if updates %}
-<div class="doctitle-part">(Revision of {{ updates | join: ", " }})</div>
-{%else%}
-{%if merges %}
-<div class="doctitle-part">(Incorporating {{ merges | join: ", " }})</div>
-{%endif%}
-{%endif%}
+{%if provenance_doctitle %}
+<div class="doctitle-part">({{ provenance_doctitle }})</div>
 {%endif%}
 </div>
 

data/lib/isodoc/ieee/html/ieee.css

@@ -2936,7 +2936,6 @@ div.WordSection8 {
   mso-footer-margin: 36.0pt;
   mso-line-numbers-count-by: 1;
   mso-page-numbers: roman-lower;
-  mso-columns: 3 even 36.0pt;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
   mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
   mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;
@@ -2950,7 +2949,6 @@ div.WordSection8 {
   mso-footer-margin: 36.0pt;
   mso-line-numbers-count-by: 1;
   mso-page-numbers: roman-lower;
-  mso-columns: 3 even 36.0pt;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1l;
   mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
   mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3l;
@@ -2964,7 +2962,6 @@ div.WordSection8 {
   mso-footer-margin: 36.0pt;
   mso-line-numbers-count-by: 1;
   mso-page-numbers: roman-lower;
-  mso-columns: 3 even 36.0pt;
   mso-header: url("file:///C:/Doc/FILENAME_files/header.html") h1;
   mso-even-footer: url("file:///C:/Doc/FILENAME_files/header.html") ef1;
   mso-footer: url("file:///C:/Doc/FILENAME_files/header.html") f3;

data/lib/isodoc/ieee/html/ieee.scss

@@ -2785,7 +2785,6 @@ div.WordSection8
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-page-numbers:roman-lower;
-	mso-columns:3 even 36.0pt;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
@@ -2798,7 +2797,6 @@ div.WordSection8
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-page-numbers:roman-lower;
-	mso-columns:3 even 36.0pt;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1l;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1l;
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3l;
@@ -2811,7 +2809,6 @@ div.WordSection8
 	mso-footer-margin:36.0pt;
 	mso-line-numbers-count-by:1;
 	mso-page-numbers:roman-lower;
-	mso-columns:3 even 36.0pt;
 	mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h1;
 	mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef1;
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;

data/lib/isodoc/ieee/html_convert.rb

@@ -37,7 +37,7 @@ module IsoDoc
       end
 
       def html_cleanup(html)
-        para_type_strip(super)
+        para_type_strip(affiliation_table(super))
       end
 
       def para_type_strip(html)
@@ -45,6 +45,42 @@ module IsoDoc
         html
       end
 
+      def affiliation_table(html)
+        html.xpath("//p[@type = 'officeorgrepmemberhdr']").each do |p|
+          affiliation_table1(p)
+        end
+        html
+      end
+
+      def affiliation_table1(para)
+        ret = "<table><thead>#{para_to_tr(para)}</thead><tbody>"
+        n = para.next_element
+        while n.name == "p" && n["type"] == "officeorgrepmember"
+          n1 = n.next_element
+          ret += para_to_tr(n.remove)
+          n = n1
+        end
+        ret += "</tbody></table>"
+        para.replace(ret)
+      end
+
+      def para_to_tr(para)
+        ret = para.children.each_with_object([[]]) do |c, m|
+          if c.name == "tab" then m << []
+          else m[-1] << c.to_xml
+          end
+        end.map { |c| "<td>#{c.join}</td>" }
+        "<tr>#{ret.join}</tr>"
+      end
+
+      def clausedelimspace(node, out)
+        if node.at("./ancestor::xmlns:p[@type = 'officeorgrepmemberhdr'"\
+                   " or @type = 'officeorgrepmember']")
+          out.tab
+        else super
+        end
+      end
+
       include BaseConvert
       include Init
     end