metanorma-plateau 1.2.15 → 1.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/plateau/plateau.international-standard.xsl +115 -75
- data/lib/metanorma/plateau/basicdoc.rng +53 -30
- data/lib/metanorma/plateau/biblio-standoc.rng +18 -0
- data/lib/metanorma/plateau/isodoc.rng +238 -78
- data/lib/metanorma/plateau/isostandard.rng +1 -1
- data/lib/metanorma/plateau/reqt.rng +32 -12
- data/lib/metanorma/plateau/version.rb +1 -1
- data/metanorma-plateau.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3eed508694afbec0b9316f217079dbc1ec7ac4971933f2b9d299796873179bef
|
|
4
|
+
data.tar.gz: 671041684e9ade53f0de1ec97f866b3d0094f882448f8767b623aff1aca87ff7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 072da3f938905d5cf1ad720b509476d0e2298cfe2964af24c33d01f49d4ea3255e2c6630e99c782e7469e9cd66f0a495461a11b2f2500044d642a28e5e9d703d
|
|
7
|
+
data.tar.gz: 00d8efd70be44ff7db35cf665a82dac982f1dba0b50191288eae19393644f8dc19664721e66eb4a622409cc66afd21b68581ffd3a28d0532d0653ba6545ef0b8
|
|
@@ -704,7 +704,7 @@
|
|
|
704
704
|
<xsl:if test="$doctype = 'technical-report'">
|
|
705
705
|
<xsl:attribute name="margin-left">5.5mm</xsl:attribute>
|
|
706
706
|
</xsl:if>
|
|
707
|
-
<fo:instream-foreign-object content-width="24mm" fox:alt-text="PLATEAU Logo">
|
|
707
|
+
<fo:instream-foreign-object content-width="24mm" fox:alt-text="PLATEAU Logo" fox:placement="Block">
|
|
708
708
|
<xsl:if test="$doctype = 'technical-report'">
|
|
709
709
|
<xsl:attribute name="content-width">20.5mm</xsl:attribute>
|
|
710
710
|
</xsl:if>
|
|
@@ -1203,14 +1203,14 @@
|
|
|
1203
1203
|
</xsl:when> -->
|
|
1204
1204
|
<xsl:when test="parent::mn:ul and $list_item_label = '→'">
|
|
1205
1205
|
<fo:inline>
|
|
1206
|
-
<fo:instream-foreign-object content-width="2.5mm" fox:alt-text="ul list label">
|
|
1206
|
+
<fo:instream-foreign-object content-width="2.5mm" fox:alt-text="ul list label" fox:placement="Inline">
|
|
1207
1207
|
<xsl:copy-of select="$list_label_arrow"/>
|
|
1208
1208
|
</fo:instream-foreign-object>
|
|
1209
1209
|
</fo:inline>
|
|
1210
1210
|
</xsl:when>
|
|
1211
1211
|
<xsl:when test="parent::mn:ul and $list_item_label = '☆'">
|
|
1212
1212
|
<fo:inline>
|
|
1213
|
-
<fo:instream-foreign-object content-width="2.5mm" fox:alt-text="ul list label">
|
|
1213
|
+
<fo:instream-foreign-object content-width="2.5mm" fox:alt-text="ul list label" fox:placement="Inline">
|
|
1214
1214
|
<xsl:copy-of select="$list_label_star"/>
|
|
1215
1215
|
</fo:instream-foreign-object>
|
|
1216
1216
|
</fo:inline>
|
|
@@ -1325,7 +1325,7 @@
|
|
|
1325
1325
|
<xsl:template match="mn:preprocess-xslt" mode="update_xml_pres"/>
|
|
1326
1326
|
<xsl:template match="mn:stem" mode="update_xml_pres"/>
|
|
1327
1327
|
|
|
1328
|
-
<xsl:template match="mn:span[ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim']" mode="update_xml_pres" priority="3">
|
|
1328
|
+
<xsl:template match="mn:span[ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim' or @class = 'fmt-clause-delim']" mode="update_xml_pres" priority="3">
|
|
1329
1329
|
<xsl:apply-templates mode="update_xml_pres"/>
|
|
1330
1330
|
</xsl:template>
|
|
1331
1331
|
|
|
@@ -2990,7 +2990,7 @@
|
|
|
2990
2990
|
</xsl:element>
|
|
2991
2991
|
</xsl:template> -->
|
|
2992
2992
|
|
|
2993
|
-
<xsl:template match="mn: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">
|
|
2993
|
+
<xsl:template match="mn:span[ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim' or @class = 'fmt-clause-delim']" mode="update_xml_step1" priority="3">
|
|
2994
2994
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
2995
2995
|
</xsl:template>
|
|
2996
2996
|
|
|
@@ -4120,6 +4120,9 @@
|
|
|
4120
4120
|
|
|
4121
4121
|
<xsl:template name="refine_sourcecode-style">
|
|
4122
4122
|
<xsl:call-template name="setKeepAttributes"/>
|
|
4123
|
+
<xsl:if test="ancestor::mn:sourcecode and parent::mn:td">
|
|
4124
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
4125
|
+
</xsl:if>
|
|
4123
4126
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
4124
4127
|
|
|
4125
4128
|
<xsl:attribute-set name="sourcecode-number-style">
|
|
@@ -4446,30 +4449,30 @@
|
|
|
4446
4449
|
</xsl:template>
|
|
4447
4450
|
|
|
4448
4451
|
<!-- outer table with line numbers for sourcecode -->
|
|
4449
|
-
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table" priority="
|
|
4450
|
-
<fo:block>
|
|
4451
|
-
<fo:table width="100%" table-layout="fixed">
|
|
4452
|
+
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] | -->
|
|
4453
|
+
<fo:block role="SKIP">
|
|
4454
|
+
<fo:table width="100%" table-layout="fixed" role="SKIP">
|
|
4452
4455
|
<xsl:copy-of select="@id"/>
|
|
4453
4456
|
<fo:table-column column-width="8%"/>
|
|
4454
4457
|
<fo:table-column column-width="92%"/>
|
|
4455
|
-
<fo:table-body>
|
|
4458
|
+
<fo:table-body role="SKIP">
|
|
4456
4459
|
<xsl:apply-templates/>
|
|
4457
4460
|
</fo:table-body>
|
|
4458
4461
|
</fo:table>
|
|
4459
4462
|
</fo:block>
|
|
4460
4463
|
</xsl:template>
|
|
4461
|
-
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table/mn:tbody" priority="
|
|
4464
|
+
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table/mn:tbody" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] | -->
|
|
4462
4465
|
<xsl:apply-templates/>
|
|
4463
4466
|
</xsl:template>
|
|
4464
|
-
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr" priority="
|
|
4465
|
-
<fo:table-row>
|
|
4467
|
+
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] | -->
|
|
4468
|
+
<fo:table-row role="SKIP">
|
|
4466
4469
|
<xsl:apply-templates/>
|
|
4467
4470
|
</fo:table-row>
|
|
4468
4471
|
</xsl:template>
|
|
4469
4472
|
<!-- first td with line numbers -->
|
|
4470
|
-
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][not(preceding-sibling::*)]" priority="
|
|
4471
|
-
<fo:table-cell>
|
|
4472
|
-
<fo:block>
|
|
4473
|
+
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][not(preceding-sibling::*)]" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
|
|
4474
|
+
<fo:table-cell role="SKIP">
|
|
4475
|
+
<fo:block role="SKIP">
|
|
4473
4476
|
|
|
4474
4477
|
<!-- set attibutes for line numbers - same as sourcecode -->
|
|
4475
4478
|
<xsl:variable name="sourcecode_attributes">
|
|
@@ -4477,7 +4480,7 @@
|
|
|
4477
4480
|
<xsl:call-template name="get_sourcecode_attributes"/>
|
|
4478
4481
|
</xsl:for-each>
|
|
4479
4482
|
</xsl:variable>
|
|
4480
|
-
<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*[not(starts-with(local-name(), 'margin-') or starts-with(local-name(), 'space-'))]">
|
|
4483
|
+
<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*[not(starts-with(local-name(), 'margin-') or starts-with(local-name(), 'space-') or starts-with(local-name(), 'role'))]">
|
|
4481
4484
|
<xsl:attribute name="{name()}">
|
|
4482
4485
|
<xsl:value-of select="."/>
|
|
4483
4486
|
</xsl:attribute>
|
|
@@ -4489,8 +4492,8 @@
|
|
|
4489
4492
|
</xsl:template>
|
|
4490
4493
|
|
|
4491
4494
|
<!-- second td with sourcecode -->
|
|
4492
|
-
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][preceding-sibling::*]" priority="
|
|
4493
|
-
<fo:table-cell>
|
|
4495
|
+
<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][preceding-sibling::*]" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
|
|
4496
|
+
<fo:table-cell role="SKIP">
|
|
4494
4497
|
<fo:block role="SKIP">
|
|
4495
4498
|
<xsl:apply-templates/>
|
|
4496
4499
|
</fo:block>
|
|
@@ -5076,7 +5079,7 @@
|
|
|
5076
5079
|
<xsl:param name="value"/>
|
|
5077
5080
|
<xsl:variable name="add_width" select="string-length($value) * 20"/>
|
|
5078
5081
|
<xsl:variable name="maxwidth" select="60 + $add_width"/>
|
|
5079
|
-
<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%"><!-- alignment-baseline="middle" -->
|
|
5082
|
+
<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%" fox:placement="Inline"><!-- alignment-baseline="middle" -->
|
|
5080
5083
|
<xsl:attribute name="height">3.5mm</xsl:attribute> <!-- 5mm -->
|
|
5081
5084
|
<xsl:attribute name="content-width">100%</xsl:attribute>
|
|
5082
5085
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
@@ -5305,11 +5308,12 @@
|
|
|
5305
5308
|
<xsl:choose>
|
|
5306
5309
|
|
|
5307
5310
|
<xsl:when test="ancestor::mn:sourcecode[@linenums = 'true'] and ancestor::*[local-name() = 'td'][1][not(preceding-sibling::*)]"> <!-- pre in the first td in the table with @linenums = 'true' -->
|
|
5311
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
5308
5312
|
<xsl:if test="ancestor::mn:tr[1]/following-sibling::mn:tr"> <!-- is current tr isn't last -->
|
|
5309
5313
|
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
5310
5314
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
5311
5315
|
</xsl:if>
|
|
5312
|
-
<fo:instream-foreign-object fox:alt-text="{.}" content-width="95%">
|
|
5316
|
+
<fo:instream-foreign-object fox:alt-text="{.}" content-width="95%" fox:placement="Inline" role="artifact">
|
|
5313
5317
|
<math xmlns="http://www.w3.org/1998/Math/MathML">
|
|
5314
5318
|
<mtext><xsl:value-of select="."/></mtext>
|
|
5315
5319
|
</math>
|
|
@@ -6870,19 +6874,22 @@
|
|
|
6870
6874
|
<xsl:if test="normalize-space() != ''">
|
|
6871
6875
|
|
|
6872
6876
|
<fo:block xsl:use-attribute-sets="table-name-style">
|
|
6873
|
-
|
|
6874
6877
|
<xsl:call-template name="refine_table-name-style">
|
|
6875
6878
|
<xsl:with-param name="continued" select="$continued"/>
|
|
6876
6879
|
</xsl:call-template>
|
|
6877
6880
|
|
|
6878
|
-
<
|
|
6879
|
-
|
|
6880
|
-
</xsl:when>
|
|
6881
|
-
<xsl:otherwise>
|
|
6882
|
-
<xsl:apply-templates/>
|
|
6883
|
-
</xsl:otherwise>
|
|
6884
|
-
</xsl:choose>
|
|
6881
|
+
<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
|
|
6882
|
+
<fo:block role="P">
|
|
6885
6883
|
|
|
6884
|
+
<xsl:choose>
|
|
6885
|
+
<xsl:when test="$continued = 'true'">
|
|
6886
|
+
</xsl:when>
|
|
6887
|
+
<xsl:otherwise>
|
|
6888
|
+
<xsl:apply-templates/>
|
|
6889
|
+
</xsl:otherwise>
|
|
6890
|
+
</xsl:choose>
|
|
6891
|
+
|
|
6892
|
+
</fo:block>
|
|
6886
6893
|
</fo:block>
|
|
6887
6894
|
|
|
6888
6895
|
<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
|
|
@@ -7366,7 +7373,7 @@
|
|
|
7366
7373
|
|
|
7367
7374
|
<xsl:variable name="tableWithNotesAndFootnotes">
|
|
7368
7375
|
|
|
7369
|
-
<fo:table keep-with-previous="always" role="
|
|
7376
|
+
<fo:table keep-with-previous="always" role="TFoot">
|
|
7370
7377
|
<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
|
|
7371
7378
|
<xsl:variable name="name" select="local-name()"/>
|
|
7372
7379
|
<xsl:choose>
|
|
@@ -7404,14 +7411,14 @@
|
|
|
7404
7411
|
</xsl:choose>
|
|
7405
7412
|
|
|
7406
7413
|
<fo:table-body role="SKIP">
|
|
7407
|
-
<fo:table-row
|
|
7414
|
+
<fo:table-row>
|
|
7408
7415
|
<xsl:for-each select="ancestor::mn:table[1]">
|
|
7409
7416
|
<xsl:call-template name="setTableStyles">
|
|
7410
7417
|
<xsl:with-param name="scope">ancestor_table</xsl:with-param>
|
|
7411
7418
|
</xsl:call-template>
|
|
7412
7419
|
</xsl:for-each>
|
|
7413
7420
|
|
|
7414
|
-
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}"
|
|
7421
|
+
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
|
7415
7422
|
|
|
7416
7423
|
<xsl:call-template name="refine_table-footer-cell-style"/>
|
|
7417
7424
|
|
|
@@ -9756,6 +9763,16 @@
|
|
|
9756
9763
|
</xsl:if>
|
|
9757
9764
|
</xsl:template> <!-- refine_note-style -->
|
|
9758
9765
|
|
|
9766
|
+
<xsl:attribute-set name="note-block-style">
|
|
9767
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
9768
|
+
</xsl:attribute-set> <!-- note-block-style -->
|
|
9769
|
+
|
|
9770
|
+
<xsl:template name="refine_note-block-style">
|
|
9771
|
+
<xsl:if test="ancestor::mn:figure">
|
|
9772
|
+
<xsl:attribute name="margin-left"><xsl:value-of select="$tableAnnotationIndent"/></xsl:attribute>
|
|
9773
|
+
</xsl:if>
|
|
9774
|
+
</xsl:template> <!-- refine_note-block-style -->
|
|
9775
|
+
|
|
9759
9776
|
<xsl:variable name="note-body-indent">10mm</xsl:variable>
|
|
9760
9777
|
<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
|
|
9761
9778
|
|
|
@@ -9830,9 +9847,9 @@
|
|
|
9830
9847
|
<xsl:call-template name="refine_note-style"/>
|
|
9831
9848
|
|
|
9832
9849
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
9833
|
-
<fo:block
|
|
9850
|
+
<fo:block xsl:use-attribute-sets="note-block-style">
|
|
9834
9851
|
|
|
9835
|
-
<xsl:call-template name="
|
|
9852
|
+
<xsl:call-template name="refine_note-block-style"/>
|
|
9836
9853
|
|
|
9837
9854
|
<fo:inline xsl:use-attribute-sets="note-name-style">
|
|
9838
9855
|
|
|
@@ -9871,12 +9888,6 @@
|
|
|
9871
9888
|
</fo:block-container>
|
|
9872
9889
|
</xsl:template>
|
|
9873
9890
|
|
|
9874
|
-
<xsl:template name="refine_note_block_style">
|
|
9875
|
-
<xsl:if test="ancestor::mn:figure">
|
|
9876
|
-
<xsl:attribute name="margin-left"><xsl:value-of select="$tableAnnotationIndent"/></xsl:attribute>
|
|
9877
|
-
</xsl:if>
|
|
9878
|
-
</xsl:template> <!-- refine_note_block_style -->
|
|
9879
|
-
|
|
9880
9891
|
<xsl:template match="mn:note/mn:p">
|
|
9881
9892
|
<xsl:variable name="num"><xsl:number/></xsl:variable>
|
|
9882
9893
|
<xsl:choose>
|
|
@@ -9997,9 +10008,9 @@
|
|
|
9997
10008
|
<!-- ====== -->
|
|
9998
10009
|
|
|
9999
10010
|
<xsl:attribute-set name="quote-container-style">
|
|
10011
|
+
<xsl:attribute name="role">BlockQuote</xsl:attribute>
|
|
10000
10012
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
|
10001
10013
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
|
10002
|
-
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
10003
10014
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
10004
10015
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
10005
10016
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
@@ -10023,6 +10034,7 @@
|
|
|
10023
10034
|
</xsl:template> <!-- refine_quote-style -->
|
|
10024
10035
|
|
|
10025
10036
|
<xsl:attribute-set name="quote-source-style">
|
|
10037
|
+
<xsl:attribute name="role">Caption</xsl:attribute>
|
|
10026
10038
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
10027
10039
|
<xsl:attribute name="margin-right">-12mm</xsl:attribute>
|
|
10028
10040
|
</xsl:attribute-set> <!-- quote-source-style -->
|
|
@@ -10056,7 +10068,7 @@
|
|
|
10056
10068
|
<xsl:call-template name="refine_quote-style"/>
|
|
10057
10069
|
|
|
10058
10070
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10059
|
-
<fo:block role="
|
|
10071
|
+
<fo:block role="SKIP"> <!-- BlockQuote -->
|
|
10060
10072
|
<xsl:apply-templates select="./node()[not(self::mn:author) and not(self::mn:fmt-source) and not(self::mn:attribution)]"/> <!-- process all nested nodes, except author and source -->
|
|
10061
10073
|
</fo:block>
|
|
10062
10074
|
</fo:block-container>
|
|
@@ -10065,11 +10077,15 @@
|
|
|
10065
10077
|
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
10066
10078
|
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
10067
10079
|
<xsl:call-template name="refine_quote-source-style"/>
|
|
10068
|
-
|
|
10069
|
-
<
|
|
10070
|
-
<
|
|
10071
|
-
|
|
10072
|
-
|
|
10080
|
+
|
|
10081
|
+
<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
|
|
10082
|
+
<fo:block role="P">
|
|
10083
|
+
<!-- — ISO, ISO 7301:2011, Clause 1 -->
|
|
10084
|
+
<xsl:apply-templates select="mn:author"/>
|
|
10085
|
+
<xsl:apply-templates select="mn:fmt-source"/>
|
|
10086
|
+
<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
|
|
10087
|
+
<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
|
|
10088
|
+
</fo:block>
|
|
10073
10089
|
</fo:block>
|
|
10074
10090
|
</fo:block-container>
|
|
10075
10091
|
</xsl:if>
|
|
@@ -10545,7 +10561,7 @@
|
|
|
10545
10561
|
|
|
10546
10562
|
<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
|
|
10547
10563
|
|
|
10548
|
-
<fo:external-graphic src="{$src}" vertical-align="middle">
|
|
10564
|
+
<fo:external-graphic src="{$src}" vertical-align="middle" fox:placement="Inline">
|
|
10549
10565
|
<xsl:call-template name="addAltText"/>
|
|
10550
10566
|
|
|
10551
10567
|
<xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
|
|
@@ -10610,7 +10626,7 @@
|
|
|
10610
10626
|
<xsl:choose>
|
|
10611
10627
|
<xsl:when test="$isDeleted = 'true'">
|
|
10612
10628
|
<!-- enclose in svg -->
|
|
10613
|
-
<fo:instream-foreign-object>
|
|
10629
|
+
<fo:instream-foreign-object fox:placement="Block">
|
|
10614
10630
|
<xsl:attribute name="width">100%</xsl:attribute>
|
|
10615
10631
|
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
10616
10632
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
@@ -10631,7 +10647,7 @@
|
|
|
10631
10647
|
<xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
|
|
10632
10648
|
</fo:block> -->
|
|
10633
10649
|
|
|
10634
|
-
<fo:external-graphic src="{$src}">
|
|
10650
|
+
<fo:external-graphic src="{$src}" fox:placement="Block">
|
|
10635
10651
|
<xsl:call-template name="addAltText"/>
|
|
10636
10652
|
|
|
10637
10653
|
<xsl:choose>
|
|
@@ -10970,7 +10986,7 @@
|
|
|
10970
10986
|
</xsl:if>
|
|
10971
10987
|
<fo:block text-depth="0" line-height="0" font-size="0">
|
|
10972
10988
|
|
|
10973
|
-
<fo:instream-foreign-object fox:alt-text="{$alt-text}">
|
|
10989
|
+
<fo:instream-foreign-object fox:alt-text="{$alt-text}" fox:placement="Block">
|
|
10974
10990
|
<xsl:attribute name="width">100%</xsl:attribute>
|
|
10975
10991
|
<xsl:attribute name="content-height">100%</xsl:attribute>
|
|
10976
10992
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
@@ -11019,7 +11035,7 @@
|
|
|
11019
11035
|
<xsl:copy>
|
|
11020
11036
|
<xsl:copy-of select="@*"/>
|
|
11021
11037
|
<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
|
|
11022
|
-
<fo:instream-foreign-object fox:alt-text="{$alt-text}">
|
|
11038
|
+
<fo:instream-foreign-object fox:alt-text="{$alt-text}" fox:placement="Block">
|
|
11023
11039
|
|
|
11024
11040
|
<xsl:choose>
|
|
11025
11041
|
<xsl:when test="$image_class = 'corrigenda-tag'">
|
|
@@ -11084,6 +11100,10 @@
|
|
|
11084
11100
|
<xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
|
|
11085
11101
|
</xsl:if>
|
|
11086
11102
|
|
|
11103
|
+
<xsl:if test="self::fo:inline">
|
|
11104
|
+
<xsl:attribute name="fox:placement">Inline</xsl:attribute>
|
|
11105
|
+
</xsl:if>
|
|
11106
|
+
|
|
11087
11107
|
<xsl:copy-of select="$svg_content"/>
|
|
11088
11108
|
|
|
11089
11109
|
<!-- <debug>
|
|
@@ -11359,10 +11379,12 @@
|
|
|
11359
11379
|
<xsl:template match="mn:figure/mn:fmt-name | mn:image/mn:fmt-name">
|
|
11360
11380
|
<xsl:if test="normalize-space() != ''">
|
|
11361
11381
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
|
11362
|
-
|
|
11363
11382
|
<xsl:call-template name="refine_figure-name-style"/>
|
|
11364
11383
|
|
|
11365
|
-
<
|
|
11384
|
+
<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
|
|
11385
|
+
<fo:block role="P">
|
|
11386
|
+
<xsl:apply-templates/>
|
|
11387
|
+
</fo:block>
|
|
11366
11388
|
</fo:block>
|
|
11367
11389
|
</xsl:if>
|
|
11368
11390
|
</xsl:template>
|
|
@@ -11384,6 +11406,7 @@
|
|
|
11384
11406
|
|
|
11385
11407
|
<!-- Formula's styles -->
|
|
11386
11408
|
<xsl:attribute-set name="formula-style">
|
|
11409
|
+
<xsl:attribute name="role">P</xsl:attribute>
|
|
11387
11410
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
|
11388
11411
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
11389
11412
|
</xsl:attribute-set> <!-- formula-style -->
|
|
@@ -11392,6 +11415,7 @@
|
|
|
11392
11415
|
</xsl:template>
|
|
11393
11416
|
|
|
11394
11417
|
<xsl:attribute-set name="formula-stem-block-style">
|
|
11418
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
11395
11419
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
11396
11420
|
</xsl:attribute-set> <!-- formula-stem-block-style -->
|
|
11397
11421
|
|
|
@@ -11399,6 +11423,7 @@
|
|
|
11399
11423
|
</xsl:template> <!-- refine_formula-stem-block-style -->
|
|
11400
11424
|
|
|
11401
11425
|
<xsl:attribute-set name="formula-stem-number-style">
|
|
11426
|
+
<xsl:attribute name="role">Span</xsl:attribute>
|
|
11402
11427
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
11403
11428
|
</xsl:attribute-set> <!-- formula-stem-number-style -->
|
|
11404
11429
|
<!-- End Formula's styles -->
|
|
@@ -11407,12 +11432,25 @@
|
|
|
11407
11432
|
</xsl:template>
|
|
11408
11433
|
|
|
11409
11434
|
<xsl:attribute-set name="mathml-style">
|
|
11435
|
+
<xsl:attribute name="role">Formula</xsl:attribute>
|
|
11410
11436
|
<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
|
|
11411
11437
|
</xsl:attribute-set>
|
|
11412
11438
|
|
|
11413
11439
|
<xsl:template name="refine_mathml-style">
|
|
11414
11440
|
</xsl:template>
|
|
11415
11441
|
|
|
11442
|
+
<xsl:attribute-set name="mathml-instream-foreign-object-style">
|
|
11443
|
+
<xsl:attribute name="fox:alt-text">Math</xsl:attribute>
|
|
11444
|
+
<xsl:attribute name="fox:actual-text">Math</xsl:attribute>
|
|
11445
|
+
<xsl:attribute name="fox:placement">Inline</xsl:attribute>
|
|
11446
|
+
</xsl:attribute-set> <!-- mathml-instream-foreign-object-style -->
|
|
11447
|
+
|
|
11448
|
+
<xsl:template name="refine_mathml-instream-foreign-object-style">
|
|
11449
|
+
<xsl:if test="ancestor::mn:formula">
|
|
11450
|
+
<xsl:attribute name="fox:placement">Block</xsl:attribute>
|
|
11451
|
+
</xsl:if>
|
|
11452
|
+
</xsl:template> <!-- refine_mathml-instream-foreign-object-style -->
|
|
11453
|
+
|
|
11416
11454
|
<!-- ====== -->
|
|
11417
11455
|
<!-- formula -->
|
|
11418
11456
|
<!-- ====== -->
|
|
@@ -11428,7 +11466,7 @@
|
|
|
11428
11466
|
</xsl:if>
|
|
11429
11467
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
11430
11468
|
<xsl:call-template name="setNamedDestination"/>
|
|
11431
|
-
<fo:block id="{@id}">
|
|
11469
|
+
<fo:block id="{@id}" role="SKIP">
|
|
11432
11470
|
<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/> <!-- formula's number will be process in 'stem' template -->
|
|
11433
11471
|
</fo:block>
|
|
11434
11472
|
</fo:block-container>
|
|
@@ -11461,22 +11499,22 @@
|
|
|
11461
11499
|
|
|
11462
11500
|
<xsl:call-template name="refine_formula-style"/>
|
|
11463
11501
|
|
|
11464
|
-
<fo:table table-layout="fixed" width="100%">
|
|
11502
|
+
<fo:table table-layout="fixed" width="100%" role="SKIP">
|
|
11465
11503
|
<fo:table-column column-width="95%"/>
|
|
11466
11504
|
<fo:table-column column-width="5%"/>
|
|
11467
|
-
<fo:table-body>
|
|
11468
|
-
<fo:table-row>
|
|
11469
|
-
<fo:table-cell display-align="center">
|
|
11470
|
-
<fo:block xsl:use-attribute-sets="formula-stem-block-style"
|
|
11505
|
+
<fo:table-body role="SKIP">
|
|
11506
|
+
<fo:table-row role="SKIP">
|
|
11507
|
+
<fo:table-cell display-align="center" role="SKIP">
|
|
11508
|
+
<fo:block xsl:use-attribute-sets="formula-stem-block-style">
|
|
11471
11509
|
|
|
11472
11510
|
<xsl:call-template name="refine_formula-stem-block-style"/>
|
|
11473
11511
|
|
|
11474
11512
|
<xsl:apply-templates/>
|
|
11475
11513
|
</fo:block>
|
|
11476
11514
|
</fo:table-cell>
|
|
11477
|
-
<fo:table-cell display-align="center">
|
|
11515
|
+
<fo:table-cell display-align="center" role="SKIP">
|
|
11478
11516
|
|
|
11479
|
-
<fo:block xsl:use-attribute-sets="formula-stem-number-style"
|
|
11517
|
+
<fo:block xsl:use-attribute-sets="formula-stem-number-style">
|
|
11480
11518
|
|
|
11481
11519
|
<xsl:for-each select="../mn:fmt-name">
|
|
11482
11520
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
@@ -11624,9 +11662,9 @@
|
|
|
11624
11662
|
<xsl:apply-templates select="." mode="mathml"/>
|
|
11625
11663
|
</xsl:variable>
|
|
11626
11664
|
|
|
11627
|
-
<fo:instream-foreign-object
|
|
11665
|
+
<fo:instream-foreign-object xsl:use-attribute-sets="mathml-instream-foreign-object-style">
|
|
11628
11666
|
|
|
11629
|
-
<xsl:call-template name="
|
|
11667
|
+
<xsl:call-template name="refine_mathml-instream-foreign-object-style"/>
|
|
11630
11668
|
|
|
11631
11669
|
<xsl:if test="$isGenerateTableIF = 'false'">
|
|
11632
11670
|
<!-- put MathML in Actual Text -->
|
|
@@ -11650,9 +11688,6 @@
|
|
|
11650
11688
|
</fo:instream-foreign-object>
|
|
11651
11689
|
</xsl:template>
|
|
11652
11690
|
|
|
11653
|
-
<xsl:template name="refine_mathml_insteam_object_style">
|
|
11654
|
-
</xsl:template> <!-- refine_mathml_insteam_object_style -->
|
|
11655
|
-
|
|
11656
11691
|
<xsl:template match="mathml:*" mode="mathml_actual_text">
|
|
11657
11692
|
<!-- <xsl:text>a+b</xsl:text> -->
|
|
11658
11693
|
<xsl:text><</xsl:text>
|
|
@@ -12778,8 +12813,10 @@
|
|
|
12778
12813
|
|
|
12779
12814
|
</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
|
|
12780
12815
|
|
|
12816
|
+
<!-- commented 2026-08-06: from https://github.com/metanorma/metanorma-standoc/issues/1140:
|
|
12817
|
+
Presentation XML will no longer contain notes following bibitem, those notes will have been moved in Presentation XML to inside bibitem, and then duplicated to inside formattedref. -->
|
|
12781
12818
|
<!-- bibitem's notes will be processing in 'processBibitemFollowingNotes' -->
|
|
12782
|
-
<xsl:template match="mn:references/mn:note" priority="2"
|
|
12819
|
+
<!-- <xsl:template match="mn:references/mn:note" priority="2"/>--> <!-- [not(@normative='true')] -->
|
|
12783
12820
|
|
|
12784
12821
|
<xsl:template name="insertListItem_Bibitem">
|
|
12785
12822
|
<xsl:choose>
|
|
@@ -13454,7 +13491,7 @@
|
|
|
13454
13491
|
<xsl:call-template name="set_id_metanorma_form_item">
|
|
13455
13492
|
<xsl:with-param name="form_item_type" select="$form_item_type"/>
|
|
13456
13493
|
</xsl:call-template>
|
|
13457
|
-
<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
|
|
13494
|
+
<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%" fox:placement="Inline">
|
|
13458
13495
|
<xsl:attribute name="height">3.5mm</xsl:attribute>
|
|
13459
13496
|
<xsl:attribute name="content-width">100%</xsl:attribute>
|
|
13460
13497
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
@@ -13481,7 +13518,7 @@
|
|
|
13481
13518
|
<xsl:call-template name="set_id_metanorma_form_item">
|
|
13482
13519
|
<xsl:with-param name="form_item_type" select="$form_item_type"/>
|
|
13483
13520
|
</xsl:call-template>
|
|
13484
|
-
<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
|
|
13521
|
+
<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%" fox:placement="Inline">
|
|
13485
13522
|
<xsl:attribute name="height">3.5mm</xsl:attribute>
|
|
13486
13523
|
<xsl:attribute name="content-width">100%</xsl:attribute>
|
|
13487
13524
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
@@ -13745,7 +13782,9 @@
|
|
|
13745
13782
|
</xsl:variable>
|
|
13746
13783
|
<mnx:example id="{@id}" alt-text="{normalize-space($example_name)}">
|
|
13747
13784
|
<xsl:element name="fmt-name" namespace="{$namespace_full}">
|
|
13748
|
-
<xsl:
|
|
13785
|
+
<xsl:call-template name="capitalize"><!-- https://github.com/metanorma/metanorma-pdfa/issues/72 -->
|
|
13786
|
+
<xsl:with-param name="str" select="mn:fmt-xref-label[@container]"/>
|
|
13787
|
+
</xsl:call-template>
|
|
13749
13788
|
<xsl:if test="normalize-space($example_name) != ''">
|
|
13750
13789
|
<xsl:value-of select="mn:fmt-name/mn:span[@class = 'fmt-caption-delim']"/>
|
|
13751
13790
|
<xsl:copy-of select="$example_name"/>
|
|
@@ -15639,7 +15678,8 @@
|
|
|
15639
15678
|
<xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
|
|
15640
15679
|
<fo:block break-after="page"/>
|
|
15641
15680
|
<xsl:call-template name="setNamedDestination"/>
|
|
15642
|
-
<fo:block>
|
|
15681
|
+
<fo:block role="Sect">
|
|
15682
|
+
<xsl:call-template name="addTagElementT"/>
|
|
15643
15683
|
<xsl:call-template name="setId"/>
|
|
15644
15684
|
<xsl:call-template name="addReviewHelper"/>
|
|
15645
15685
|
<xsl:apply-templates/>
|
|
@@ -15728,7 +15768,7 @@
|
|
|
15728
15768
|
|
|
15729
15769
|
<xsl:template match="mn:blacksquare" name="blacksquare">
|
|
15730
15770
|
<fo:inline padding-right="2.5mm" baseline-shift="5%">
|
|
15731
|
-
<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
|
|
15771
|
+
<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad" fox:placement="Inline">
|
|
15732
15772
|
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 2 2">
|
|
15733
15773
|
<rect x="0" y="0" width="2" height="2" fill="black"/>
|
|
15734
15774
|
</svg>
|
|
@@ -16710,13 +16750,13 @@
|
|
|
16710
16750
|
<xsl:param name="bitmap_width" select="$pageWidth"/>
|
|
16711
16751
|
<xsl:choose>
|
|
16712
16752
|
<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
|
|
16713
|
-
<fo:instream-foreign-object fox:alt-text="Image Front">
|
|
16753
|
+
<fo:instream-foreign-object fox:alt-text="Image Front" fox:placement="Block">
|
|
16714
16754
|
<xsl:attribute name="content-height"><xsl:value-of select="$svg_content_height"/>mm</xsl:attribute>
|
|
16715
16755
|
<xsl:call-template name="getSVG"/>
|
|
16716
16756
|
</fo:instream-foreign-object>
|
|
16717
16757
|
</xsl:when>
|
|
16718
16758
|
<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
|
|
16719
|
-
<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
|
|
16759
|
+
<fo:external-graphic src="{@src}" fox:alt-text="Image Front" fox:placement="Block"/>
|
|
16720
16760
|
</xsl:when>
|
|
16721
16761
|
<xsl:otherwise> <!-- bitmap image -->
|
|
16722
16762
|
<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
|
|
@@ -16726,7 +16766,7 @@
|
|
|
16726
16766
|
<xsl:with-param name="src" select="$coverimage_src"/>
|
|
16727
16767
|
</xsl:call-template>
|
|
16728
16768
|
</xsl:variable>
|
|
16729
|
-
<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
|
|
16769
|
+
<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front" fox:placement="Block"/>
|
|
16730
16770
|
</xsl:if>
|
|
16731
16771
|
</xsl:otherwise>
|
|
16732
16772
|
</xsl:choose>
|