metanorma-itu 2.8.14 → 2.9.0

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6bde0efdd7763cdf181075e4c046f2efe868e764395b6fde491083c3548acff3
4
- data.tar.gz: 43d07a4790c0bae983de907410ba191f1cfbcaad23e4ae2807eeb761ef2039d8
3
+ metadata.gz: c208d139b0f26cca6e36fad45b813650712002c18b1fd550df33224293818907
4
+ data.tar.gz: '098b33cba314adcd4b746abdd5c43b7bb64eef16ce4e29d8bd10e218b7c26a47'
5
5
  SHA512:
6
- metadata.gz: c82d7ed8cd3954a1f2cd628ab3bd9b197c2a4ce812d6bc4c30eb0f4d5ec021afe986187975abf68ff59106ab050724d5d35f951d4e8073dbf0e4ac8e41232247
7
- data.tar.gz: 6ba8b94f4f0e6ec59b43fe930acb6b02c7f6bc71b04678887da8a349af004b59758489e0e5535306c5a7df06644e88c6974212c04744424224c56d50c89c70f0
6
+ metadata.gz: 64412450479ac7d9bff7582f8f97b1edb698dfa6842ab919bfd32f61ce4b0ccee2cc5bc3b83e32aa28d86c40ad8df67bf648bdcfa6b601a881dcb4f0b020d440
7
+ data.tar.gz: c970e4df8aa61e425a3c60421db22cd40ba940bd347ff2737dfd165ede6f419f97949ace5169b19585657b0a3884907384c7db56ab8ddd4f823d83170803d06e
@@ -757,7 +757,7 @@
757
757
  <xsl:if test="$doctype != 'service-publication'">
758
758
  <fo:block margin-top="3.4mm">
759
759
  <xsl:call-template name="setWritingMode"/>
760
- <fo:instream-foreign-object fox:alt-text="Color bar">
760
+ <fo:instream-foreign-object fox:alt-text="Color bar" fox:placement="Block">
761
761
  <xsl:call-template name="insertImageCoverColorBand">
762
762
  <xsl:with-param name="bureau" select="$bureau"/>
763
763
  <xsl:with-param name="doctype" select="$doctype"/>
@@ -774,7 +774,7 @@
774
774
  <xsl:if test="$lang = 'ar'">
775
775
  <xsl:attribute name="text-align">left</xsl:attribute>
776
776
  </xsl:if>
777
- <fo:instream-foreign-object content-width="20.5mm" fox:alt-text="Image Logo">
777
+ <fo:instream-foreign-object content-width="20.5mm" fox:alt-text="Image Logo" fox:placement="Block">
778
778
  <xsl:call-template name="Image-ITU-Globe-Logo-Blue">
779
779
  <xsl:with-param name="color_cover_itu_logo" select="$color_cover_itu_logo"/>
780
780
  </xsl:call-template>
@@ -1228,7 +1228,7 @@
1228
1228
  <xsl:attribute name="padding-right">0mm</xsl:attribute>
1229
1229
  <xsl:attribute name="padding-left">6mm</xsl:attribute>
1230
1230
  </xsl:if>
1231
- <fo:instream-foreign-object content-height="18.5mm" content-width="16.1mm" fox:alt-text="Image Logo">
1231
+ <fo:instream-foreign-object content-height="18.5mm" content-width="16.1mm" fox:alt-text="Image Logo" fox:placement="Block">
1232
1232
  <xsl:copy-of select="$Image-ITU-Globe-Logo"/>
1233
1233
  </fo:instream-foreign-object>
1234
1234
  </fo:inline>
@@ -1372,11 +1372,11 @@
1372
1372
  <fo:block text-align="right" margin-right="19mm">
1373
1373
  <xsl:choose>
1374
1374
  <xsl:when test="$doctype = 'resolution'">
1375
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo_resolution))}" content-height="21mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/>
1375
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo_resolution))}" content-height="21mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo" fox:placement="Block"/>
1376
1376
  </xsl:when>
1377
1377
  <xsl:otherwise>
1378
1378
  <!-- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Logo))}" content-height="17.7mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Logo"/> -->
1379
- <fo:instream-foreign-object content-width="24.1mm" fox:alt-text="Image Logo ITU">
1379
+ <fo:instream-foreign-object content-width="24.1mm" fox:alt-text="Image Logo ITU" fox:placement="Block">
1380
1380
  <xsl:call-template name="Image-ITU-Globe-Logo-Blue">
1381
1381
  <xsl:with-param name="color_cover_itu_logo" select="$color_cover_itu_logo"/>
1382
1382
  </xsl:call-template>
@@ -1388,7 +1388,7 @@
1388
1388
 
1389
1389
  <fo:block-container absolute-position="fixed" left="-7mm" top="0" font-size="0">
1390
1390
  <fo:block text-align="left">
1391
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Fond-Rec))}" width="43.6mm" content-height="299.2mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Cover Page"/>
1391
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Fond-Rec))}" width="43.6mm" content-height="299.2mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image Cover Page" fox:placement="Block"/>
1392
1392
  </fo:block>
1393
1393
  </fo:block-container>
1394
1394
  <fo:block-container font-family="Arial">
@@ -4014,7 +4014,7 @@
4014
4014
  </xsl:element>
4015
4015
  </xsl:template> -->
4016
4016
 
4017
- <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">
4017
+ <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">
4018
4018
  <xsl:apply-templates mode="update_xml_step1"/>
4019
4019
  </xsl:template>
4020
4020
 
@@ -5073,6 +5073,9 @@
5073
5073
 
5074
5074
  <xsl:template name="refine_sourcecode-style">
5075
5075
  <xsl:call-template name="setKeepAttributes"/>
5076
+ <xsl:if test="ancestor::mn:sourcecode and parent::mn:td">
5077
+ <xsl:attribute name="role">SKIP</xsl:attribute>
5078
+ </xsl:if>
5076
5079
  </xsl:template> <!-- refine_sourcecode-style -->
5077
5080
 
5078
5081
  <xsl:attribute-set name="sourcecode-number-style">
@@ -5399,30 +5402,30 @@
5399
5402
  </xsl:template>
5400
5403
 
5401
5404
  <!-- outer table with line numbers for sourcecode -->
5402
- <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] | -->
5403
- <fo:block>
5404
- <fo:table width="100%" table-layout="fixed">
5405
+ <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] | -->
5406
+ <fo:block role="SKIP">
5407
+ <fo:table width="100%" table-layout="fixed" role="SKIP">
5405
5408
  <xsl:copy-of select="@id"/>
5406
5409
  <fo:table-column column-width="8%"/>
5407
5410
  <fo:table-column column-width="92%"/>
5408
- <fo:table-body>
5411
+ <fo:table-body role="SKIP">
5409
5412
  <xsl:apply-templates/>
5410
5413
  </fo:table-body>
5411
5414
  </fo:table>
5412
5415
  </fo:block>
5413
5416
  </xsl:template>
5414
- <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table/mn:tbody" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] | -->
5417
+ <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table/mn:tbody" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] | -->
5415
5418
  <xsl:apply-templates/>
5416
5419
  </xsl:template>
5417
- <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] | -->
5418
- <fo:table-row>
5420
+ <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] | -->
5421
+ <fo:table-row role="SKIP">
5419
5422
  <xsl:apply-templates/>
5420
5423
  </fo:table-row>
5421
5424
  </xsl:template>
5422
5425
  <!-- first td with line numbers -->
5423
- <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][not(preceding-sibling::*)]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
5424
- <fo:table-cell>
5425
- <fo:block>
5426
+ <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][not(preceding-sibling::*)]" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
5427
+ <fo:table-cell role="SKIP">
5428
+ <fo:block role="SKIP">
5426
5429
 
5427
5430
  <!-- set attibutes for line numbers - same as sourcecode -->
5428
5431
  <xsl:variable name="sourcecode_attributes">
@@ -5430,7 +5433,7 @@
5430
5433
  <xsl:call-template name="get_sourcecode_attributes"/>
5431
5434
  </xsl:for-each>
5432
5435
  </xsl:variable>
5433
- <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*[not(starts-with(local-name(), 'margin-') or starts-with(local-name(), 'space-'))]">
5436
+ <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'))]">
5434
5437
  <xsl:attribute name="{name()}">
5435
5438
  <xsl:value-of select="."/>
5436
5439
  </xsl:attribute>
@@ -5442,8 +5445,8 @@
5442
5445
  </xsl:template>
5443
5446
 
5444
5447
  <!-- second td with sourcecode -->
5445
- <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
5446
- <fo:table-cell>
5448
+ <xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][preceding-sibling::*]" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
5449
+ <fo:table-cell role="SKIP">
5447
5450
  <fo:block role="SKIP">
5448
5451
  <xsl:apply-templates/>
5449
5452
  </fo:block>
@@ -6019,7 +6022,7 @@
6019
6022
  <xsl:param name="value"/>
6020
6023
  <xsl:variable name="add_width" select="string-length($value) * 20"/>
6021
6024
  <xsl:variable name="maxwidth" select="60 + $add_width"/>
6022
- <fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%"><!-- alignment-baseline="middle" -->
6025
+ <fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%" fox:placement="Inline"><!-- alignment-baseline="middle" -->
6023
6026
  <xsl:attribute name="height">3.5mm</xsl:attribute> <!-- 5mm -->
6024
6027
  <xsl:attribute name="content-width">100%</xsl:attribute>
6025
6028
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -6248,11 +6251,12 @@
6248
6251
  <xsl:choose>
6249
6252
 
6250
6253
  <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' -->
6254
+ <xsl:attribute name="role">SKIP</xsl:attribute>
6251
6255
  <xsl:if test="ancestor::mn:tr[1]/following-sibling::mn:tr"> <!-- is current tr isn't last -->
6252
6256
  <xsl:attribute name="margin-top">0pt</xsl:attribute>
6253
6257
  <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
6254
6258
  </xsl:if>
6255
- <fo:instream-foreign-object fox:alt-text="{.}" content-width="95%">
6259
+ <fo:instream-foreign-object fox:alt-text="{.}" content-width="95%" fox:placement="Inline" role="artifact">
6256
6260
  <math xmlns="http://www.w3.org/1998/Math/MathML">
6257
6261
  <mtext><xsl:value-of select="."/></mtext>
6258
6262
  </math>
@@ -7846,19 +7850,22 @@
7846
7850
  <xsl:if test="normalize-space() != ''">
7847
7851
 
7848
7852
  <fo:block xsl:use-attribute-sets="table-name-style">
7849
-
7850
7853
  <xsl:call-template name="refine_table-name-style">
7851
7854
  <xsl:with-param name="continued" select="$continued"/>
7852
7855
  </xsl:call-template>
7853
7856
 
7854
- <xsl:choose>
7855
- <xsl:when test="$continued = 'true'">
7856
- </xsl:when>
7857
- <xsl:otherwise>
7858
- <xsl:apply-templates/>
7859
- </xsl:otherwise>
7860
- </xsl:choose>
7857
+ <!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
7858
+ <fo:block role="P">
7861
7859
 
7860
+ <xsl:choose>
7861
+ <xsl:when test="$continued = 'true'">
7862
+ </xsl:when>
7863
+ <xsl:otherwise>
7864
+ <xsl:apply-templates/>
7865
+ </xsl:otherwise>
7866
+ </xsl:choose>
7867
+
7868
+ </fo:block>
7862
7869
  </fo:block>
7863
7870
 
7864
7871
  <!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
@@ -8342,7 +8349,7 @@
8342
8349
 
8343
8350
  <xsl:variable name="tableWithNotesAndFootnotes">
8344
8351
 
8345
- <fo:table keep-with-previous="always" role="SKIP">
8352
+ <fo:table keep-with-previous="always" role="TFoot">
8346
8353
  <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
8347
8354
  <xsl:variable name="name" select="local-name()"/>
8348
8355
  <xsl:choose>
@@ -8386,14 +8393,14 @@
8386
8393
  </xsl:choose>
8387
8394
 
8388
8395
  <fo:table-body role="SKIP">
8389
- <fo:table-row role="SKIP">
8396
+ <fo:table-row>
8390
8397
  <xsl:for-each select="ancestor::mn:table[1]">
8391
8398
  <xsl:call-template name="setTableStyles">
8392
8399
  <xsl:with-param name="scope">ancestor_table</xsl:with-param>
8393
8400
  </xsl:call-template>
8394
8401
  </xsl:for-each>
8395
8402
 
8396
- <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}" role="SKIP">
8403
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
8397
8404
 
8398
8405
  <xsl:call-template name="refine_table-footer-cell-style"/>
8399
8406
 
@@ -10753,6 +10760,16 @@
10753
10760
  <xsl:template name="refine_note-style">
10754
10761
  </xsl:template> <!-- refine_note-style -->
10755
10762
 
10763
+ <xsl:attribute-set name="note-block-style">
10764
+ <xsl:attribute name="role">SKIP</xsl:attribute>
10765
+ </xsl:attribute-set> <!-- note-block-style -->
10766
+
10767
+ <xsl:template name="refine_note-block-style">
10768
+ <xsl:if test="ancestor::mn:figure">
10769
+ <xsl:attribute name="keep-with-previous">always</xsl:attribute>
10770
+ </xsl:if>
10771
+ </xsl:template> <!-- refine_note-block-style -->
10772
+
10756
10773
  <xsl:variable name="note-body-indent">10mm</xsl:variable>
10757
10774
  <xsl:variable name="note-body-indent-table">5mm</xsl:variable>
10758
10775
 
@@ -10822,9 +10839,9 @@
10822
10839
  <xsl:call-template name="refine_note-style"/>
10823
10840
 
10824
10841
  <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10825
- <fo:block role="SKIP">
10842
+ <fo:block xsl:use-attribute-sets="note-block-style">
10826
10843
 
10827
- <xsl:call-template name="refine_note_block_style"/>
10844
+ <xsl:call-template name="refine_note-block-style"/>
10828
10845
 
10829
10846
  <fo:inline xsl:use-attribute-sets="note-name-style">
10830
10847
 
@@ -10863,12 +10880,6 @@
10863
10880
  </fo:block-container>
10864
10881
  </xsl:template>
10865
10882
 
10866
- <xsl:template name="refine_note_block_style">
10867
- <xsl:if test="ancestor::mn:figure">
10868
- <xsl:attribute name="keep-with-previous">always</xsl:attribute>
10869
- </xsl:if>
10870
- </xsl:template> <!-- refine_note_block_style -->
10871
-
10872
10883
  <xsl:template match="mn:note/mn:p">
10873
10884
  <xsl:variable name="num"><xsl:number/></xsl:variable>
10874
10885
  <xsl:choose>
@@ -10989,9 +11000,9 @@
10989
11000
  <!-- ====== -->
10990
11001
 
10991
11002
  <xsl:attribute-set name="quote-container-style">
11003
+ <xsl:attribute name="role">BlockQuote</xsl:attribute>
10992
11004
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
10993
11005
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
10994
- <xsl:attribute name="role">SKIP</xsl:attribute>
10995
11006
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
10996
11007
  </xsl:attribute-set>
10997
11008
 
@@ -11014,6 +11025,7 @@
11014
11025
  </xsl:template> <!-- refine_quote-style -->
11015
11026
 
11016
11027
  <xsl:attribute-set name="quote-source-style">
11028
+ <xsl:attribute name="role">Caption</xsl:attribute>
11017
11029
  <xsl:attribute name="text-align">right</xsl:attribute>
11018
11030
  <xsl:attribute name="margin-right">-12mm</xsl:attribute>
11019
11031
  </xsl:attribute-set> <!-- quote-source-style -->
@@ -11046,7 +11058,7 @@
11046
11058
  <xsl:call-template name="refine_quote-style"/>
11047
11059
 
11048
11060
  <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11049
- <fo:block role="BlockQuote">
11061
+ <fo:block role="SKIP"> <!-- BlockQuote -->
11050
11062
  <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 -->
11051
11063
  </fo:block>
11052
11064
  </fo:block-container>
@@ -11055,11 +11067,15 @@
11055
11067
  <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11056
11068
  <fo:block xsl:use-attribute-sets="quote-source-style">
11057
11069
  <xsl:call-template name="refine_quote-source-style"/>
11058
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
11059
- <xsl:apply-templates select="mn:author"/>
11060
- <xsl:apply-templates select="mn:fmt-source"/>
11061
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11062
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11070
+
11071
+ <!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
11072
+ <fo:block role="P">
11073
+ <!-- ISO, ISO 7301:2011, Clause 1 -->
11074
+ <xsl:apply-templates select="mn:author"/>
11075
+ <xsl:apply-templates select="mn:fmt-source"/>
11076
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11077
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11078
+ </fo:block>
11063
11079
  </fo:block>
11064
11080
  </fo:block-container>
11065
11081
  </xsl:if>
@@ -11529,7 +11545,7 @@
11529
11545
 
11530
11546
  <!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
11531
11547
 
11532
- <fo:external-graphic src="{$src}" vertical-align="middle">
11548
+ <fo:external-graphic src="{$src}" vertical-align="middle" fox:placement="Inline">
11533
11549
  <xsl:call-template name="addAltText"/>
11534
11550
 
11535
11551
  <xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
@@ -11594,7 +11610,7 @@
11594
11610
  <xsl:choose>
11595
11611
  <xsl:when test="$isDeleted = 'true'">
11596
11612
  <!-- enclose in svg -->
11597
- <fo:instream-foreign-object>
11613
+ <fo:instream-foreign-object fox:placement="Block">
11598
11614
  <xsl:attribute name="width">100%</xsl:attribute>
11599
11615
  <xsl:attribute name="content-height">100%</xsl:attribute>
11600
11616
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -11615,7 +11631,7 @@
11615
11631
  <xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
11616
11632
  </fo:block> -->
11617
11633
 
11618
- <fo:external-graphic src="{$src}">
11634
+ <fo:external-graphic src="{$src}" fox:placement="Block">
11619
11635
  <xsl:call-template name="addAltText"/>
11620
11636
 
11621
11637
  <xsl:choose>
@@ -11954,7 +11970,7 @@
11954
11970
  </xsl:if>
11955
11971
  <fo:block text-depth="0" line-height="0" font-size="0">
11956
11972
 
11957
- <fo:instream-foreign-object fox:alt-text="{$alt-text}">
11973
+ <fo:instream-foreign-object fox:alt-text="{$alt-text}" fox:placement="Block">
11958
11974
  <xsl:attribute name="width">100%</xsl:attribute>
11959
11975
  <xsl:attribute name="content-height">100%</xsl:attribute>
11960
11976
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -12003,7 +12019,7 @@
12003
12019
  <xsl:copy>
12004
12020
  <xsl:copy-of select="@*"/>
12005
12021
  <!-- <fo:block xsl:use-attribute-sets="image-style"> -->
12006
- <fo:instream-foreign-object fox:alt-text="{$alt-text}">
12022
+ <fo:instream-foreign-object fox:alt-text="{$alt-text}" fox:placement="Block">
12007
12023
 
12008
12024
  <xsl:choose>
12009
12025
  <xsl:when test="$image_class = 'corrigenda-tag'">
@@ -12068,6 +12084,10 @@
12068
12084
  <xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
12069
12085
  </xsl:if>
12070
12086
 
12087
+ <xsl:if test="self::fo:inline">
12088
+ <xsl:attribute name="fox:placement">Inline</xsl:attribute>
12089
+ </xsl:if>
12090
+
12071
12091
  <xsl:copy-of select="$svg_content"/>
12072
12092
 
12073
12093
  <!-- <debug>
@@ -12343,10 +12363,12 @@
12343
12363
  <xsl:template match="mn:figure/mn:fmt-name | mn:image/mn:fmt-name">
12344
12364
  <xsl:if test="normalize-space() != ''">
12345
12365
  <fo:block xsl:use-attribute-sets="figure-name-style">
12346
-
12347
12366
  <xsl:call-template name="refine_figure-name-style"/>
12348
12367
 
12349
- <xsl:apply-templates/>
12368
+ <!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
12369
+ <fo:block role="P">
12370
+ <xsl:apply-templates/>
12371
+ </fo:block>
12350
12372
  </fo:block>
12351
12373
  </xsl:if>
12352
12374
  </xsl:template>
@@ -12368,6 +12390,7 @@
12368
12390
 
12369
12391
  <!-- Formula's styles -->
12370
12392
  <xsl:attribute-set name="formula-style">
12393
+ <xsl:attribute name="role">P</xsl:attribute>
12371
12394
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
12372
12395
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
12373
12396
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -12377,6 +12400,7 @@
12377
12400
  </xsl:template>
12378
12401
 
12379
12402
  <xsl:attribute-set name="formula-stem-block-style">
12403
+ <xsl:attribute name="role">SKIP</xsl:attribute>
12380
12404
  <xsl:attribute name="text-align">center</xsl:attribute>
12381
12405
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
12382
12406
  </xsl:attribute-set> <!-- formula-stem-block-style -->
@@ -12385,6 +12409,7 @@
12385
12409
  </xsl:template> <!-- refine_formula-stem-block-style -->
12386
12410
 
12387
12411
  <xsl:attribute-set name="formula-stem-number-style">
12412
+ <xsl:attribute name="role">Span</xsl:attribute>
12388
12413
  <xsl:attribute name="text-align">right</xsl:attribute>
12389
12414
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
12390
12415
  </xsl:attribute-set> <!-- formula-stem-number-style -->
@@ -12394,6 +12419,7 @@
12394
12419
  </xsl:template>
12395
12420
 
12396
12421
  <xsl:attribute-set name="mathml-style">
12422
+ <xsl:attribute name="role">Formula</xsl:attribute>
12397
12423
  <xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
12398
12424
  <xsl:attribute name="font-size">11pt</xsl:attribute>
12399
12425
  </xsl:attribute-set>
@@ -12401,6 +12427,18 @@
12401
12427
  <xsl:template name="refine_mathml-style">
12402
12428
  </xsl:template>
12403
12429
 
12430
+ <xsl:attribute-set name="mathml-instream-foreign-object-style">
12431
+ <xsl:attribute name="fox:alt-text">Math</xsl:attribute>
12432
+ <xsl:attribute name="fox:actual-text">Math</xsl:attribute>
12433
+ <xsl:attribute name="fox:placement">Inline</xsl:attribute>
12434
+ </xsl:attribute-set> <!-- mathml-instream-foreign-object-style -->
12435
+
12436
+ <xsl:template name="refine_mathml-instream-foreign-object-style">
12437
+ <xsl:if test="ancestor::mn:formula">
12438
+ <xsl:attribute name="fox:placement">Block</xsl:attribute>
12439
+ </xsl:if>
12440
+ </xsl:template> <!-- refine_mathml-instream-foreign-object-style -->
12441
+
12404
12442
  <!-- ====== -->
12405
12443
  <!-- formula -->
12406
12444
  <!-- ====== -->
@@ -12416,7 +12454,7 @@
12416
12454
  </xsl:if>
12417
12455
  <fo:block-container margin-left="0mm" role="SKIP">
12418
12456
  <xsl:call-template name="setNamedDestination"/>
12419
- <fo:block id="{@id}">
12457
+ <fo:block id="{@id}" role="SKIP">
12420
12458
  <xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/> <!-- formula's number will be process in 'stem' template -->
12421
12459
  </fo:block>
12422
12460
  </fo:block-container>
@@ -12449,22 +12487,22 @@
12449
12487
 
12450
12488
  <xsl:call-template name="refine_formula-style"/>
12451
12489
 
12452
- <fo:table table-layout="fixed" width="100%">
12490
+ <fo:table table-layout="fixed" width="100%" role="SKIP">
12453
12491
  <fo:table-column column-width="95%"/>
12454
12492
  <fo:table-column column-width="5%"/>
12455
- <fo:table-body>
12456
- <fo:table-row>
12457
- <fo:table-cell display-align="center">
12458
- <fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
12493
+ <fo:table-body role="SKIP">
12494
+ <fo:table-row role="SKIP">
12495
+ <fo:table-cell display-align="center" role="SKIP">
12496
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style">
12459
12497
 
12460
12498
  <xsl:call-template name="refine_formula-stem-block-style"/>
12461
12499
 
12462
12500
  <xsl:apply-templates/>
12463
12501
  </fo:block>
12464
12502
  </fo:table-cell>
12465
- <fo:table-cell display-align="center">
12503
+ <fo:table-cell display-align="center" role="SKIP">
12466
12504
 
12467
- <fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
12505
+ <fo:block xsl:use-attribute-sets="formula-stem-number-style">
12468
12506
 
12469
12507
  <xsl:for-each select="../mn:fmt-name">
12470
12508
  <xsl:call-template name="setIDforNamedDestination"/>
@@ -12612,9 +12650,9 @@
12612
12650
  <xsl:apply-templates select="." mode="mathml"/>
12613
12651
  </xsl:variable>
12614
12652
 
12615
- <fo:instream-foreign-object fox:alt-text="Math" fox:actual-text="Math">
12653
+ <fo:instream-foreign-object xsl:use-attribute-sets="mathml-instream-foreign-object-style">
12616
12654
 
12617
- <xsl:call-template name="refine_mathml_insteam_object_style"/>
12655
+ <xsl:call-template name="refine_mathml-instream-foreign-object-style"/>
12618
12656
 
12619
12657
  <xsl:if test="$isGenerateTableIF = 'false'">
12620
12658
  <!-- put MathML in Actual Text -->
@@ -12638,9 +12676,6 @@
12638
12676
  </fo:instream-foreign-object>
12639
12677
  </xsl:template>
12640
12678
 
12641
- <xsl:template name="refine_mathml_insteam_object_style">
12642
- </xsl:template> <!-- refine_mathml_insteam_object_style -->
12643
-
12644
12679
  <xsl:template match="mathml:*" mode="mathml_actual_text">
12645
12680
  <!-- <xsl:text>a+b</xsl:text> -->
12646
12681
  <xsl:text>&lt;</xsl:text>
@@ -13773,8 +13808,10 @@
13773
13808
 
13774
13809
  </xsl:template> <!-- references[not(@normative='true')]/bibitem -->
13775
13810
 
13811
+ <!-- commented 2026-08-06: from https://github.com/metanorma/metanorma-standoc/issues/1140:
13812
+ 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. -->
13776
13813
  <!-- bibitem's notes will be processing in 'processBibitemFollowingNotes' -->
13777
- <xsl:template match="mn:references/mn:note" priority="2"/> <!-- [not(@normative='true')] -->
13814
+ <!-- <xsl:template match="mn:references/mn:note" priority="2"/>--> <!-- [not(@normative='true')] -->
13778
13815
 
13779
13816
  <xsl:template name="insertListItem_Bibitem">
13780
13817
  <xsl:choose>
@@ -14524,7 +14561,7 @@
14524
14561
  <xsl:call-template name="set_id_metanorma_form_item">
14525
14562
  <xsl:with-param name="form_item_type" select="$form_item_type"/>
14526
14563
  </xsl:call-template>
14527
- <fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
14564
+ <fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%" fox:placement="Inline">
14528
14565
  <xsl:attribute name="height">3.5mm</xsl:attribute>
14529
14566
  <xsl:attribute name="content-width">100%</xsl:attribute>
14530
14567
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -14551,7 +14588,7 @@
14551
14588
  <xsl:call-template name="set_id_metanorma_form_item">
14552
14589
  <xsl:with-param name="form_item_type" select="$form_item_type"/>
14553
14590
  </xsl:call-template>
14554
- <fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
14591
+ <fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%" fox:placement="Inline">
14555
14592
  <xsl:attribute name="height">3.5mm</xsl:attribute>
14556
14593
  <xsl:attribute name="content-width">100%</xsl:attribute>
14557
14594
  <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -14830,7 +14867,9 @@
14830
14867
  </xsl:variable>
14831
14868
  <mnx:example id="{@id}" alt-text="{normalize-space($example_name)}">
14832
14869
  <xsl:element name="fmt-name" namespace="{$namespace_full}">
14833
- <xsl:value-of select="mn:fmt-xref-label[@container]"/>
14870
+ <xsl:call-template name="capitalize"><!-- https://github.com/metanorma/metanorma-pdfa/issues/72 -->
14871
+ <xsl:with-param name="str" select="mn:fmt-xref-label[@container]"/>
14872
+ </xsl:call-template>
14834
14873
  <xsl:if test="normalize-space($example_name) != ''">
14835
14874
  <xsl:value-of select="mn:fmt-name/mn:span[@class = 'fmt-caption-delim']"/>
14836
14875
  <xsl:copy-of select="$example_name"/>
@@ -16652,7 +16691,8 @@
16652
16691
 
16653
16692
  <xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
16654
16693
  <xsl:call-template name="setNamedDestination"/>
16655
- <fo:block>
16694
+ <fo:block role="Sect">
16695
+ <xsl:call-template name="addTagElementT"/>
16656
16696
  <xsl:call-template name="setId"/>
16657
16697
  <xsl:call-template name="addReviewHelper"/>
16658
16698
  <xsl:apply-templates/>
@@ -16741,7 +16781,7 @@
16741
16781
 
16742
16782
  <xsl:template match="mn:blacksquare" name="blacksquare">
16743
16783
  <fo:inline padding-right="2.5mm" baseline-shift="5%">
16744
- <fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
16784
+ <fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad" fox:placement="Inline">
16745
16785
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 2 2">
16746
16786
  <rect x="0" y="0" width="2" height="2" fill="black"/>
16747
16787
  </svg>
@@ -17697,13 +17737,13 @@
17697
17737
  <xsl:param name="bitmap_width" select="$pageWidth"/>
17698
17738
  <xsl:choose>
17699
17739
  <xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
17700
- <fo:instream-foreign-object fox:alt-text="Image Front">
17740
+ <fo:instream-foreign-object fox:alt-text="Image Front" fox:placement="Block">
17701
17741
  <xsl:attribute name="content-height"><xsl:value-of select="$svg_content_height"/>mm</xsl:attribute>
17702
17742
  <xsl:call-template name="getSVG"/>
17703
17743
  </fo:instream-foreign-object>
17704
17744
  </xsl:when>
17705
17745
  <xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
17706
- <fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
17746
+ <fo:external-graphic src="{@src}" fox:alt-text="Image Front" fox:placement="Block"/>
17707
17747
  </xsl:when>
17708
17748
  <xsl:otherwise> <!-- bitmap image -->
17709
17749
  <xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
@@ -17713,7 +17753,7 @@
17713
17753
  <xsl:with-param name="src" select="$coverimage_src"/>
17714
17754
  </xsl:call-template>
17715
17755
  </xsl:variable>
17716
- <fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
17756
+ <fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front" fox:placement="Block"/>
17717
17757
  </xsl:if>
17718
17758
  </xsl:otherwise>
17719
17759
  </xsl:choose>