metanorma-cc 2.8.9 → 2.8.10

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: cff8c8e6a4774b9702898a6535121d7e7fa776f82fd8c3a9f7d3c4850a98d96b
4
- data.tar.gz: eb0f1f93e45c4e3b036e3f4d39a3886c94bfe452b97d43c066ce74987859f966
3
+ metadata.gz: 7fe64bc652ee4d4faee03d8d6a49c08ee041232a7b8165fb24d8a737ebf3638b
4
+ data.tar.gz: d9dac22b9636b91df75eb13b27add51e5812a64becad8b5dbca27afa630c7d0e
5
5
  SHA512:
6
- metadata.gz: 7713d279a188d4cfdf30df080724e4f3acd98ac165d79f5182e3ef861472faf20c944cf64de9ae260edee488c22c221edd3d8a7770dd3c5c99659bd7db34c133
7
- data.tar.gz: d7b00805a00f7f69ba0ea28900c333a7898654d4d7c6ee90307b8fc52e4df1a5ec7000f713acf96b5b25244e9055cfebd99b1b45f827db751e79e931375d7c26
6
+ metadata.gz: 1f72c9331c18ab8c63508bc03047cf700f8038b9ee592b665d2569e145a4a5d07c57b7364c89e95c614c0e46f9f0424f5aa63b6d200af69b9f826ce94fe5001e
7
+ data.tar.gz: a15b116455d643d1963818d0f68616957ec9396c173f65e213b2632b16b8d9a44b4af9c9249ffe5a5d9641a0c8e07a308146c04438d2d440f16eaa0976fe65cb
data/.rubocop.yml CHANGED
@@ -2,6 +2,15 @@
2
2
  # See https://github.com/metanorma/cimas
3
3
  inherit_from:
4
4
  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
5
+ # .rubocop_todo.yml MUST be the last entry. inherit_from is last-wins:
6
+ # if listed before oss-guides, the shared config's stricter Metrics/
7
+ # (MethodLength, BlockLength, etc.) rules override the todo's per-file
8
+ # grandfathering, and the todo becomes inert on those cops. Empirically
9
+ # verified on suma 2026-07-06: with todo listed first, 34 Metrics/* offenses
10
+ # remained; moved last, cleared. Every gem in the metanorma-org fleet
11
+ # already ships a `.rubocop_todo.yml` on its live tree (audited 2026-07-06,
12
+ # 54/54 have it), so this reference is safe to emit unconditionally.
13
+ - .rubocop_todo.yml
5
14
 
6
15
  # Rubocop plugins enabled centrally so every metanorma-org gem picks them up
7
16
  # on cimas sync — best practice belongs at the shared-template layer, not
@@ -449,7 +449,11 @@
449
449
  <xsl:call-template name="setAltText">
450
450
  <xsl:with-param name="value" select="@alt-text"/>
451
451
  </xsl:call-template>
452
- <xsl:apply-templates select="." mode="contents"/>
452
+ <xsl:variable name="item">
453
+ <!-- mnx:table/mn:fmt-name, mnx:figure/mn:fmt-name, mnx:example/mn:fmt-name -->
454
+ <xsl:apply-templates select="mn:fmt-name" mode="contents_item"/>
455
+ </xsl:variable>
456
+ <xsl:apply-templates select="xalan:nodeset($item)/node()"/>
453
457
  <fo:inline keep-together.within-line="always" role="SKIP">
454
458
  <fo:leader xsl:use-attribute-sets="toc-leader-style"><xsl:call-template name="refine_toc-leader-style"/></fo:leader>
455
459
  <fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
@@ -515,7 +519,7 @@
515
519
  <!-- List of Tables -->
516
520
  <xsl:if test="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
517
521
  <xsl:call-template name="insertListOf_Title">
518
- <xsl:with-param name="title" select="$title-list-tables"/>
522
+ <xsl:with-param name="title" select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-tables"/>
519
523
  </xsl:call-template>
520
524
  <fo:block role="TOC">
521
525
  <xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:tables/mnx:table">
@@ -527,7 +531,7 @@
527
531
  <!-- List of Figures -->
528
532
  <xsl:if test="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
529
533
  <xsl:call-template name="insertListOf_Title">
530
- <xsl:with-param name="title" select="$title-list-figures"/>
534
+ <xsl:with-param name="title" select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-figures"/>
531
535
  </xsl:call-template>
532
536
  <fo:block role="TOC">
533
537
  <xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:figures/mnx:figure">
@@ -539,7 +543,7 @@
539
543
  <!-- List of Examples -->
540
544
  <xsl:if test="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
541
545
  <xsl:call-template name="insertListOf_Title">
542
- <xsl:with-param name="title" select="$title-list-examples"/>
546
+ <xsl:with-param name="title" select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-examples"/>
543
547
  </xsl:call-template>
544
548
  <fo:block role="TOC">
545
549
  <xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
@@ -926,45 +930,59 @@
926
930
 
927
931
  <xsl:variable name="ace_tag">ace-tag_</xsl:variable>
928
932
 
929
- <xsl:variable name="title-list-tables">
930
- <xsl:variable name="toc_table_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='table']/mn:title"/>
931
- <xsl:value-of select="$toc_table_title"/>
932
- <xsl:if test="normalize-space($toc_table_title) = ''">
933
- <xsl:call-template name="getLocalizedString">
934
- <xsl:with-param name="key">toc_tables</xsl:with-param>
935
- </xsl:call-template>
936
- </xsl:if>
937
- </xsl:variable>
933
+ <xsl:variable name="toc_title_lists_">
934
+ <xsl:for-each select="//mn:metanorma">
935
+ <xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
936
+ <xsl:variable name="docid"><xsl:call-template name="getDocumentId"/></xsl:variable>
937
+ <xsl:variable name="current_document">
938
+ <xsl:copy-of select="."/>
939
+ </xsl:variable>
940
+ <xsl:for-each select="xalan:nodeset($current_document)">
941
+ <mnx:doc id="{$docid}" num="{$num}">
942
+ <mnx:title-list-tables>
943
+ <xsl:variable name="toc_table_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='table']/mn:title"/>
944
+ <xsl:value-of select="$toc_table_title"/>
945
+ <xsl:if test="normalize-space($toc_table_title) = ''">
946
+ <xsl:call-template name="getLocalizedString">
947
+ <xsl:with-param name="key">toc_tables</xsl:with-param>
948
+ </xsl:call-template>
949
+ </xsl:if>
950
+ </mnx:title-list-tables>
938
951
 
939
- <xsl:variable name="title-list-figures">
940
- <xsl:variable name="toc_figure_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title"/>
941
- <xsl:value-of select="$toc_figure_title"/>
942
- <xsl:if test="normalize-space($toc_figure_title) = ''">
943
- <xsl:call-template name="getLocalizedString">
944
- <xsl:with-param name="key">toc_figures</xsl:with-param>
945
- </xsl:call-template>
946
- </xsl:if>
947
- </xsl:variable>
952
+ <mnx:title-list-figures>
953
+ <xsl:variable name="toc_figure_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='figure']/mn:title"/>
954
+ <xsl:value-of select="$toc_figure_title"/>
955
+ <xsl:if test="normalize-space($toc_figure_title) = ''">
956
+ <xsl:call-template name="getLocalizedString">
957
+ <xsl:with-param name="key">toc_figures</xsl:with-param>
958
+ </xsl:call-template>
959
+ </xsl:if>
960
+ </mnx:title-list-figures>
948
961
 
949
- <xsl:variable name="title-list-examples">
950
- <xsl:variable name="toc_example_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title"/>
951
- <xsl:value-of select="$toc_example_title"/>
952
- <xsl:if test="normalize-space($toc_example_title) = ''">
953
- <xsl:call-template name="getLocalizedString">
954
- <xsl:with-param name="key">toc_examples</xsl:with-param>
955
- </xsl:call-template>
956
- </xsl:if>
957
- </xsl:variable>
962
+ <mnx:title-list-examples>
963
+ <xsl:variable name="toc_example_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='example']/mn:title"/>
964
+ <xsl:value-of select="$toc_example_title"/>
965
+ <xsl:if test="normalize-space($toc_example_title) = ''">
966
+ <xsl:call-template name="getLocalizedString">
967
+ <xsl:with-param name="key">toc_examples</xsl:with-param>
968
+ </xsl:call-template>
969
+ </xsl:if>
970
+ </mnx:title-list-examples>
958
971
 
959
- <xsl:variable name="title-list-recommendations">
960
- <xsl:variable name="toc_requirement_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='requirement']/mn:title"/>
961
- <xsl:value-of select="$toc_requirement_title"/>
962
- <xsl:if test="normalize-space($toc_requirement_title) = ''">
963
- <xsl:call-template name="getLocalizedString">
964
- <xsl:with-param name="key">toc_recommendations</xsl:with-param>
965
- </xsl:call-template>
966
- </xsl:if>
972
+ <mnx:title-list-recommendations>
973
+ <xsl:variable name="toc_requirement_title" select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='requirement']/mn:title"/>
974
+ <xsl:value-of select="$toc_requirement_title"/>
975
+ <xsl:if test="normalize-space($toc_requirement_title) = ''">
976
+ <xsl:call-template name="getLocalizedString">
977
+ <xsl:with-param name="key">toc_recommendations</xsl:with-param>
978
+ </xsl:call-template>
979
+ </xsl:if>
980
+ </mnx:title-list-recommendations>
981
+ </mnx:doc>
982
+ </xsl:for-each>
983
+ </xsl:for-each>
967
984
  </xsl:variable>
985
+ <xsl:variable name="toc_title_lists" select="xalan:nodeset($toc_title_lists_)"/>
968
986
 
969
987
  <xsl:variable name="bibdata">
970
988
  <xsl:copy-of select="//mn:metanorma/mn:bibdata"/>
@@ -1757,7 +1775,7 @@
1757
1775
  <xsl:apply-templates mode="update_xml_step1"/>
1758
1776
  </xsl:template>
1759
1777
 
1760
- <xsl:template match="mn:semx" mode="update_xml_step1">
1778
+ <xsl:template match="mn:semx[not(@element = 'name')]" mode="update_xml_step1">
1761
1779
  <xsl:apply-templates mode="update_xml_step1"/>
1762
1780
  </xsl:template>
1763
1781
 
@@ -2040,7 +2058,7 @@
2040
2058
  <xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
2041
2059
  <xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
2042
2060
 
2043
- <xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or ancestor::mn:sourcecode or (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or ancestor::mn:name or ancestor::mn:fmt-name or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
2061
+ <xsl:template match="text()[not( (ancestor::mn:bibdata and not(ancestor::mn:title)) or ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or ancestor::mn:sourcecode or (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or ancestor::mn:name or (ancestor::mn:fmt-name and not(ancestor::mn:semx[@element = 'name'])) or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
2044
2062
 
2045
2063
  <xsl:variable name="parent" select="local-name(..)"/>
2046
2064
 
@@ -2085,7 +2103,7 @@
2085
2103
  <xsl:variable name="text">
2086
2104
  <xsl:element name="text" namespace="{$namespace_full}">
2087
2105
  <xsl:choose>
2088
- <xsl:when test="ancestor::mn:table"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
2106
+ <xsl:when test="ancestor::mn:table and not(ancestor::mn:fmt-name)"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
2089
2107
  <xsl:otherwise>
2090
2108
  <xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
2091
2109
  <!-- <xsl:value-of select="$text__"/> -->
@@ -2163,6 +2181,10 @@
2163
2181
  <xsl:copy-of select="."/>
2164
2182
  </xsl:template>
2165
2183
 
2184
+ <xsl:template match="mn:semx" mode="update_xml_enclose_keep-together_within-line">
2185
+ <xsl:apply-templates mode="update_xml_enclose_keep-together_within-line"/>
2186
+ </xsl:template>
2187
+
2166
2188
  <xsl:template name="replace_text_tags">
2167
2189
  <xsl:param name="tag_open"/>
2168
2190
  <xsl:param name="tag_close"/>
@@ -9409,6 +9431,7 @@
9409
9431
  <xsl:variable name="svg_content">
9410
9432
  <xsl:apply-templates select="." mode="svg_update"/>
9411
9433
  </xsl:variable>
9434
+ <!-- <svg_content><xsl:copy-of select="$svg_content"/></svg_content> -->
9412
9435
 
9413
9436
  <xsl:variable name="alt-text">
9414
9437
  <xsl:choose>
@@ -9623,7 +9646,7 @@
9623
9646
  </xsl:copy>
9624
9647
  </xsl:template>
9625
9648
 
9626
- <xsl:template match="mn:image/@href" mode="svg_update">
9649
+ <xsl:template match="*[local-name() = 'image']/@href" mode="svg_update">
9627
9650
  <xsl:attribute name="href" namespace="http://www.w3.org/1999/xlink">
9628
9651
  <xsl:value-of select="."/>
9629
9652
  </xsl:attribute>
@@ -12207,13 +12230,13 @@
12207
12230
 
12208
12231
  <xsl:template name="processTablesFigures_Contents">
12209
12232
  <xsl:param name="always"/>
12210
- <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='table']/mn:title) or normalize-space($always) = 'true'">
12233
+ <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='table']/mn:title) or normalize-space($always) = 'true'">
12211
12234
  <xsl:call-template name="processTables_Contents"/>
12212
12235
  </xsl:if>
12213
- <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
12236
+ <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
12214
12237
  <xsl:call-template name="processFigures_Contents"/>
12215
12238
  </xsl:if>
12216
- <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
12239
+ <xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:toc[@type='example']/mn:title)">
12217
12240
  <xsl:call-template name="processExamples_Contents"/>
12218
12241
  </xsl:if>
12219
12242
  </xsl:template>
@@ -12264,22 +12287,22 @@
12264
12287
 
12265
12288
  <xsl:template name="processExamples_Contents">
12266
12289
  <mnx:examples>
12267
- <xsl:for-each select="//mn:example[@id and mn:fmt-name and not(@unnumbered = 'true') and normalize-space(@id) != '']">
12268
- <xsl:choose>
12269
- <xsl:when test="mn:fmt-name">
12270
- <xsl:variable name="fmt_name">
12271
- <xsl:apply-templates select="mn:fmt-name" mode="update_xml_step1"/>
12272
- </xsl:variable>
12273
- <mnx:example id="{@id}" alt-text="{normalize-space($fmt_name)}">
12274
- <xsl:copy-of select="$fmt_name"/>
12275
- </mnx:example>
12276
- </xsl:when>
12277
- <xsl:otherwise>
12278
- <mnx:example id="{@id}" alt-text="{mn:name}">
12279
- <xsl:copy-of select="mn:name"/>
12280
- </mnx:example>
12281
- </xsl:otherwise>
12282
- </xsl:choose>
12290
+ <xsl:for-each select="//mn:example[@id and mn:fmt-name and normalize-space(@id) != '']">
12291
+ <!-- https://github.com/metanorma/metanorma-pdfa/issues/32#issuecomment-4929133938:
12292
+ //example/fmt-xref-label[@container] + //example/fmt-name/span[@class = 'fmt-caption-delim'] + //example/name,
12293
+ with the last two elements dropped if //example/name does not exist. -->
12294
+ <xsl:variable name="example_name">
12295
+ <xsl:apply-templates select="mn:name/node()" mode="update_xml_step1"/>
12296
+ </xsl:variable>
12297
+ <mnx:example id="{@id}" alt-text="{normalize-space($example_name)}">
12298
+ <xsl:element name="fmt-name" namespace="{$namespace_full}">
12299
+ <xsl:value-of select="mn:fmt-xref-label[@container]"/>
12300
+ <xsl:if test="normalize-space($example_name) != ''">
12301
+ <xsl:value-of select="mn:fmt-name/mn:span[@class = 'fmt-caption-delim']"/>
12302
+ <xsl:copy-of select="$example_name"/>
12303
+ </xsl:if>
12304
+ </xsl:element>
12305
+ </mnx:example>
12283
12306
  </xsl:for-each>
12284
12307
  </mnx:examples>
12285
12308
  </xsl:template>
@@ -12552,15 +12575,18 @@
12552
12575
 
12553
12576
  <xsl:call-template name="insertFigureBookmarks">
12554
12577
  <xsl:with-param name="contents" select="mnx:contents"/>
12578
+ <xsl:with-param name="num" select="@num"/>
12555
12579
  </xsl:call-template>
12556
12580
 
12557
12581
  <xsl:call-template name="insertTableBookmarks">
12558
12582
  <xsl:with-param name="contents" select="mnx:contents"/>
12583
+ <xsl:with-param name="num" select="@num"/>
12559
12584
  <xsl:with-param name="lang" select="@lang"/>
12560
12585
  </xsl:call-template>
12561
12586
 
12562
12587
  <xsl:call-template name="insertExampleBookmarks">
12563
12588
  <xsl:with-param name="contents" select="mnx:contents"/>
12589
+ <xsl:with-param name="num" select="@num"/>
12564
12590
  <xsl:with-param name="lang" select="@lang"/>
12565
12591
  </xsl:call-template>
12566
12592
 
@@ -12575,15 +12601,18 @@
12575
12601
 
12576
12602
  <xsl:call-template name="insertFigureBookmarks">
12577
12603
  <xsl:with-param name="contents" select="mnx:contents"/>
12604
+ <xsl:with-param name="num" select="@num"/>
12578
12605
  </xsl:call-template>
12579
12606
 
12580
12607
  <xsl:call-template name="insertTableBookmarks">
12581
12608
  <xsl:with-param name="contents" select="mnx:contents"/>
12609
+ <xsl:with-param name="num" select="@num"/>
12582
12610
  <xsl:with-param name="lang" select="@lang"/>
12583
12611
  </xsl:call-template>
12584
12612
 
12585
12613
  <xsl:call-template name="insertExampleBookmarks">
12586
12614
  <xsl:with-param name="contents" select="mnx:contents"/>
12615
+ <xsl:with-param name="num" select="@num"/>
12587
12616
  <xsl:with-param name="lang" select="@lang"/>
12588
12617
  </xsl:call-template>
12589
12618
 
@@ -12596,15 +12625,18 @@
12596
12625
 
12597
12626
  <xsl:call-template name="insertFigureBookmarks">
12598
12627
  <xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
12628
+ <xsl:with-param name="num" select="@num"/>
12599
12629
  </xsl:call-template>
12600
12630
 
12601
12631
  <xsl:call-template name="insertTableBookmarks">
12602
12632
  <xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
12633
+ <xsl:with-param name="num" select="@num"/>
12603
12634
  <xsl:with-param name="lang" select="@lang"/>
12604
12635
  </xsl:call-template>
12605
12636
 
12606
12637
  <xsl:call-template name="insertExampleBookmarks">
12607
12638
  <xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
12639
+ <xsl:with-param name="num" select="@num"/>
12608
12640
  <xsl:with-param name="lang" select="@lang"/>
12609
12641
  </xsl:call-template>
12610
12642
 
@@ -12620,6 +12652,7 @@
12620
12652
 
12621
12653
  <xsl:template name="insertFigureBookmarks">
12622
12654
  <xsl:param name="contents"/>
12655
+ <xsl:param name="num"/>
12623
12656
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
12624
12657
  <xsl:if test="$contents_nodes/mnx:figure">
12625
12658
  <fo:bookmark internal-destination="{$contents_nodes/mnx:figure[1]/@id}" starting-state="hide">
@@ -12637,7 +12670,7 @@
12637
12670
  <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
12638
12671
 
12639
12672
  <xsl:variable name="bookmark-title">
12640
- <xsl:value-of select="$title-list-figures"/>
12673
+ <xsl:value-of select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-figures"/>
12641
12674
  </xsl:variable>
12642
12675
  <fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
12643
12676
  <xsl:for-each select="$contents_nodes//mnx:figures/mnx:figure">
@@ -12651,6 +12684,7 @@
12651
12684
 
12652
12685
  <xsl:template name="insertTableBookmarks">
12653
12686
  <xsl:param name="contents"/>
12687
+ <xsl:param name="num"/>
12654
12688
  <xsl:param name="lang"/>
12655
12689
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
12656
12690
  <xsl:if test="$contents_nodes/mnx:table">
@@ -12674,7 +12708,7 @@
12674
12708
  <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
12675
12709
 
12676
12710
  <xsl:variable name="bookmark-title">
12677
- <xsl:value-of select="$title-list-tables"/>
12711
+ <xsl:value-of select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-tables"/>
12678
12712
  </xsl:variable>
12679
12713
 
12680
12714
  <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
@@ -12689,8 +12723,9 @@
12689
12723
  </xsl:if>
12690
12724
  </xsl:template> <!-- insertTableBookmarks -->
12691
12725
 
12692
- <xsl:template name="insertExampleBookmarks">
12726
+ <xsl:template name="insertExampleBookmarks">
12693
12727
  <xsl:param name="contents"/>
12728
+ <xsl:param name="num"/>
12694
12729
  <xsl:param name="lang"/>
12695
12730
  <xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
12696
12731
  <xsl:if test="$contents_nodes/mnx:example">
@@ -12714,7 +12749,7 @@
12714
12749
  <fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
12715
12750
 
12716
12751
  <xsl:variable name="bookmark-title">
12717
- <xsl:value-of select="$title-list-examples"/>
12752
+ <xsl:value-of select="$toc_title_lists/mnx:doc[@num = $num]/mnx:title-list-examples"/>
12718
12753
  </xsl:variable>
12719
12754
 
12720
12755
  <fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
@@ -12875,6 +12910,18 @@
12875
12910
  </xsl:copy>
12876
12911
  </xsl:template>
12877
12912
 
12913
+ <xsl:template match="mn:tt" mode="contents_item">
12914
+ <xsl:copy>
12915
+ <xsl:apply-templates mode="contents_item"/>
12916
+ </xsl:copy>
12917
+ </xsl:template>
12918
+
12919
+ <xsl:template match="*[local-name() = 'keep-together_within-line']" mode="contents_item">
12920
+ <xsl:copy>
12921
+ <xsl:apply-templates mode="contents_item"/>
12922
+ </xsl:copy>
12923
+ </xsl:template>
12924
+
12878
12925
  <xsl:template match="mn:stem" mode="contents_item"/>
12879
12926
  <xsl:template match="mn:fmt-stem" mode="contents_item">
12880
12927
  <xsl:copy-of select="."/>
@@ -143,6 +143,11 @@ a.FootnoteRef, span.FootnoteRef {
143
143
  vertical-align: super;
144
144
  }
145
145
 
146
+ a.TableFootnoteRef, a.FootnoteRef, a.footnote-number,
147
+ sup a, a:has(> sup) {
148
+ vertical-align: baseline;
149
+ }
150
+
146
151
  .addition {
147
152
  color: blue;
148
153
  }
@@ -143,6 +143,11 @@ a.FootnoteRef, span.FootnoteRef {
143
143
  vertical-align: super;
144
144
  }
145
145
 
146
+ a.TableFootnoteRef, a.FootnoteRef, a.footnote-number,
147
+ sup a, a:has(> sup) {
148
+ vertical-align: baseline;
149
+ }
150
+
146
151
  .addition {
147
152
  color: blue;
148
153
  }
@@ -1931,7 +1931,7 @@ or as the string "auto"</a:documentation>
1931
1931
  </element>
1932
1932
  </define>
1933
1933
  <define name="mathml">
1934
- <a:documentation>Encoding of MathML: the official W3C MathML 3.0 grammar (namespace
1934
+ <a:documentation>Encoding of MathML: the official W3C MathML 4 grammar (namespace
1935
1935
  http://www.w3.org/1998/Math/MathML), via the metanorma wrapper in
1936
1936
  grammars/mathml/. See grammars/mathml/README.adoc and basicdoc-models#35.</a:documentation>
1937
1937
  <externalRef href="metanorma-mathml.rng"/>