metanorma-ieee 1.5.2 → 1.5.3

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

@@ -69,12 +69,16 @@
 		</xsl:choose>
 	</xsl:variable>
 
+	<!-- https://github.com/metanorma/metanorma-csa/issues/329 -->
+	<!-- if stage >= 60 -->
+	<xsl:variable name="stage_published" select="normalize-space((//mn:metanorma)[1]/mn:metanorma-extension/mn:semantic-metadata/mn:stage-published)"/>
+
 	<xsl:variable name="trial_use" select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:trial-use[normalize-space(@language) = '']"/>
 
 	<xsl:variable name="current_template">
 		<xsl:choose>
 			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and $stage = 'draft'">draft</xsl:when>
-			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and ($stage = 'published' or $stage = 'approved')">standard</xsl:when>
+			<xsl:when test="($doctype = 'standard' or $doctype = 'guide' or $doctype = 'recommended-practice') and ($stage = 'published' or $stage = 'approved' or $stage_published = 'true')">standard</xsl:when>
 			<xsl:when test="$doctype = 'whitepaper' and $subdoctype = 'icap'">icap-whitepaper</xsl:when>
 			<xsl:when test="$doctype = 'whitepaper' and $subdoctype = 'industry-connection-report'">industry-connection-report</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$doctype"/></xsl:otherwise>
@@ -414,9 +418,11 @@
 						</xsl:choose>
 					</xsl:variable>
 
-					<xsl:variable name="society" select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:society"/>
+					<!-- <xsl:variable name="society" select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:society"/>  -->
+					<xsl:variable name="society" select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'authorizer']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Society']/mn:name"/>
 
-					<xsl:variable name="committee" select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/>
+					<!-- <xsl:variable name="committee" select="/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/> -->
+					<xsl:variable name="committee" select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'authorizer']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name"/>
 
 					<xsl:variable name="approved_by">IEEE SA Standards Board</xsl:variable>
 					<xsl:variable name="approved_date">
@@ -1262,7 +1268,7 @@
 
 								</xsl:when> <!-- $stage = 'draft' -->
 
-								<xsl:when test="$stage = 'published' or $stage = 'approved'">
+								<xsl:when test="$stage = 'published' or $stage = 'approved' or $stage_published = 'true'">
 
 									<xsl:variable name="provisional-distance-between-starts">10</xsl:variable>
 
@@ -1414,7 +1420,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="toc-title-style">
-					<xsl:if test="($current_template = 'standard' or $current_template = 'draft') and        ($stage = 'published' or $stage = 'approved')">
+					<xsl:if test="($current_template = 'standard' or $current_template = 'draft') and        ($stage = 'published' or $stage = 'approved' or $stage_published = 'true')">
 						<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 					</xsl:if>
 					<!-- Contents -->
@@ -1426,13 +1432,17 @@
 	</xsl:template>
 
 	<xsl:template match="mn:boilerplate/mn:copyright-statement//mn:p" priority="2">
-		<fo:block margin-top="6pt" margin-bottom="6pt" text-align="justify">
+		<fo:block xsl:use-attribute-sets="copyright-statement-p-style">
+			<xsl:call-template name="refine_copyright-statement-p-style"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:boilerplate/mn:license-statement//mn:p" priority="2">
-		<fo:block margin-top="6pt" margin-bottom="6pt" text-align="justify">
+		<fo:block xsl:use-attribute-sets="license-statement-p-style">
+			<xsl:call-template name="refine_license-statement-p-style"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -1531,8 +1541,10 @@
 
 				<xsl:variable name="officemembers_count" select="count($officemembers/officemember)"/>
 
-				<xsl:variable name="mod" select="$officemembers_count mod 3"/>
-				<xsl:variable name="floor" select="floor($officemembers_count div 3)"/>
+				<xsl:variable name="cols">3</xsl:variable>
+
+				<xsl:variable name="mod" select="$officemembers_count mod $cols"/>
+				<xsl:variable name="floor" select="floor($officemembers_count div $cols)"/>
 
 				<xsl:variable name="max">
 					<xsl:choose>
@@ -1541,11 +1553,41 @@
 					</xsl:choose>
 				</xsl:variable>
 
-				<!-- <fo:block>officemembers_count=<xsl:value-of select="$officemembers_count"/></fo:block>
-				<fo:block>mod=<xsl:value-of select="$mod"/></fo:block>
+				<!-- <fo:block>DEBUG officemembers_count=<xsl:value-of select="$officemembers_count"/></fo:block> -->
+				<!-- <fo:block>mod=<xsl:value-of select="$mod"/></fo:block>
 				<fo:block>floor=<xsl:value-of select="$floor"/></fo:block>
 				<fo:block>max=<xsl:value-of select="$max"/></fo:block> -->
 
+				<!-- From https://github.com/metanorma/metanorma-ieee/issues/533#issuecomment-3178212854:
+				Algorithm:
+					3 cases: 0 extra, all balanced; 1 extra, place in middle, 2 extra, place on both sides.
+
+					The number of rows in each column is "ceil(names/cols)".
+					The number of extras is calculated as "names mod cols"
+					In the 1 extra case, place an additional line break after the "floor(names/cols)"-th item.
+					In the 2 extra case, place an additional line break after the "ceil(names/cols) + floor(names/cols)"-th item
+				-->
+
+				<xsl:variable name="number_in_each_column" select="ceiling($officemembers_count div $cols)"/>
+				<!-- <fo:block>DEBUG number_in_each_column=<xsl:value-of select="$number_in_each_column"/></fo:block> -->
+				<xsl:variable name="number_extras" select="$officemembers_count mod $cols"/>
+				<!-- <fo:block>DEBUG number_extras=<xsl:value-of select="$number_extras"/></fo:block> -->
+
+				<xsl:variable name="officemembers_updated_">
+					<xsl:for-each select="$officemembers/officemember">
+						<xsl:copy-of select="."/>
+						<xsl:choose>
+							<xsl:when test="$number_extras = 1 and position() = $floor">
+								<officemember/>
+							</xsl:when>
+							<xsl:when test="$number_extras = 2 and position() = ($number_in_each_column + $floor)">
+								<officemember/>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="officemembers_updated" select="xalan:nodeset($officemembers_updated_)"/>
+
 				<fo:block font-size="9pt">
 					<fo:block> </fo:block>
 					<fo:table width="100%" table-layout="fixed">
@@ -1553,7 +1595,7 @@
 						<fo:table-column column-width="proportional-column-width(55)"/>
 						<fo:table-column column-width="proportional-column-width(42)"/>
 						<fo:table-body>
-							<xsl:for-each select="$officemembers/officemember[position() &lt;= $max]">
+							<xsl:for-each select="$officemembers_updated/officemember[position() &lt;= $number_in_each_column]"> <!-- $max -->
 								<fo:table-row>
 									<fo:table-cell padding-right="3mm">
 										<fo:block>
@@ -1562,12 +1604,12 @@
 									</fo:table-cell>
 									<fo:table-cell padding-right="3mm">
 										<fo:block>
-											<xsl:apply-templates select="following-sibling::*[number($max)]/node()"/>
+											<xsl:apply-templates select="following-sibling::*[number($number_in_each_column)]/node()"/> <!-- $max -->
 										</fo:block>
 									</fo:table-cell>
 									<fo:table-cell>
 										<fo:block>
-											<xsl:apply-templates select="following-sibling::*[number($max) * 2]/node()"/>
+											<xsl:apply-templates select="following-sibling::*[number($number_in_each_column) * 2]/node()"/> <!-- $max -->
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -1617,9 +1659,7 @@
 
 				<xsl:variable name="attributes_">
 					<attributes>
-						<xsl:if test="@align = 'center' and ancestor::mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants'] and following-sibling::*[1][self::mn:p and @align = 'center']">
-							<xsl:attribute name="space-after">0</xsl:attribute>
-						</xsl:if>
+
 						<xsl:call-template name="setTextAlignment">
 							<xsl:with-param name="default">justify</xsl:with-param>
 						</xsl:call-template>
@@ -1635,6 +1675,11 @@
 							<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
 							<xsl:attribute name="space-after">6pt</xsl:attribute>
 						</xsl:if>
+
+						<xsl:if test="@align = 'center' and ancestor::mn:clause[@id = 'boilerplate-participants' or normalize-space(mn:fmt-title) = 'Participants'] and following-sibling::*[1][self::mn:p and @align = 'center']">
+							<xsl:attribute name="space-after">0</xsl:attribute>
+						</xsl:if>
+
 					</attributes>
 				</xsl:variable>
 
@@ -1645,7 +1690,7 @@
 					<xsl:for-each select="$attributes/attributes/@*">
 						<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
 					</xsl:for-each>
-
+					<!-- <fo:block>debug current_template=<xsl:value-of select="$current_template"/></fo:block> -->
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -3010,7 +3055,7 @@
 	</xsl:template>
 
 	<xsl:template name="insertFootnoteSeparator">
-		<fo:static-content flow-name="xsl-footnote-separator">
+		<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
 			<fo:block>
 				<fo:leader leader-pattern="rule" rule-thickness="0.5pt" leader-length="35%">
 					<xsl:if test="$current_template = 'whitepaper' or $current_template= 'icap-whitepaper' or $current_template = 'industry-connection-report'">
@@ -5485,13 +5530,26 @@
 	<xsl:attribute-set name="copyright-statement-style">
 	</xsl:attribute-set> <!-- copyright-statement-style -->
 
+	<xsl:template name="refine_copyright-statement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="copyright-statement-title-style">
 	</xsl:attribute-set> <!-- copyright-statement-title-style -->
 
+	<xsl:template name="refine_copyright-statement-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="copyright-statement-p-style">
 	</xsl:attribute-set> <!-- copyright-statement-p-style -->
 
-		<xsl:attribute-set name="license-statement-style">
+	<xsl:template name="refine_copyright-statement-p-style">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		<xsl:attribute name="text-align">justify</xsl:attribute>
+
+	</xsl:template>
+
+	<xsl:attribute-set name="license-statement-style">
 	</xsl:attribute-set> <!-- license-statement-style -->
 
 	<xsl:attribute-set name="license-statement-title-style">
@@ -5499,8 +5557,15 @@
 	</xsl:attribute-set> <!-- license-statement-title-style -->
 
 	<xsl:attribute-set name="license-statement-p-style">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		<xsl:attribute name="text-align">justify</xsl:attribute>
 	</xsl:attribute-set> <!-- license-statement-p-style -->
 
+	<xsl:template name="refine_license-statement-p-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="legal-statement-style">
 	</xsl:attribute-set> <!-- legal-statement-style -->
 
@@ -5528,6 +5593,8 @@
 	<!-- ================================= -->
 	<xsl:template match="mn:copyright-statement">
 		<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
+			<xsl:call-template name="refine_copyright-statement-style"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- copyright-statement -->
@@ -6636,7 +6703,7 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
-				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
+				<xsl:if test="$key = 'font-family' or           $key = 'font-size' or          $key = 'color' or          $key = 'baseline-shift' or          $key = 'line-height'          ">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 				<xsl:if test="$key = 'text-indent'">
@@ -14253,13 +14320,31 @@
 				<!-- skip here, see the template 'fmt-review-start' -->
 			</xsl:when>
 			<xsl:otherwise>
-				<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
-				<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and        following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
-				<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
-				<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+				<xsl:choose>
+					<xsl:when test="parent::mn:example or parent::mn:termexample or parent::mn:note or parent::mn:termnote">
+						<fo:block font-size="1pt" line-height="0.1">
+							<xsl:call-template name="fo_inline_bookmark">
+								<xsl:with-param name="bookmark_id" select="$bookmark_id"/>
+							</xsl:call-template>
+						</fo:block>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="fo_inline_bookmark">
+							<xsl:with-param name="bookmark_id" select="$bookmark_id"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
+
+	<xsl:template name="fo_inline_bookmark">
+		<xsl:param name="bookmark_id"/>
+		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
+		<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and      following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
+		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
+		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+	</xsl:template>
 	<!-- =================== -->
 	<!-- End of Index processing -->
 	<!-- =================== -->
@@ -16145,11 +16230,35 @@
 
 	<xsl:template match="mn:svgmap"/>
 
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- for correct rendering combining chars, added in mode="update_xml_step2" -->
 	<xsl:template match="*[local-name() = 'lang_none']">
 		<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
+	<xsl:template name="addTagElementT">
+		<xsl:variable name="title_">
+			<xsl:apply-templates select="mn:fmt-title"/>
+		</xsl:variable>
+		<xsl:variable name="title__">
+			<xsl:for-each select="xalan:nodeset($title_)/*/node()">
+				<xsl:choose>
+					<xsl:when test="self::text()"><xsl:text> </xsl:text><xsl:value-of select="."/><xsl:text> </xsl:text></xsl:when>
+					<xsl:otherwise><xsl:text> </xsl:text><xsl:copy-of select="."/><xsl:text> </xsl:text></xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="title" select="normalize-space($title__)"/>
+		<xsl:if test="$title != ''">
+			<xsl:attribute name="fox:title">
+				<xsl:if test="ancestor::mn:sections">
+					<xsl:text>Section </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="$title"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="replaceChar">
 		<xsl:param name="text"/>
 		<xsl:param name="replace"/>
@@ -16430,7 +16539,8 @@
 						<xsl:for-each select="(//mn:metanorma)[1]/mn:bibdata">
 							<rdf:Seq>
 								<rdf:li>
-									<xsl:value-of select="mn:ext/mn:editorialgroup/mn:committee"/>
+									<!-- <xsl:value-of select="mn:ext/mn:editorialgroup/mn:committee"/> -->
+									<xsl:value-of select="mn:contributor[mn:role[@type = 'authorizer']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name"/>
 								</rdf:li>
 							</rdf:Seq>
 
@@ -16915,6 +17025,13 @@
 			<xsl:with-param name="default" select="$text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
+		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">
+			<xsl:variable name="styles">
+				<xsl:apply-templates select="*[1]"/>
+			</xsl:variable>
+			<!-- move attribute line-height from inline to block -->
+			<xsl:attribute name="line-height"><xsl:value-of select="xalan:nodeset($styles)//*/@line-height"/></xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template name="setKeepAttributes">
@@ -16940,34 +17057,41 @@
 		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
 			<fo:block>
 				<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image[$num]">
-					<xsl:choose>
-						<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
-							<fo:instream-foreign-object fox:alt-text="Image Front">
-								<xsl:attribute name="content-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
-								<xsl:call-template name="getSVG"/>
-							</fo:instream-foreign-object>
-						</xsl:when>
-						<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
-							<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
-						</xsl:when>
-						<xsl:otherwise> <!-- bitmap image -->
-							<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
-							<xsl:if test="$coverimage_src != ''">
-								<xsl:variable name="coverpage">
-									<xsl:call-template name="getImageURL">
-										<xsl:with-param name="src" select="$coverimage_src"/>
-									</xsl:call-template>
-								</xsl:variable>
-								<!-- <xsl:variable name="coverpage" select="concat('url(file:',$basepath, 'coverpage1.png', ')')"/> --> <!-- for DEBUG -->
-								<fo:external-graphic src="{$coverpage}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
-							</xsl:if>
-						</xsl:otherwise>
-					</xsl:choose>
+
+					<xsl:call-template name="insertPageImage"/>
+
 				</xsl:for-each>
 			</fo:block>
 		</fo:block-container>
 	</xsl:template>
 
+	<xsl:template name="insertPageImage">
+		<xsl:param name="svg_content_height" select="$pageHeight"/>
+		<xsl:param name="bitmap_width" select="$pageWidth"/>
+		<xsl:choose>
+			<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
+				<fo:instream-foreign-object fox:alt-text="Image Front">
+					<xsl:attribute name="content-height"><xsl:value-of select="$svg_content_height"/>mm</xsl:attribute>
+					<xsl:call-template name="getSVG"/>
+				</fo:instream-foreign-object>
+			</xsl:when>
+			<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
+				<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
+			</xsl:when>
+			<xsl:otherwise> <!-- bitmap image -->
+				<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
+				<xsl:if test="$coverimage_src != ''">
+					<xsl:variable name="coverpage">
+						<xsl:call-template name="getImageURL">
+							<xsl:with-param name="src" select="$coverimage_src"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template name="getImageURL">
 		<xsl:param name="src"/>
 		<xsl:choose>
@@ -17395,6 +17519,14 @@
 		</xsl:attribute>
 	</xsl:template>
 
+	<xsl:template name="getCharByCodePoint">
+		<xsl:param name="codepoint"/>
+		<xsl:param name="radix">16</xsl:param>
+		<xsl:variable name="codepointInt" select="java:java.lang.Integer.parseInt($codepoint,$radix)"/>
+		<xsl:variable name="chars" select="java:java.lang.Character.toChars($codepointInt)"/>
+		<xsl:value-of select="java:java.lang.String.new($chars)"/>
+	</xsl:template>
+
 	<xsl:template name="substring-after-last">
 		<xsl:param name="value"/>
 		<xsl:param name="delimiter"/>

data/lib/isodoc/ieee/metadata.rb

@@ -6,7 +6,7 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, i18n, fonts_options = {})
         super
-        @metadata[:issueddate] = "&lt;Date Approved&gt;"
+        @metadata[:ieee_sasb_approveddate] = "&lt;Date Approved&gt;"
         logos
       end
 
@@ -64,28 +64,30 @@ module IsoDoc
       end
 
       def society(xml)
-        society = xml.at(ns("//bibdata/ext/editorialgroup/" \
-                            "society"))&.text || "&lt;Society&gt;"
+        society = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
+        "organization/subdivision[@type='Society']/name"))&.text ||
+          "&lt;Society&gt;"
         set(:society, society)
       end
 
       def tc(xml)
-        tc = xml.at(ns("//bibdata/ext/editorialgroup/" \
-                       "committee"))&.text || "&lt;Committee Name&gt;"
+        tc = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
+          "organization/subdivision[@type='Committee']/name"))&.text ||
+          "&lt;Committee Name&gt;"
         set(:technical_committee, tc)
       end
 
       def wg(xml)
-        wg = xml.at(ns("//bibdata/ext/editorialgroup/" \
-                       "working-group")) or return nil
+        wg = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
+         "organization/subdivision[@type='Working group']/name")) or return nil
         set(:working_group, wg.text)
       end
 
       def bg(xml)
-        bg = xml.at(ns("//bibdata/ext/editorialgroup/" \
-                       "balloting-group")) or return nil
+        bg = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
+         "organization/subdivision[@type='Balloting group']/name")) or return nil
         set(:balloting_group, bg.text)
-        set(:balloting_group_type, bg["type"])
+        set(:balloting_group_type, bg.parent["subtype"])
       end
 
       def otherid(isoxml, _out)

data/lib/isodoc/ieee/presentation_ref.rb

@@ -117,10 +117,12 @@ module IsoDoc
       end
 
       def availability_note(bib)
-        note = bib.at(ns("./note[@type = 'Availability']")) or return ""
-        id = UUIDTools::UUID.random_create.to_s
-        @new_ids[id] = nil
-        "<fn id='#{id}' reference='#{id}'><p>#{note.content}</p></fn>"
+        notes = bib.xpath(ns("./note[@type = 'Availability']"))
+        notes.map do |note|
+          id = UUIDTools::UUID.random_create.to_s
+          @new_ids[id] = nil
+          "<fn id='#{id}' reference='#{id}'><p>#{note.content}</p></fn>"
+        end.join
       end
 
       def omit_docid_prefix(prefix)
@@ -130,10 +132,11 @@ module IsoDoc
 
       def bracket_if_num(num)
         num.nil? and return nil
-        num = num.text.sub(/^\[/, "").sub(/\]$/, "")
-        return "[#{num}]" if /^B?\d+$/.match?(num)
-
-        num
+        ret = num.dup
+        ret.xpath(ns(".//fn")).each(&:remove)
+        ret = ret.text.strip.sub(/^\[/, "").sub(/\]$/, "")
+        /^B?\d+$/.match?(ret) and return "[#{ret}]"
+        ret
       end
     end
   end

data/lib/isodoc/ieee/presentation_terms.rb

@@ -31,6 +31,13 @@ module IsoDoc
         end
       end
 
+      def wrap_nodeset_in_parens(xpath)
+        unless xpath.empty?
+          xpath[0].previous = " ("
+          xpath[-1].next = ")"
+        end
+      end
+
       def unwrap_definition1(d)
         %w(verbal-definition non-verbal-representation).each do |e|
           v = d.at(ns("./#{e}")) or next
@@ -41,11 +48,7 @@ module IsoDoc
             v.children =
               "#{p.map(&:children).map { |x| to_xml(x) }.join("\n")}#{s}"
           else
-            s = v.xpath(ns("./source"))
-            unless s.empty?
-              s[0].previous = " ("
-              s[-1].next = ")"
-            end
+            wrap_nodeset_in_parens(v.xpath(ns("./source")))
           end
           v.replace(v.children)
         end
@@ -77,6 +80,7 @@ module IsoDoc
           def: term.at(ns("./fmt-definition")),
           rels: term.at(ns("./fmt-related"))&.remove,
           source: term.at(ns("./fmt-termsource"))&.remove,
+          fns: term.xpath(ns("./fn")).map(&:remove),
         )
         term.at(ns("./fmt-admitted"))&.remove
         ins = term.at(ns("./fmt-definition")) and
@@ -96,8 +100,7 @@ module IsoDoc
       def collapse_term_related1(rels)
         rels.xpath(ns("./p")).each do |p|
           orig = p.at(ns(".//semx[@element = 'related']"))
-          reln = "<em>#{@i18n.relatedterms[orig['type']]}:</em> "
-          p.add_first_child reln
+          p.add_first_child "<em>#{@i18n.relatedterms[orig['type']]}:</em> "
           p.xpath(ns(".//semx[@element = 'related']")).each do |r|
             r.at(ns("./fmt-preferred")) or
               r.add_first_child "**RELATED TERM NOT FOUND**"
@@ -107,9 +110,8 @@ module IsoDoc
 
       def collapse_term_template(opt)
         defn, multiblock = collapse_unwrap_definition(opt[:def])
-        opt[:source] and src = "(#{to_xml(opt[:source].remove.children).strip})"
         t = collapse_term_pref(opt)
-        tail = "#{collapse_term_related(opt[:rels])} #{src}"
+        tail = collapse_term_template_tail(opt)
         if multiblock
           tail = tail.strip.empty? ? "" : "<p>#{tail}</p>"
           "<p>#{t}:</p> #{defn}#{tail}"
@@ -117,14 +119,16 @@ module IsoDoc
         end
       end
 
+      def collapse_term_template_tail(opt)
+        opt[:source] and src = "(#{to_xml(opt[:source].children).strip})"
+        opt[:fns].empty? or fn = opt[:fns].map(&:to_xml).join
+        "#{collapse_term_related(opt[:rels])} #{src}#{fn}"
+      end
+
       def collapse_term_pref(opt)
         p = opt[:pref]
         p.text.strip.empty? and return "**TERM NOT FOUND**"
-        s = p.xpath(ns(".//semx[@element = 'source']"))
-        unless s.empty?
-          s[0].previous = " ("
-          s[-1].next = ")"
-        end
+        wrap_nodeset_in_parens(p.xpath(ns(".//semx[@element = 'source']")))
         p.xpath(ns(".//fmt-termsource")).each { |x| x.replace(x.children) }
         to_xml(p.children).strip
       end

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -228,6 +228,16 @@ module IsoDoc
         n.children.wrap("<em></em>")
       end
 
+      # before processing, move license termnotes to fn at end of term,
+      # so they aren't numbered as termnotes
+      def conversions(docxml)
+        docxml.xpath(ns("//termnote[@type='license']")).each do |n|
+          n.name = "fn"
+          n.parent << n
+        end
+        super
+      end
+
       include Init
     end
   end

data/lib/isodoc/ieee/word_authority.rb

@@ -114,7 +114,7 @@ module IsoDoc
           "<div class='WordSection'>#{para}#{d}</div>"
         end.join(SECTIONBREAK)
         div.document.at("//div[@class = 'WordSectionIntro']")
-          .previous_element.previous = SECTIONBREAK + out
+          .previous_element.previous = SECTIONBREAK + out + SECTIONBREAK
       end
 
       def feedback_table(docxml)

data/lib/isodoc/ieee/word_convert.rb

@@ -203,16 +203,16 @@ module IsoDoc
         end
       end
 
-      # "Figure 1—" remove each of these: strip elements in caption associated
+      # "Figure 1" remove each of these: strip elements in caption associated
       # with autonumbering -- # but not in footnotes. The autonumber captions
-      # are provided by Word styles instead
+      # are provided by Word styles instead.
+      # Retain the em-dash delimiting caption
       def strip_caption_semx(name)
         name.xpath(".//xmlns:semx[@element = 'autonum']/"\
                    "preceding-sibling::*[normalize-space() = '']").each do |s|
                      s.ancestors("fn").empty? and s.remove
                    end
         name.xpath(ns(".//span[@class = 'fmt-element-name']  | "\
-                      ".//span[@class = 'fmt-caption-delim'] | "\
                       ".//semx[@element = 'autonum']")).each do |s|
                         s.ancestors("fn").empty? and s.remove
                       end