metanorma-itu 2.5.6 → 2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bcca39daa471be9099854e87a81ecce4c146a479cb380becb63719869d43bc8
-  data.tar.gz: 612f4eb3446450c32b54ea1393446183dfacf5fdb9313ca39742e89bbb729840
+  metadata.gz: 8909beb4719bf31b9c0b76ddb06988f67e91dd0a5e7c49ca14017f9de203c9c9
+  data.tar.gz: 70a5bbf71297beb02ae879a0fadf2abef6969c0c612132c9840fbdbac2b4158f
 SHA512:
-  metadata.gz: 841a1368e8ca1a9a71b3cb8c6993491251896581b8e11282d0456b9a433153a4467030d4bcb9ea3f370c04ea41967949897bb554c9e2203f5a587b13446951b8
-  data.tar.gz: d451dd6a95d4e53f862f9005ee61c05280e4b9f433809beedfb9091cd0ca9291bda146187d33e33c84fdae1d43eb6c201d60117392a88a6df59fd7de135e95a6
+  metadata.gz: 515dae7b7a649197009f7d37d1c8eeb1f1c13022fdd021a4e5eac5ec3e2bca4dee9adb4502bcc942998783473e86cba96e5d4ac997d93aed0ecbe9037ae846f3
+  data.tar.gz: d1fa2804a6a16b6f55e3ea7affcd57d1f0dc728b0c45ee2a3dd74c8817881240b9f27d612157749c96f02f321218aea018ced98b907cac13044a2bd6e0cae993

data/lib/isodoc/itu/base_convert.rb

@@ -37,13 +37,8 @@ module IsoDoc
         ""
       end
 
-      def note_delim
-        " – "
-      end
-
       def para_class(node)
-        return "supertitle" if node["class"] == "supertitle"
-
+        node["class"] == "supertitle" and return "supertitle"
         super
       end
 
@@ -59,21 +54,11 @@ module IsoDoc
         ol_style(type)
       end
 
-      def annex_name(annex, name, div)
+      def annex_name(_annex, name, div)
         r_a = @meta.get[:doctype_original] == "recommendation-annex"
         div.h1 class: r_a ? "RecommendationAnnex" : "Annex" do |t|
           name&.children&.each { |c2| parse(c2, t) }
         end
-        @meta.get[:doctype_original] == "resolution" or
-          annex_obligation_subtitle(annex, div)
-      end
-
-      def annex_obligation_subtitle(annex, div)
-        info = annex["obligation"] == "informative"
-        div.p class: "annex_obligation" do |p|
-          p << (info ? @i18n.inform_annex : @i18n.norm_annex)
-            .sub("%", @meta.get[:doctype] || "")
-        end
       end
 
       def annex(node, out)
@@ -102,7 +87,6 @@ module IsoDoc
         div.p do |p|
           name and p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
-            s << note_delim
           end
           node.first_element_child.children.each { |n| parse(n, p) }
         end
@@ -119,10 +103,6 @@ module IsoDoc
         node.children.each { |n| parse(n, div) }
       end
 
-      def table_footnote_reference_format(node)
-        node.content += ")"
-      end
-
       def note_parse(node, out)
         node["type"] == "title-footnote" and return
         super

data/lib/isodoc/itu/cleanup.rb

@@ -25,7 +25,7 @@ module IsoDoc
       def term_cleanup1(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          d.children.first.previous = "<b>#{h2.children.to_xml}</b>&#xa0;"
+          d.add_first_child "<b>#{h2.children.to_xml}</b>&#xa0;"
           d["id"] = h2["id"]
           h2.remove
         end

data/lib/isodoc/itu/itu.implementers-guide.xsl

@@ -1938,6 +1938,7 @@
 		</xsl:choose>
 		<fo:block>
 			<xsl:call-template name="setId"/>
+			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -2073,19 +2074,25 @@
 			</fo:block>
 			<xsl:if test="$doctype != 'resolution'">
 				<fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
-					<xsl:choose>
+					<!-- <xsl:choose>
 						<xsl:when test="parent::*[@obligation = 'informative']">
 							<xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
 						</xsl:when>
 						<xsl:otherwise>
 							<xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
 						</xsl:otherwise>
-					</xsl:choose>
+					</xsl:choose> -->
+					<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
+					<xsl:apply-templates select="following-sibling::itu:p[not(preceding-sibling::itu:clause)][starts-with(normalize-space(), '(')]/node()"/>
 				</fo:block>
 			</xsl:if>
 		</fo:block>
 	</xsl:template>
 
+	<!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
+	<!-- renders in the annex/title template -->
+	<xsl:template match="itu:annex/itu:p[preceding-sibling::*[1][self::itu:title or self::itu:variant-title]][starts-with(normalize-space(), '(')]" priority="3"/>
+
 	<!-- Bibliography -->
 	<xsl:template match="itu:references[not(@normative='true')]/itu:title">
 		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-bottom="18pt" role="H1">
@@ -2225,32 +2232,50 @@
 				<xsl:call-template name="setStyle_preferred"/>
 				<xsl:apply-templates/>
 			</fo:inline>
-			<xsl:if test="../itu:termsource/itu:origin">
-				<xsl:text>: </xsl:text>
+			<xsl:if test="../itu:termsource">
+				<!-- https://github.com/metanorma/isodoc/issues/614 -->
+				<!-- <xsl:text>: </xsl:text> -->
+				<xsl:text> </xsl:text>
 				<xsl:variable name="citeas" select="../itu:termsource/itu:origin/@citeas"/>
 				<xsl:variable name="bibitemid" select="../itu:termsource/itu:origin/@bibitemid"/>
 				<xsl:variable name="origin_text" select="normalize-space(../itu:termsource/itu:origin/text())"/>
 
-				<xsl:call-template name="insert_basic_link">
-					<xsl:with-param name="element">
-						<fo:basic-link internal-destination="{$bibitemid}" fox:alt-text="{$citeas}">
-							<xsl:choose>
-								<xsl:when test="$origin_text != ''">
-									<xsl:text> </xsl:text><xsl:apply-templates select="../itu:termsource/itu:origin/node()"/>
-								</xsl:when>
-								<xsl:when test="contains($citeas, '[')">
-									<xsl:text> </xsl:text><xsl:value-of select="$citeas"/> <!--  disable-output-escaping="yes" -->
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text> [</xsl:text><xsl:value-of select="$citeas"/><xsl:text>]</xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>
-						</fo:basic-link>
-					</xsl:with-param>
-				</xsl:call-template>
+				<xsl:choose>
+					<xsl:when test="$origin_text != '' or $citeas != ''">
+						<xsl:call-template name="insert_basic_link">
+							<xsl:with-param name="element">
+								<fo:basic-link internal-destination="{$bibitemid}" fox:alt-text="{$citeas}">
+									<xsl:choose>
+										<xsl:when test="$origin_text != ''">
+											<xsl:text> </xsl:text><xsl:apply-templates select="../itu:termsource/itu:origin/node()"/>
+										</xsl:when>
+										<!-- https://github.com/metanorma/isodoc/issues/614 -->
+										<!-- <xsl:when test="contains($citeas, '[')">
+											<xsl:text> </xsl:text><xsl:value-of select="$citeas"/>disable-output-escaping="yes"
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:text> [</xsl:text><xsl:value-of select="$citeas"/><xsl:text>]</xsl:text>
+										</xsl:otherwise> -->
+										<xsl:otherwise>
+											<xsl:text> </xsl:text><xsl:value-of select="$citeas"/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</fo:basic-link>
+							</xsl:with-param>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="../itu:termsource">
+							<xsl:with-param name="process">true</xsl:with-param>
+						</xsl:apply-templates>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:if>
 			<xsl:if test="following-sibling::itu:definition/node()">
-				<xsl:text>: </xsl:text>
+				<xsl:if test="../itu:termsource">
+					<xsl:text>:</xsl:text>
+				</xsl:if>
+				<xsl:text> </xsl:text>
 				<!-- <xsl:apply-templates select="following-sibling::itu:definition/node()" mode="process"/>			 -->
 				<xsl:apply-templates select="following-sibling::itu:definition">
 					<xsl:with-param name="process">true</xsl:with-param>
@@ -2262,7 +2287,12 @@
 		</xsl:if> -->
 	</xsl:template> <!-- preferred -->
 
-	<xsl:template match="itu:term[itu:preferred]/itu:termsource" priority="2"/>
+	<xsl:template match="itu:term[itu:preferred]/itu:termsource" priority="2">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<xsl:apply-templates/>
+		</xsl:if>
+	</xsl:template>
 
 	<xsl:template match="itu:term[itu:preferred]/itu:definition" priority="2">
 		<xsl:param name="process">false</xsl:param>
@@ -6296,7 +6326,10 @@
 
 								<xsl:value-of select="@reference"/>
 
+								<!-- commented https://github.com/metanorma/isodoc/issues/614 -->
+								<!-- <xsl:if test="$namespace = 'itu'">
 									<xsl:text>)</xsl:text>
+								</xsl:if> -->
 
 							</fo:inline>
 							<fo:inline xsl:use-attribute-sets="table-fn-body-style">
@@ -6307,7 +6340,7 @@
 
 			</xsl:if>
 		</xsl:for-each>
-	</xsl:template>
+	</xsl:template> <!-- table_fn_display -->
 
 	<xsl:template name="create_fn">
 		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -6339,8 +6372,10 @@
 	<!-- EMD table's footnotes rendering -->
 	<!-- ============================ -->
 
+	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
-	<xsl:template name="fn_display_figure">
+	<!-- ============================ -->
+	<xsl:template name="fn_display_figure"> <!-- figure_fn_display -->
 
 		<!-- current figure id -->
 		<xsl:variable name="figure_id_">
@@ -6453,9 +6488,28 @@
 
 			</fo:block>
 		</xsl:if>
-
 	</xsl:template> <!-- fn_display_figure -->
 
+	<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+	<!-- figure's footnote label -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'dl'][@key = 'true']/*[local-name() = 'dt']/     *[local-name() = 'p'][count(node()[normalize-space() != '']) = 1]/*[local-name() = 'sup']" priority="3">
+		<xsl:variable name="key_iso">
+
+		</xsl:variable>
+		<xsl:if test="normalize-space($key_iso) = 'true'">
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+
+		</xsl:if>
+		<fo:inline xsl:use-attribute-sets="figure-fn-number-style"> <!-- id="{@id}"  -->
+			<!-- <xsl:value-of select="@reference"/> -->
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
+	<!-- ============================ -->
+	<!-- END: figure's footnotes rendering -->
+	<!-- ============================ -->
+
 	<!-- fn reference in the text rendering (for instance, 'some text 1) some text' ) -->
 	<xsl:template match="*[local-name()='fn']">
 		<fo:inline xsl:use-attribute-sets="fn-reference-style">
@@ -6471,6 +6525,10 @@
 
 				<xsl:value-of select="@reference"/>
 
+				<!-- commented, https://github.com/metanorma/isodoc/issues/614 -->
+				<!-- <xsl:if test="$namespace = 'jis'">
+					<fo:inline font-weight="normal">)</fo:inline>
+				</xsl:if> -->
 			</fo:basic-link>
 		</fo:inline>
 	</xsl:template>
@@ -6631,17 +6689,22 @@
 						</fo:block>
 					</xsl:when>  <!-- END: a few components -->
 					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
-						<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
+						<!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
+						<xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
 
-							<xsl:call-template name="refine_figure_key_style"/>
+									<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
 
-							<xsl:variable name="title-key">
-								<xsl:call-template name="getLocalizedString">
-									<xsl:with-param name="key">key</xsl:with-param>
-								</xsl:call-template>
-							</xsl:variable>
-							<xsl:value-of select="$title-key"/>
-						</fo:block>
+										<xsl:call-template name="refine_figure_key_style"/>
+
+										<xsl:variable name="title-key">
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">key</xsl:with-param>
+											</xsl:call-template>
+										</xsl:variable>
+										<xsl:value-of select="$title-key"/>
+									</fo:block>
+
+						</xsl:if>
 					</xsl:when>  <!-- END: definition list in a figure -->
 				</xsl:choose>
 
@@ -6827,6 +6890,14 @@
 
 	</xsl:template> <!-- END: dl -->
 
+	<!-- caption for figure key and another caption, https://github.com/metanorma/isodoc/issues/607 -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'p'][@keep-with-next = 'true' and *[local-name() = 'strong']]" priority="3">
+		<fo:block text-align="left" margin-bottom="12pt" keep-with-next="always">
+			<xsl:call-template name="refine_figure_key_style"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template name="refine_dl_formula_where_style">
 
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -8869,6 +8940,39 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="@*|node()" mode="mathml_linebreak">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="mathml_linebreak"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- split math into two math -->
+	<xsl:template match="mathml:mo[@linebreak] | mathml:mspace[@linebreak]" mode="mathml_linebreak">
+		<xsl:variable name="math_elements_tree_">
+			<xsl:for-each select="ancestor::*[ancestor-or-self::mathml:math]">
+				<element pos="{position()}">
+					<xsl:copy-of select="@*[local-name() != 'id']"/>
+					<xsl:value-of select="name()"/>
+				</element>
+			</xsl:for-each>
+		</xsl:variable>
+
+		<xsl:variable name="math_elements_tree" select="xalan:nodeset($math_elements_tree_)"/>
+
+		<xsl:call-template name="insertClosingElements">
+			<xsl:with-param name="tree" select="$math_elements_tree"/>
+		</xsl:call-template>
+
+		<xsl:element name="br" namespace="{$namespace_full}"/>
+
+		<xsl:call-template name="insertOpeningElements">
+			<xsl:with-param name="tree" select="$math_elements_tree"/>
+			<xsl:with-param name="xmlns">http://www.w3.org/1998/Math/MathML</xsl:with-param>
+			<xsl:with-param name="add_continue">false</xsl:with-param>
+		</xsl:call-template>
+
+	</xsl:template>
+
 	<!-- Examples: 
 		<stem type="AsciiMath">x = 1</stem> 
 		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -9120,9 +9224,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template -->
+		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<xsl:if test="normalize-space() != ''">
-			<xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
-		</xsl:if>
+			<xsl:text>(</xsl:text><xsl:apply-templates /><xsl:text>)</xsl:text>
+		</xsl:if> -->
+		<xsl:apply-templates/>
 	</xsl:template>
 
 	<!-- stem inside formula with name (with formula's number) -->
@@ -9282,8 +9388,17 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text> – </xsl:text>
+					<!-- https://github.com/metanorma/isodoc/issues/607 -->
+					<!-- <xsl:if test="$namespace = 'ieee'">
+						<xsl:text>—</xsl:text> em dash &#x2014;
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece'  or $namespace = 'rsd'">
+						<xsl:text>:</xsl:text>
+					</xsl:if> -->
 
+					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp'">				
+						<xsl:text> – </xsl:text> en dash &#x2013;
+					</xsl:if> -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -9302,8 +9417,16 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:text> – </xsl:text>
-
+					<!-- https://github.com/metanorma/isodoc/issues/607 -->
+					<!-- <xsl:if test="$namespace = 'ieee'">
+						<xsl:text>—</xsl:text> em dash &#x2014;
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'iso' or $namespace = 'iec' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' or $namespace = 'rsd' or $namespace = 'jcgm'">
+						<xsl:text>:</xsl:text>
+					</xsl:if> -->
+					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp' or $namespace = 'unece-rec' or $namespace = 'unece'">				
+						<xsl:text> – </xsl:text> en dash &#x2013;
+					</xsl:if> -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -11471,7 +11594,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:inline xsl:use-attribute-sets="termexample-name-style">
 				<xsl:call-template name="refine_termexample-name-style"/>
-				<xsl:apply-templates/>
+				<xsl:apply-templates/> <!-- commented $namespace = 'ieee', https://github.com/metanorma/isodoc/issues/614-->
 			</fo:inline>
 		</xsl:if>
 	</xsl:template>
@@ -11633,7 +11756,7 @@
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-name-style">
 					<xsl:call-template name="refine_example-name-style"/>
-					<xsl:apply-templates/>
+					<xsl:apply-templates/> <!-- $namespace = 'ieee', see https://github.com/metanorma/isodoc/issues/614  -->
 				</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -11815,15 +11938,17 @@
 
 					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 						<fo:block role="BlockQuote">
-							<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
+							<xsl:apply-templates select="./node()[not(local-name() = 'author') and         not(local-name() = 'source') and         not(local-name() = 'attribution')]"/> <!-- process all nested nodes, except author and source -->
 						</fo:block>
 					</fo:block-container>
 				</fo:block-container>
-				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
+				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source'] or *[local-name() = 'attribution']">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
 						<!-- — ISO, ISO 7301:2011, Clause 1 -->
 						<xsl:apply-templates select="*[local-name() = 'author']"/>
 						<xsl:apply-templates select="*[local-name() = 'source']"/>
+						<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+						<xsl:apply-templates select="*[local-name() = 'attribution']/*[local-name() = 'p']/node()"/>
 					</fo:block>
 				</xsl:if>
 
@@ -11845,9 +11970,13 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'author']">
-		<xsl:text>— </xsl:text>
+		<xsl:if test="local-name(..) = 'quote'"> <!-- for old Presentation XML, https://github.com/metanorma/isodoc/issues/607 -->
+			<xsl:text>— </xsl:text>
+		</xsl:if>
 		<xsl:apply-templates/>
 	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'quote']//*[local-name() = 'referenceFrom']"/>
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -12028,8 +12157,12 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'domain']">
+		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
-		<xsl:text> </xsl:text>
+		<xsl:text> </xsl:text> -->
+		<xsl:if test="not(@hidden = 'true')">
+			<xsl:apply-templates/>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'admitted']">
@@ -12077,6 +12210,29 @@
 	<!-- END definition -->
 	<!-- ========== -->
 
+	<xsl:variable name="reviews_">
+		<xsl:for-each select="//*[local-name() = 'review'][@from]">
+			<xsl:copy>
+				<xsl:copy-of select="@from"/>
+				<xsl:copy-of select="@id"/>
+			</xsl:copy>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
+
+	<xsl:template name="addReviewHelper">
+		<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
+		<xsl:variable name="curr_id" select="@id"/>
+		<xsl:variable name="review_id" select="normalize-space($reviews//*[local-name() = 'review'][@from = $curr_id]/@id)"/>
+		<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
+			<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+		</xsl:if>
+		<!-- <fo:block>
+			<curr_id><xsl:value-of select="$curr_id"/></curr_id>
+			<xsl:copy-of select="$reviews"/>
+		</fo:block> -->
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
 
@@ -12085,6 +12241,8 @@
 
 			<xsl:call-template name="sections_element_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 
@@ -12127,6 +12285,7 @@
 
 		<fo:block>
 			<xsl:call-template name="setId"/>
+			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -12163,6 +12322,8 @@
 
 			<xsl:call-template name="refine_clause_style"/>
 
+			<xsl:call-template name="addReviewHelper"/>
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -12219,6 +12380,23 @@
 
 		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
 
+		<xsl:if test="1 = 1">
+		<xsl:choose>
+			<!-- if there isn't the attribute '@from', then -->
+			<xsl:when test="$id_from = ''">
+				<fo:block id="{@id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
+			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+		</xsl:choose>
+		</xsl:if>
+
+    <xsl:if test="1 = 2">
 		<xsl:choose>
 			<!-- if there isn't the attribute '@from', then -->
 			<xsl:when test="$id_from = ''">
@@ -12232,6 +12410,7 @@
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
+    </xsl:if>
 
 	</xsl:template>
 
@@ -13621,7 +13800,7 @@
 	<!-- remove preprocess-xslt -->
 	<xsl:template match="*[local-name() = 'preprocess-xslt']" mode="update_xml_step1"/>
 
-	<xsl:template match="*[local-name() = 'stem'] |        *[local-name() = 'image'] |        *[local-name() = 'sourcecode'] |        *[local-name() = 'bibdata'] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
+	<xsl:template match="*[local-name() = 'stem'][not(.//*[local-name() = 'passthrough']) and not(.//*[@linebreak])] |        *[local-name() = 'image'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'sourcecode'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'bibdata'][not(.//*[local-name() = 'passthrough'])] |        *[local-name() = 'localized-strings']" mode="update_xml_step1">
 		<xsl:copy-of select="."/>
 	</xsl:template>
 
@@ -13687,6 +13866,22 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:variable name="regex_passthrough">.*\bpdf\b.*</xsl:variable>
+	<xsl:template match="*[local-name() = 'passthrough']" mode="update_xml_step1">
+		<!-- <xsl:if test="contains(@formats, ' pdf ')"> -->
+		<xsl:if test="normalize-space(java:matches(java:java.lang.String.new(@formats), $regex_passthrough)) = 'true'">
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:if>
+	</xsl:template>
+
+	<!-- split math by element with @linebreak into maths -->
+	<xsl:template match="mathml:math[.//mathml:mo[@linebreak] or .//mathml:mspace[@linebreak]]" mode="update_xml_step1">
+		<xsl:variable name="maths">
+			<xsl:apply-templates select="." mode="mathml_linebreak"/>
+		</xsl:variable>
+		<xsl:copy-of select="$maths"/>
+	</xsl:template>
+
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->
@@ -13790,6 +13985,8 @@
 
 	<xsl:template name="insertOpeningElements">
 		<xsl:param name="tree"/>
+		<xsl:param name="xmlns"/>
+		<xsl:param name="add_continue">true</xsl:param>
 		<xsl:for-each select="$tree//element">
 			<xsl:text disable-output-escaping="yes">&lt;</xsl:text>
 				<xsl:value-of select="."/>
@@ -13800,7 +13997,8 @@
 					<xsl:value-of select="."/>
 					<xsl:text>"</xsl:text>
 				</xsl:for-each>
-				<xsl:if test="position() = 1"> continue="true"</xsl:if>
+				<xsl:if test="position() = 1 and $add_continue = 'true'"> continue="true"</xsl:if>
+				<xsl:if test="position() = 1 and $xmlns != ''"> xmlns="<xsl:value-of select="$xmlns"/>"</xsl:if>
 			<xsl:text disable-output-escaping="yes">&gt;</xsl:text>
 			<xsl:if test="$debug = 'true'">
 				<xsl:message>&lt;<xsl:value-of select="."/>&gt;</xsl:message>