metanorma-iso 3.0.6 → 3.0.8

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -153,6 +153,8 @@
 
 	<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new($doctype_localized))"/>
 
+	<xsl:variable name="doctype_customized" select="normalize-space(/iso:metanorma/iso:metanorma-extension/iso:presentation-metadata/iso:doctype-customized)"/>
+
 	<xsl:variable name="stage" select="number(/iso:metanorma/iso:bibdata/iso:status/iso:stage)"/>
 	<xsl:variable name="substage" select="number(/iso:metanorma/iso:bibdata/iso:status/iso:substage)"/>
 	<xsl:variable name="stagename" select="normalize-space(/iso:metanorma/iso:bibdata/iso:ext/iso:stagename)"/>
@@ -413,6 +415,13 @@
 	<xsl:variable name="layoutVersion" select="normalize-space($layoutVersion_)"/>
 	<xsl:variable name="cover_page_border">0.5pt solid black</xsl:variable>
 	<xsl:variable name="color_red">rgb(237, 28, 36)</xsl:variable>
+	<xsl:variable name="color_secondary_value" select="normalize-space(/iso:metanorma/iso:metanorma-extension/iso:presentation-metadata/iso:color-secondary)"/>
+	<xsl:variable name="color_secondary">
+		<xsl:choose>
+			<xsl:when test="$color_secondary_value != ''"><xsl:value-of select="$color_secondary_value"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="$color_red"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
 
 	<xsl:variable name="XML" select="/"/>
 
@@ -1585,6 +1594,7 @@
 
 										<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
 										<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/>
+										<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-complementary']"/>
 										<fo:block font-size="11pt" text-transform="uppercase" margin-top="2mm">
 											<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
 										</fo:block>
@@ -1744,7 +1754,7 @@
 
 							<fo:block margin-top="6mm" font-weight="bold">
 								<xsl:call-template name="printEdition"/>
-								<xsl:text> — </xsl:text>
+								<xsl:value-of select="$nonbreak_space_em_dash_space"/>
 								<xsl:value-of select="/iso:metanorma/iso:bibdata/iso:version/iso:revision-date"/>
 							</fo:block>
 
@@ -1874,6 +1884,7 @@
 													</xsl:variable>
 
 													<xsl:choose>
+														<xsl:when test="$doctype_customized != ''"><xsl:value-of select="$doctype_customized"/></xsl:when>
 														<xsl:when test="$stage-abbreviation = 'DIS'"> <!--  or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' -->
 															<xsl:choose>
 																<xsl:when test="normalize-space($stagename_localized_coverpage) != ''">
@@ -1930,7 +1941,7 @@
 										<fo:table-cell number-columns-spanned="2" display-align="after" padding-left="6mm">
 											<fo:block font-size="19pt" font-weight="bold" line-height="1">
 												<xsl:if test="$stage &gt;=60 and $substage != 0">
-													<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
+													<xsl:attribute name="color"><xsl:value-of select="$color_secondary"/></xsl:attribute>
 												</xsl:if>
 												<xsl:choose>
 													<xsl:when test="contains($docidentifierISO, ' ')">
@@ -3009,6 +3020,7 @@
 	<xsl:template name="insertTitlesLangMain">
 		<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
 		<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/>
+		<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-complementary']"/>
 		<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']">
 			<xsl:with-param name="isMainLang">true</xsl:with-param>
 		</xsl:apply-templates>
@@ -3021,6 +3033,7 @@
 		<xsl:param name="lang_other"/>
 		<xsl:apply-templates select="$XML/iso:metanorma/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-intro']"/>
 		<xsl:apply-templates select="$XML/iso:metanorma/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-main']"/>
+		<xsl:apply-templates select="$XML/iso:metanorma/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-complementary']"/>
 		<xsl:apply-templates select="$XML/iso:metanorma/iso:bibdata/iso:title[@language = $lang_other and @type = 'title-part']">
 			<xsl:with-param name="curr_lang" select="$lang_other"/>
 		</xsl:apply-templates>
@@ -3463,10 +3476,10 @@
 		<xsl:choose>
 			<xsl:when test="$layoutVersion = '1951'">
 				<fo:block text-transform="uppercase"><xsl:apply-templates/></fo:block>
-				</xsl:when>
+			</xsl:when>
 			<xsl:otherwise>
 				<xsl:apply-templates/>
-				<xsl:text> — </xsl:text>
+				<xsl:value-of select="$nonbreak_space_em_dash_space"/>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
@@ -3494,64 +3507,78 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template match="iso:bibdata/iso:title[@type = 'title-complementary']">
+		<xsl:param name="body">false</xsl:param>
+		<xsl:value-of select="$nonbreak_space_em_dash_space"/>
+		<xsl:apply-templates/>
+	</xsl:template>
+
 	<xsl:template match="iso:bibdata/iso:title[@type = 'title-part']">
 		<xsl:param name="curr_lang" select="$lang"/>
 		<xsl:param name="isMainLang">false</xsl:param>
-		<xsl:if test="$part != ''">
-			<!-- <xsl:text> — </xsl:text> -->
-			<xsl:choose>
-				<xsl:when test="$layoutVersion = '1951'"/>
-				<xsl:otherwise><xsl:text> — </xsl:text></xsl:otherwise>
-			</xsl:choose>
-			<xsl:variable name="part-word">
+		<xsl:choose>
+			<xsl:when test="$part != ''">
+				<!-- <xsl:text> — </xsl:text> -->
 				<xsl:choose>
-					<xsl:when test="$isMainLang = 'true'">
-						<xsl:value-of select="concat($i18n_locality_part, ' ', $part, ':')"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
-					</xsl:otherwise>
+					<xsl:when test="$layoutVersion = '1951'"/>
+					<xsl:otherwise><xsl:value-of select="$nonbreak_space_em_dash_space"/></xsl:otherwise>
 				</xsl:choose>
-			</xsl:variable>
-			<xsl:choose>
-				<xsl:when test="$isMainLang = 'true'">
+				<xsl:variable name="part-word">
 					<xsl:choose>
-						<xsl:when test="$layoutVersion = '1951'">
-							<xsl:value-of select="$part-word"/>
-							<xsl:apply-templates/>
+						<xsl:when test="$isMainLang = 'true'">
+							<xsl:value-of select="concat($i18n_locality_part, ' ', $part, ':')"/>
 						</xsl:when>
-						<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'">
-							<fo:block font-weight="bold" role="SKIP">
+						<xsl:otherwise>
+							<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:choose>
+					<xsl:when test="$isMainLang = 'true'">
+						<xsl:choose>
+							<xsl:when test="$layoutVersion = '1951'">
 								<xsl:value-of select="$part-word"/>
-								<xsl:text> </xsl:text>
 								<xsl:apply-templates/>
-							</fo:block>
-						</xsl:when>
-						<xsl:when test="$layoutVersion = '1987'">
-							<fo:block font-weight="bold" margin-top="12pt" role="SKIP">
+							</xsl:when>
+							<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'">
+								<fo:block font-weight="bold" role="SKIP">
+									<xsl:value-of select="$part-word"/>
+									<xsl:text> </xsl:text>
+									<xsl:apply-templates/>
+								</fo:block>
+							</xsl:when>
+							<xsl:when test="$layoutVersion = '1987'">
+								<fo:block font-weight="bold" margin-top="12pt" role="SKIP">
+									<xsl:value-of select="$part-word"/>
+								</fo:block>
+							</xsl:when>
+							<xsl:otherwise>
+							<fo:block font-weight="normal" margin-top="6pt" role="SKIP">
 								<xsl:value-of select="$part-word"/>
 							</fo:block>
-						</xsl:when>
-						<xsl:otherwise>
-						<fo:block font-weight="normal" margin-top="6pt" role="SKIP">
-							<xsl:value-of select="$part-word"/>
-						</fo:block>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- <xsl:value-of select="$linebreak"/> -->
-					<xsl:choose>
-						<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'"/>
-						<xsl:otherwise>
-							<fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
-						</xsl:otherwise>
-					</xsl:choose>
-					<xsl:value-of select="$part-word"/>
-					<xsl:text> </xsl:text>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:if>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
+					<xsl:otherwise>
+						<!-- <xsl:value-of select="$linebreak"/> -->
+						<xsl:choose>
+							<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979'"/>
+							<xsl:otherwise>
+								<fo:block font-size="1pt" margin-top="5pt" role="SKIP"> </fo:block>
+							</xsl:otherwise>
+						</xsl:choose>
+						<xsl:value-of select="$part-word"/>
+						<xsl:text> </xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise> <!-- $part = '' -->
+				<xsl:choose>
+					<xsl:when test="$layoutVersion = '1951'"/>
+					<xsl:otherwise><xsl:value-of select="$nonbreak_space_em_dash_space"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
 		<xsl:choose>
 			<xsl:when test="$layoutVersion = '1951'"><fo:inline font-weight="normal"><xsl:apply-templates/></fo:inline></xsl:when>
 			<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1979') and $isMainLang = 'true'"/>
@@ -3617,6 +3644,7 @@
 						<xsl:when test="$revision_date_num &gt;= 19680101">
 							<fo:block font-weight="normal"><xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/></fo:block>
 							<fo:block space-before="24pt"><xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/></fo:block>
+							<fo:block space-before="24pt"><xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-complementary']"/></fo:block>
 						</xsl:when>
 						<xsl:otherwise>
 
@@ -3624,6 +3652,7 @@
 							<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']">
 								<xsl:with-param name="body">true</xsl:with-param>
 							</xsl:apply-templates>
+							<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-complementary']"/>
 							<fo:block font-size="11pt" text-transform="uppercase" margin-top="2mm">
 								<xsl:apply-templates select="/iso:metanorma/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
 							</fo:block>
@@ -3915,9 +3944,9 @@
 				<fo:block>
 					<xsl:if test="following-sibling::iso:p">
 						<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
-						<xsl:attribute name="margin-left">0.5mm</xsl:attribute>
-						<xsl:attribute name="margin-right">0.5mm</xsl:attribute>
 					</xsl:if>
+					<xsl:attribute name="margin-left">0.5mm</xsl:attribute>
+					<xsl:attribute name="margin-right">0.5mm</xsl:attribute>
 					<xsl:if test="contains(@id, 'address') or contains(normalize-space(), 'Tel:') or contains(normalize-space(), 'Phone:')">
 						<xsl:attribute name="margin-left">4.5mm</xsl:attribute>
 					</xsl:if>
@@ -4907,6 +4936,7 @@
 									<fo:table-cell>
 										<fo:block>
 											<xsl:choose>
+												<xsl:when test="$doctype_customized != ''"><xsl:value-of select="$doctype_customized"/></xsl:when>
 												<xsl:when test="$layoutVersion = '2024'">
 													<xsl:choose>
 														<xsl:when test="$doctype = 'committee-document'"><xsl:value-of select="$doctype_localized"/></xsl:when>
@@ -5472,13 +5502,23 @@
 									<fo:block margin-top="18pt" margin-bottom="-1mm" line-height="1.1"><xsl:value-of select="$copyrightTextLastPage2024"/></fo:block>
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell number-columns-spanned="2" text-align="right" display-align="after">
-								<fo:block font-size="16pt" font-weight="bold" margin-bottom="1mm" margin-right="1.5mm">
-									<xsl:if test="$stage &gt;=60 and $substage != 0">
-										<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
-									</xsl:if>
-									<xsl:text>iso.org</xsl:text>
-								</fo:block>
+							<fo:table-cell number-columns-spanned="2" display-align="after">
+								<xsl:choose>
+									<xsl:when test="/iso:metanorma/iso:boilerplate/iso:feedback-statement">
+										<fo:block font-size="16pt" margin-bottom="1mm" margin-right="1.5mm">
+											<xsl:apply-templates select="/iso:metanorma/iso:boilerplate/iso:feedback-statement"/>
+										</fo:block>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:attribute name="text-align">right</xsl:attribute>
+										<fo:block font-size="16pt" font-weight="bold" margin-bottom="1mm" margin-right="1.5mm">
+											<xsl:if test="$stage &gt;=60 and $substage != 0">
+												<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
+											</xsl:if>
+											<xsl:text>iso.org</xsl:text>
+										</fo:block>
+									</xsl:otherwise>
+								</xsl:choose>
 							</fo:table-cell>
 						</fo:table-row>
 					</fo:table-body>
@@ -5992,6 +6032,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -14502,11 +14543,11 @@
 	</xsl:template>
 
 	<!-- figure/fn -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
 	<!-- figure/note -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
 	<!-- figure/example -->
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
+	<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
 
 	<!-- figure/note[@type = 'units'] -->
 	<!-- image/note[@type = 'units'] -->
@@ -18077,6 +18118,9 @@
 	<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
+	<!-- https://github.com/metanorma/isodoc/issues/687 -->
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
 		<xsl:copy>
@@ -18394,6 +18438,20 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-source']"/>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
+		<xsl:element name="source" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>

data/lib/isodoc/iso/metadata.rb

@@ -11,8 +11,7 @@ module IsoDoc
       end
 
       def status_abbrev(stage, _substage, iter, draft, doctype)
-        return "" unless stage
-
+        stage or return ""
         if %w(technical-report technical-specification).include?(doctype)
           stage = "DTS" if stage == "DIS"
           stage = "FDTS" if stage == "FDIS"
@@ -103,16 +102,16 @@ module IsoDoc
       end
 
       def compose_title(tparts, tnums, lang)
-        main = ""
-        tparts[:main].nil? or
-          main = tparts[:main].children.to_xml
+        t = tparts[:main].nil? ? "" :  tparts[:main].children.to_xml
         tparts[:intro] and
-          main = "#{tparts[:intro].children.to_xml} — #{main}"
+          t = "#{tparts[:intro].children.to_xml} — #{t}"
+        tparts[:complementary] and
+          t = "#{t} — #{tparts[:complementary].children.to_xml}"
         if tparts[:part]
           suffix = part_title(tparts[:part], tnums, lang)
-          main = "#{main} — #{suffix}"
+          t = "#{t} — #{suffix}"
         end
-        main
+        t
       end
 
       def title_nums(isoxml)
@@ -125,16 +124,10 @@ module IsoDoc
       end
 
       def title_parts(isoxml, lang)
-        { intro: isoxml.at(ns("//bibdata/title[@type='title-intro' and " \
-                              "@language='#{lang}']")),
-          main: isoxml.at(ns("//bibdata/title[@type='title-main' and " \
-                             "@language='#{lang}']")),
-          part: isoxml.at(ns("//bibdata/title[@type='title-part' and " \
-                             "@language='#{lang}']")),
-          amd: isoxml.at(ns("//bibdata/title[@type='title-amd' and " \
-                            "@language='#{lang}']")),
-          add: isoxml.at(ns("//bibdata/title[@type='title-add' and " \
-                            "@language='#{lang}']")) }
+        %w(intro main complementary part amd add).each_with_object({}) do |w, m|
+          m[w.to_sym] = isoxml.at(ns("//bibdata/title[@type='title-#{w}' and " \
+                              "@language='#{lang}']"))
+        end
       end
 
       def title(isoxml, _out)
@@ -142,13 +135,15 @@ module IsoDoc
                when "fr", "ru" then @lang
                else "en"
                end
-        # intro, main, part, amd = title_parts(isoxml, lang)
+        # intro, main, complementary, part, amd = title_parts(isoxml, lang)
         tp = title_parts(isoxml, lang)
         tn = title_nums(isoxml)
         set(:doctitlemain, tp[:main] ? tp[:main].children.to_xml : "")
         main = compose_title(tp, tn, lang)
         set(:doctitle, main)
         tp[:intro] and set(:doctitleintro, tp[:intro].children.to_xml)
+        tp[:complementary] and
+          set(:doctitlecomplementary, tp[:complementary].children.to_xml)
         set(:doctitlepartlabel, part_prefix(tn, lang))
         set(:doctitlepart, tp[:part].children.to_xml) if tp[:part]
         set(:doctitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]
@@ -167,6 +162,8 @@ module IsoDoc
         main = compose_title(tp, tn, lang)
         set(:docsubtitle, main)
         tp[:intro] and set(:docsubtitleintro, tp[:intro].children.to_xml)
+        tp[:complementary] and
+          set(:docsubtitlecomplementary, tp[:complementary].children.to_xml)
         set(:docsubtitlepartlabel, part_prefix(tn, lang))
         tp[:part] and set(:docsubtitlepart, tp[:part].children.to_xml)
         set(:docsubtitleamdlabel, amd_prefix(tn, lang)) if tn[:amd]

data/lib/isodoc/iso/presentation_section.rb

@@ -98,7 +98,8 @@ module IsoDoc
         @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and
           ret += " — "
         ret += @meta.get[:doctitlemain]
-        @meta.get[:doctitlemain] && @meta.get[:doctitlepart] and
+        @meta.get[:doctitlemain] &&
+          (@meta.get[:doctitlepart] || @meta.get[:doctitlecomplementary]) and
           ret += " — "
         ret += "</span>#{middle_title_part}"
         "<p class='zzSTDTitle1'>#{ret}</p>"
@@ -106,7 +107,9 @@ module IsoDoc
 
       def middle_title_part
         ret = ""
-        if a = @meta.get[:doctitlepart]
+        if a = @meta.get[:doctitlecomplementary]
+          ret += "<span class='boldtitle'>#{a}</span>"
+        elsif a = @meta.get[:doctitlepart]
           b = @meta.get[:doctitlepartlabel] and
             ret += "<span class='nonboldtitle'>#{b}:</span> "
           ret += "<span class='boldtitle'>#{a}</span>"

data/lib/isodoc/iso/presentation_terms.rb

@@ -11,7 +11,7 @@ module IsoDoc
         concept_term(docxml)
         (docxml.xpath(ns("//concept")) - docxml.xpath(ns("//term//concept")))
           .each do |node|
-          node.ancestors("definition, termsource, related").empty? and
+          node.ancestors("definition, source, related").empty? and
             concept_render(node, ital: "false", ref: "false",
                                  linkref: "true", linkmention: "false")
         end
@@ -22,7 +22,7 @@ module IsoDoc
           m = {}
           (f.xpath(ns(".//concept")) - f.xpath(ns(".//term//concept")))
             .each do |c|
-              c.ancestors("definition, termsource, related").empty? and
+              c.ancestors("definition, source, related").empty? and
                 concept_term1(c, m)
             end
         end

data/lib/isodoc/iso/word_convert.rb

@@ -236,7 +236,7 @@ module IsoDoc
 
       def table_parse_tail(node, out)
         (dl = node.at(ns("./dl"))) && parse(dl, out)
-        node.xpath(ns("./source")).each { |n| parse(n, out) }
+        node.xpath(ns("./fmt-source")).each { |n| parse(n, out) }
         node.xpath(ns("./note[not(@type = 'units')]"))
           .each { |n| parse(n, out) }
         node.xpath(ns("./fmt-footnote-container/fmt-fn-body"))

data/lib/metanorma/iso/base.rb

@@ -65,9 +65,8 @@ module Metanorma
       end
 
       def ol_attrs(node)
-        attr_code(keep_attrs(node)
-                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node),
-                         "explicit-type": olist_style(node.attributes[1]),
+        attr_code(keep_attrs(node).merge(id_attr(node))
+                  .merge("explicit-type": olist_style(node.attributes[1]),
                          start: node.attr("start")))
       end
 

data/lib/metanorma/iso/basicdoc.rng

@@ -267,6 +267,10 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <value>justified</value>
     </choice>
   </define>
+  <define name="IdRefType">
+    <a:documentation>Type of cross-references to elements. In BasicDoc, these always point to id { xsd:ID } </a:documentation>
+    <data type="IDREF"/>
+  </define>
   <define name="RequiredId">
     <a:documentation>Mandatory anchor of element, to be used for cross-references within the document</a:documentation>
     <attribute name="id">
@@ -409,13 +413,13 @@ in a document (e.g. sourcecode annotations)</a:documentation>
       <attribute name="from">
         <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
 If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="to">
         <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
     </optional>
   </define>
@@ -1504,7 +1508,7 @@ Restricted recursively to contain only other such inline elements with no identi
         <attribute name="to">
           <a:documentation>A reference to an anchor element (typically a bookmark), 
 to indicate that the index range covers a range of locations between the current index element and the `to` anchor</a:documentation>
-          <data type="IDREF"/>
+          <ref name="IdRefType"/>
         </attribute>
       </optional>
       <ref name="index-primary">
@@ -1662,7 +1666,7 @@ which can be bookmarks as well as block or section references</a:documentation>
   <define name="XrefAttributes">
     <attribute name="target">
       <a:documentation>The identifier of a section, block or inlined element being referenced</a:documentation>
-      <data type="IDREF"/>
+      <ref name="IdRefType"/>
     </attribute>
     <optional>
       <attribute name="type">
@@ -1723,7 +1727,7 @@ The target of a footnote is the location it is embedded in within the text</a:do
       <attribute name="target">
         <a:documentation>The target of the callout is understood to be the location of the callout within the source code; 
 the extent of the target is not expressed overtly</a:documentation>
-        <data type="IDREF"/>
+        <ref name="IdRefType"/>
       </attribute>
       <text>
         <a:documentation>The label of the callout, used to identify its target within the source code</a:documentation>

data/lib/metanorma/iso/cleanup.rb

@@ -69,7 +69,7 @@ module Metanorma
 
       def unpub_footnotes(xmldoc)
         xmldoc.xpath("//bibitem/note[@type = 'Unpublished-Status']").each do |n|
-          e = xmldoc.at("//eref[@bibitemid = '#{n.parent['id']}']") or next
+          e = xmldoc.at("//eref[@bibitemid = '#{n.parent['anchor']}']") or next
           fn = n.children.to_xml
           n.elements&.first&.name == "p" or fn = "<p>#{fn}</p>"
           e.next = "<fn>#{fn}</fn>"

data/lib/metanorma/iso/front.rb

@@ -71,6 +71,13 @@ module Metanorma
         @log.add("Document Attributes", nil, err)
       end
 
+      def title_component(node, xml, lang, attr, comp)
+        t = node.attr("title-#{comp[:name]}-#{lang}") or return
+        xml.title(**attr_code(attr.merge(type: "title-#{comp[:abbr]}"))) do |t1|
+          t1 << Metanorma::Utils::asciidoc_sub(t)
+        end
+      end
+
       def title_intro(node, xml, lang, at)
         t = node.attr("title-intro-#{lang}") or return
         xml.title(**attr_code(at.merge(type: "title-intro"))) do |t1|
@@ -106,30 +113,44 @@ module Metanorma
       end
 
       def title_full(node, xml, lang, at)
-        title = node.attr("title-main-#{lang}")
-        intro = node.attr("title-intro-#{lang}")
-        part = node.attr("title-part-#{lang}")
-        amd = node.attr("title-amendment-#{lang}")
-        add = node.attr("title-addendum-#{lang}")
+        title, intro, part, amd, add = title_full_prep(node, lang)
         title = "#{intro} -- #{title}" if intro
         title = "#{title} -- #{part}" if part
-        title = "#{title} -- #{amd}" if amd && @amd
-        title = "#{title} -- #{add}" if amd && node.attr("addendum-number")
+        title = "#{title} -- #{amd}" if amd
+        title = "#{title} -- #{add}" if add
         xml.title **attr_code(at.merge(type: "main")) do |t1|
           t1 << Metanorma::Utils::asciidoc_sub(title)
         end
       end
 
+      def title_full_prep(node, lang)
+        title = node.attr("title-main-#{lang}")
+        intro = node.attr("title-intro-#{lang}")
+        part = node.attr("title-part-#{lang}") ||
+          node.attr("title-complementary-#{lang}")
+        @amd and amd = node.attr("title-amendment-#{lang}")
+        node.attr("addendum-number") and
+          add = node.attr("title-addendum-#{lang}")
+        [title, intro, part, amd, add]
+      end
+
       def title(node, xml)
         %w(en ru fr).each do |lang|
           at = { language: lang, format: "text/plain" }
-          title_full(node, xml, lang, at)
-          title_intro(node, xml, lang, at)
-          title_main(node, xml, lang, at)
-          title_part(node, xml, lang, at)
-          title_amd(node, xml, lang, at) if @amd
-          title_add(node, xml, lang, at) if node.attr("addendum-number")
+          title1(node, xml, lang, at)
+        end
+      end
+
+      def title1(node, xml, lang, at)
+        title_full(node, xml, lang, at)
+        %w(intro main part complementary).each do |w|
+          title_component(node, xml, lang, at, { name: w, abbr: w })
         end
+        @amd and title_component(node, xml, lang, at,
+                                 { name: "amendment", abbr: "amd" })
+        node.attr("addendum-number") and
+          title_component(node, xml, lang, at,
+                          { name: "addendum", abbr: "add" })
       end
 
       def relaton_relations