metanorma-ieee 1.0.15 → 1.1.1

data/lib/isodoc/ieee/ieee.standard.xsl

@@ -1061,23 +1061,22 @@
 							<fo:flow flow-name="xsl-region-body">
 								<!-- debugpage=<xsl:copy-of select="."/> -->
 
-								<xsl:if test="position() = 1">
-
+								<!-- <xsl:if test="position() = 1">
+									
 									<xsl:choose>
 										<xsl:when test="$current_template = 'draft'">
 											<fo:block font-family="Arial" font-size="23pt" font-weight="bold" margin-top="70pt" margin-bottom="48pt">
-
+											
 												<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
 													<xsl:attribute name="font-size">24pt</xsl:attribute>
 												</xsl:if>
-
+												
 												<xsl:copy-of select="$title_prefix"/>
 												<xsl:copy-of select="$title"/>
-
-												<!-- <xsl:copy-of select="$draft_title_part"/> -->
+												
 											</fo:block>
 										</xsl:when>
-
+										
 										<xsl:when test="$current_template = 'standard'">
 											<fo:block font-family="Arial" font-weight="bold" margin-top="13mm" space-after="12pt">
 												<fo:block font-weight="bold" space-before="13mm">
@@ -1085,30 +1084,21 @@
 												</fo:block>
 											</fo:block>
 										</xsl:when>
+										
+										<xsl:otherwise>  --><!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
 
-										<xsl:otherwise> <!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
-
-											<xsl:attribute name="font-family">Calibri Light</xsl:attribute>
+											<!-- <xsl:attribute name="font-family">Calibri Light</xsl:attribute>
 											<xsl:attribute name="font-size">12pt</xsl:attribute>
-
+											
 											<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
 												<xsl:copy-of select="$title"/>
-												<!-- <xsl:copy-of select="$draft_title_part"/> -->
 											</fo:block>
 											<xsl:call-template name="addBlueBox"/>
-											<!-- <fo:block font-size="1" margin-top="3mm">
-												<fo:instream-foreign-object content-width="57mm" content-height="3mm" scaling="non-uniform" fox:alt-text="Image Box">
-													<xsl:call-template name="insertImageBoxSVG">
-														<xsl:with-param name="color"><xsl:value-of select="$color_blue"/></xsl:with-param>
-													</xsl:call-template>
-												</fo:instream-foreign-object>
-											</fo:block>
-											<fo:block margin-top="12pt" margin-bottom="12pt">&#xa0;</fo:block> -->
-											<fo:block margin-bottom="12pt"> </fo:block>
+											<fo:block margin-bottom="12pt">&#xa0;</fo:block>
 										</xsl:otherwise>
 									</xsl:choose>
-
-								</xsl:if>
+									
+								</xsl:if> -->
 
 								<xsl:apply-templates select="*" mode="page"/>
 								<xsl:if test="position() = last()"><fo:block id="lastBlockMain"/></xsl:if>
@@ -1736,6 +1726,32 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template match="ieee:p[@class = 'zzSTDTitle1']" priority="4">
+		<xsl:choose>
+			<xsl:when test="$current_template = 'draft'">
+				<fo:block font-family="Arial" font-size="23pt" font-weight="bold" margin-top="70pt" margin-bottom="48pt">
+					<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
+						<xsl:attribute name="font-size">24pt</xsl:attribute>
+					</xsl:if>
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:when test="$current_template = 'standard'">
+				<fo:block font-family="Arial" font-weight="bold" margin-top="13mm" space-after="12pt">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise> <!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
+
+				<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
+					<xsl:apply-templates/>
+				</fo:block>
+				<xsl:call-template name="addBlueBox"/>
+				<fo:block margin-bottom="12pt"> </fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template match="node()">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -4056,11 +4072,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -6668,21 +6699,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -7747,6 +7778,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -9797,8 +9831,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -9831,25 +9869,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -13544,7 +13602,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/ieee/init.rb

@@ -24,6 +24,47 @@ module IsoDoc
       def fileloc(loc)
         File.join(File.dirname(__FILE__), loc)
       end
+
+      def std_docid_semantic(id)
+        id.nil? and return nil
+        ret = Nokogiri::XML.fragment(id)
+        ret.traverse do |x|
+          x.text? or next
+          x.replace(std_docid_semantic1(x.text))
+        end
+        to_xml(ret)
+      end
+
+      def std_docid_semantic1(id)
+        ids = id.split(/\p{Zs}/)
+        agency?(ids[0].sub(/\/.*$/, "")) or return id
+        std_docid_semantic_full(id)
+      end
+
+      # AGENCY+ TYPE NUMBER YEAR
+      def std_docid_semantic_full(ident)
+        m = ident.match(%r{(?<text>[^0-9]+\p{Zs})
+                        (?<num>[0-9]+)
+                        (?:[:](?<yr>(?:19|20)\d\d))?}x)
+        m or return ident
+        ret = std_docid_sdo(m[:text]) +
+          "<span class='std_docNumber'>#{m[:num]}</span>"
+        m[:yr] and ret += ":<span class='std_year'>#{m[:yr]}</span>"
+        ret
+      end
+
+      def std_docid_sdo(text)
+        found = false
+        text.split(%r{([\p{Zs}|/]+)}).reverse.map do |x|
+          if /[A-Za-z]/.match?(x)
+            k = if found || agency?(x) then "std_publisher"
+                else "std_documentType"
+                end
+            found = true
+            "<span class='#{k}'>#{x}</span>"
+          else x end
+        end.reverse.join
+      end
     end
   end
 end

data/lib/isodoc/ieee/presentation_bibdata.rb

@@ -0,0 +1,100 @@
+module IsoDoc
+  module IEEE
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def bibdata_i18n(bib)
+        super
+        bibdata_dates(bib)
+      end
+
+      def bibdata_dates(bib)
+        bib.xpath(ns("./date")).each do |d|
+          d.next = d.dup
+          d.next["format"] = "ddMMMyyyy"
+          d.next.xpath(ns("./from | ./to | ./on")).each do |x|
+            x.children = ddMMMyyyy(x.text)
+          end
+        end
+      end
+
+      def ddMMMyyyy(isodate)
+        return nil if isodate.nil?
+
+        arr = isodate.split("-")
+        if arr.size == 1 && (/^\d+$/.match isodate)
+          Date.new(*arr.map(&:to_i)).strftime("%Y")
+        elsif arr.size == 2
+          Date.new(*arr.map(&:to_i)).strftime("%b %Y")
+        else
+          Date.parse(isodate).strftime("%d %b %Y")
+        end
+      end
+
+      def boilerplate(docxml)
+        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/" \
+                        "clause/title")).each(&:remove)
+        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/clause"))
+          .each do |clause|
+          participants(clause)
+        end
+      end
+
+      def participants(clause)
+        clause.xpath(ns(".//ul")).each_with_index do |ulist, idx|
+          ulist.xpath(ns("./li")).each { |list| participants1(list, idx) }
+          ulist.replace(ulist.children)
+        end
+        affiliation_header(clause)
+      end
+
+      def affiliation_header(clause)
+        clause.xpath(ns(".//p[@type = 'officeorgrepmember']")).each do |p|
+          prev = p.previous_element
+          prev && prev.name == "p" &&
+            prev["type"] == "officeorgrepmember" and next
+          p.previous = <<~HDR
+            <p type='officeorgrepmemberhdr'><em>Organization
+            Represented</em><tab/><em>Name of Representative</em></p>
+          HDR
+        end
+      end
+
+      def participants1(list, idx)
+        key = ""
+        map = list.xpath(ns(".//dt | .//dd")).each_with_object({}) do |dtd, m|
+          (dtd.name == "dt" and key = dtd.text) or
+            m[key] = @c.encode(dtd.text.strip, :hexadecimal)
+        end
+        list.replace(participant_para(map, idx))
+      end
+
+      def participant_para(map, idx)
+        name = participant_name(map)
+        if map["role"]&.casecmp("member")&.zero?
+          participant_member_para(map, name, idx)
+        else
+          participant_officeholder_para(map, name, idx)
+        end
+      end
+
+      def participant_member_para(map, name, _idx)
+        if map["company"] && (map["name"] || map["surname"])
+          pers = map["name"] || "#{map['given']} #{map['surname']}"
+          "<p type='officeorgrepmember'>#{name}<tab/>#{pers}</p>"
+        elsif map["company"] then "<p type='officeorgmember'>#{name}</p>"
+        else "<p type='officemember'>#{name}</p>"
+        end
+      end
+
+      def participant_officeholder_para(map, name, idx)
+        name = "<strong>#{name}</strong>" if idx.zero?
+        br = map["role"].size > 30 ? "<br/>" : ""
+        "<p type='officeholder' align='center'>#{name}, #{br}" \
+          "<em>#{map['role']}</em></p>"
+      end
+
+      def participant_name(map)
+        map["company"] || map["name"] || "#{map['given']} #{map['surname']}"
+      end
+    end
+  end
+end

data/lib/isodoc/ieee/presentation_ref.rb

@@ -29,7 +29,7 @@ module IsoDoc
                      b.at(ns("./formattedref")))&.text,
               author: @author[b["id"]] || (b.at(ns("./title")) ||
                      b.at(ns("./formattedref")))&.text,
-              ord: b.at(ns("./docidentifier[@type = 'metanorma' or "\
+              ord: b.at(ns("./docidentifier[@type = 'metanorma' or " \
                            "@type = 'metanorma-ordinal']"))&.text }
         end
       end
@@ -78,6 +78,10 @@ module IsoDoc
         end
         idx
       end
+
+      def expand_citeas(text)
+        std_docid_semantic(super)
+      end
     end
   end
 end

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "init"
+require_relative "presentation_bibdata"
 require_relative "presentation_terms"
 require_relative "presentation_ref"
 require "isodoc"
@@ -25,7 +26,6 @@ module IsoDoc
 
       def prefix_clause(target, loc)
         loc["type"] == "clause" or return loc["type"]
-
         if subclause?(target, loc["type"],
                       loc&.at(ns("./referenceFrom"))&.text)
           ""
@@ -79,20 +79,6 @@ module IsoDoc
         prefix_name(elem, block_delim, lbl, "name")
       end
 
-      def display_order(docxml)
-        i = 0
-        i = display_order_xpath(docxml, "//preface/*", i)
-        i = display_order_at(docxml, "//clause[@type = 'overview']", i)
-        i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        i = display_order_at(docxml, "//sections/terms | " \
-                                     "//sections/clause[descendant::terms]", i)
-        i = display_order_at(docxml, "//sections/definitions", i)
-        i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
-        i = display_order_xpath(docxml, "//annex", i)
-        i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
-        display_order_xpath(docxml, "//indexsect", i)
-      end
-
       def annex1(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         if t = elem.at(ns("./title"))
@@ -101,34 +87,6 @@ module IsoDoc
         prefix_name(elem, "<br/>", lbl, "title")
       end
 
-      def bibdata_i18n(bib)
-        super
-        bibdata_dates(bib)
-      end
-
-      def bibdata_dates(bib)
-        bib.xpath(ns("./date")).each do |d|
-          d.next = d.dup
-          d.next["format"] = "ddMMMyyyy"
-          d.next.xpath(ns("./from | ./to | ./on")).each do |x|
-            x.children = ddMMMyyyy(x.text)
-          end
-        end
-      end
-
-      def ddMMMyyyy(isodate)
-        return nil if isodate.nil?
-
-        arr = isodate.split("-")
-        if arr.size == 1 && (/^\d+$/.match isodate)
-          Date.new(*arr.map(&:to_i)).strftime("%Y")
-        elsif arr.size == 2
-          Date.new(*arr.map(&:to_i)).strftime("%b %Y")
-        else
-          Date.parse(isodate).strftime("%d %b %Y")
-        end
-      end
-
       def amend1(elem)
         elem.xpath(ns("./description/p")).each do |p|
           p.children = to_xml(p.children).strip
@@ -151,73 +109,6 @@ module IsoDoc
         super
       end
 
-      def boilerplate(docxml)
-        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/" \
-                        "clause/title")).each(&:remove)
-        docxml.xpath(ns("//clause[@id = 'boilerplate-participants']/clause"))
-          .each do |clause|
-          participants(clause)
-        end
-      end
-
-      def participants(clause)
-        clause.xpath(ns(".//ul")).each_with_index do |ulist, idx|
-          ulist.xpath(ns("./li")).each { |list| participants1(list, idx) }
-          ulist.replace(ulist.children)
-        end
-        affiliation_header(clause)
-      end
-
-      def affiliation_header(clause)
-        clause.xpath(ns(".//p[@type = 'officeorgrepmember']")).each do |p|
-          prev = p.previous_element
-          prev && prev.name == "p" &&
-            prev["type"] == "officeorgrepmember" and next
-          p.previous = <<~HDR
-            <p type='officeorgrepmemberhdr'><em>Organization
-            Represented</em><tab/><em>Name of Representative</em></p>
-          HDR
-        end
-      end
-
-      def participants1(list, idx)
-        key = ""
-        map = list.xpath(ns(".//dt | .//dd")).each_with_object({}) do |dtd, m|
-          (dtd.name == "dt" and key = dtd.text) or
-            m[key] = @c.encode(dtd.text.strip, :hexadecimal)
-        end
-        list.replace(participant_para(map, idx))
-      end
-
-      def participant_para(map, idx)
-        name = participant_name(map)
-        if map["role"]&.casecmp("member")&.zero?
-          participant_member_para(map, name, idx)
-        else
-          participant_officeholder_para(map, name, idx)
-        end
-      end
-
-      def participant_member_para(map, name, _idx)
-        if map["company"] && (map["name"] || map["surname"])
-          pers = map["name"] || "#{map['given']} #{map['surname']}"
-          "<p type='officeorgrepmember'>#{name}<tab/>#{pers}</p>"
-        elsif map["company"] then "<p type='officeorgmember'>#{name}</p>"
-        else "<p type='officemember'>#{name}</p>"
-        end
-      end
-
-      def participant_officeholder_para(map, name, idx)
-        name = "<strong>#{name}</strong>" if idx.zero?
-        br = map["role"].size > 30 ? "<br/>" : ""
-        "<p type='officeholder' align='center'>#{name}, #{br}" \
-          "<em>#{map['role']}</em></p>"
-      end
-
-      def participant_name(map)
-        map["company"] || map["name"] || "#{map['given']} #{map['surname']}"
-      end
-
       def asciimath_dup(node)
         @suppressasciimathdup and return
         super
@@ -243,9 +134,15 @@ module IsoDoc
       end
 
       def ol_numbering(docxml)
-        docxml.xpath(ns("//clause | //annex | //foreword | //acknowledgements | //introduction | //preface/abstract | //appendix | //terms | //term | //definitions | //references | //colophon")).each do |_c|
-          (docxml.xpath(ns(".//ol")) -
-          docxml.xpath(ns("./clause//ol | ./appendix//ol | ./term//ol | ./terms//ol | ./definitions//ol | /references//ol | ./colophon//ol"))).each_with_index do |o, i|
+        p = "//clause | //annex | //foreword | //acknowledgements | " \
+            "//introduction | //preface/abstract | //appendix | //terms | " \
+            "//term | //definitions | //references | //colophon"
+        docxml.xpath(ns(p)).each do |c|
+          (c.xpath(ns(".//ol")) -
+          c.xpath(ns("./clause//ol | ./appendix//ol | ./term//ol | " \
+                     "./terms//ol | ./definitions//ol | " \
+                     "/references//ol | ./colophon//ol")))
+            .each_with_index do |o, i|
             ol_numbering1(o, i)
           end
         end
@@ -266,6 +163,17 @@ module IsoDoc
         type
       end
 
+      def middle_title(docxml)
+        s = docxml.at(ns("//sections")) or return
+        ret = "<p class='zzSTDTitle1'>#{@meta.get[:full_doctitle]}"
+        @meta.get[:amd] || @meta.get[:corr] and ret += "<br/>"
+        @meta.get[:amd] and ret += "Amendment #{@meta.get[:amd]}"
+        @meta.get[:amd] && @meta.get[:corr] and ret += " "
+        @meta.get[:corr] and ret += "Corrigenda #{@meta.get[:corr]}"
+        ret += "</p>"
+        s.children.first.previous = ret
+      end
+
       include Init
     end
   end

data/lib/isodoc/ieee/word_convert.rb

@@ -50,32 +50,34 @@ module IsoDoc
       def abstract(clause, out)
         page_break(out)
         out.div **attr_code(id: clause["id"], class: "abstract") do |s|
-          clause_name(clause, clause.at(ns("./title")), s, { class: "AbstractTitle" })
+          clause_name(clause, clause.at(ns("./title")), s,
+                      { class: "AbstractTitle" })
           clause.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
+      MAIN_ELEMENTS =
+        "//sections/*[@displayorder][not(@class = 'zzSTDTitle1')] | " \
+        "//annex[@displayorder] | " \
+        "//bibliography/*[@displayorder] | //colophon/*[@displayorder] | " \
+        "//indexsect[@displayorder]".freeze
+
       def make_body3(body, docxml)
-        body.div class: "WordSectionMiddleTitle" do |_div3|
-          middle_title_ieee(docxml, body)
+        body.div class: "WordSectionMiddleTitle" do |div3|
+          middle_title_ieee(docxml, div3)
         end
         section_break(body, continuous: true)
         body.div class: "WordSectionMain" do |div3|
-          middle docxml, div3
+          content(div3, docxml, ns(self.class::MAIN_ELEMENTS))
           footnotes div3
           comments div3
         end
       end
 
-      def middle_title(isoxml, out); end
-
-      def middle_title_ieee(_docxml, out)
+      def middle_title_ieee(docxml, out)
+        title = docxml.at(ns("//p[@class = 'zzSTDTitle1']")) or return
         out.p(class: "IEEEStdsTitle", style: "margin-top:70.0pt") do |p|
-          p << @meta.get[:full_doctitle]
-          @meta.get[:amd] || @meta.get[:corr] and p << "<br/>"
-          @meta.get[:amd] and p << "Amendment #{@meta.get[:amd]}"
-          @meta.get[:amd] && @meta.get[:corr] and p << " "
-          @meta.get[:corr] and p << "Corrigenda #{@meta.get[:corr]}"
+          title.children.each { |n| parse(n, p) }
         end
       end
 
@@ -137,7 +139,6 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        preceding_floating_titles(name, div)
         return if name.nil?
 
         name&.at(ns("./strong"))&.remove # supplied by CSS list numbering