metanorma-cc 2.8.6 → 2.8.9
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/.rubocop.yml +14 -2
- data/lib/isodoc/cc/cc.standard.xsl +199 -25
- data/lib/isodoc/cc/html/htmlstyle.css +3 -1
- data/lib/metanorma/cc/basicdoc.rng +40 -6
- data/lib/metanorma/cc/biblio.rng +8 -12
- data/lib/metanorma/cc/isodoc.rng +60 -9
- data/lib/metanorma/cc/mathml3-common.rng +257 -0
- data/lib/metanorma/cc/mathml3-content.rng +1544 -0
- data/lib/metanorma/cc/mathml3-presentation.rng +2324 -0
- data/lib/metanorma/cc/mathml3-strict-content.rng +205 -0
- data/lib/metanorma/cc/mathml3.rng +23 -0
- data/lib/metanorma/cc/metanorma-mathml.rng +45 -0
- data/lib/metanorma/cc/reqt.rng +19 -3
- data/lib/metanorma/cc/version.rb +1 -1
- data/metanorma-cc.gemspec +1 -1
- metadata +10 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cff8c8e6a4774b9702898a6535121d7e7fa776f82fd8c3a9f7d3c4850a98d96b
|
|
4
|
+
data.tar.gz: eb0f1f93e45c4e3b036e3f4d39a3886c94bfe452b97d43c066ce74987859f966
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7713d279a188d4cfdf30df080724e4f3acd98ac165d79f5182e3ef861472faf20c944cf64de9ae260edee488c22c221edd3d8a7770dd3c5c99659bd7db34c133
|
|
7
|
+
data.tar.gz: d7b00805a00f7f69ba0ea28900c333a7898654d4d7c6ee90307b8fc52e4df1a5ec7000f713acf96b5b25244e9055cfebd99b1b45f827db751e79e931375d7c26
|
data/.rubocop.yml
CHANGED
|
@@ -1,10 +1,22 @@
|
|
|
1
1
|
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
2
|
# See https://github.com/metanorma/cimas
|
|
3
3
|
inherit_from:
|
|
4
|
-
- https://raw.githubusercontent.com/riboseinc/oss-guides/
|
|
4
|
+
- https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
|
|
5
|
+
|
|
6
|
+
# Rubocop plugins enabled centrally so every metanorma-org gem picks them up
|
|
7
|
+
# on cimas sync — best practice belongs at the shared-template layer, not
|
|
8
|
+
# per-repo. Per ronaldtse feedback on metanorma/ci#332.
|
|
9
|
+
plugins:
|
|
10
|
+
- rubocop-rspec
|
|
11
|
+
- rubocop-performance
|
|
12
|
+
- rubocop-rake
|
|
5
13
|
|
|
6
14
|
# local repo-specific modifications
|
|
7
15
|
# ...
|
|
8
16
|
|
|
9
17
|
AllCops:
|
|
10
|
-
|
|
18
|
+
# 3.3 matches the org-wide minimum being pushed via #274 (Raise minimum
|
|
19
|
+
# Ruby version to 3.3 due to EOL of 3.2 on 2026-03-31). Was 3.4 before
|
|
20
|
+
# this commit — 3.4 was above the org's stated minimum and would have
|
|
21
|
+
# applied Rubocop rules that fail-close on gems still targeting 3.3.
|
|
22
|
+
TargetRubyVersion: 3.3
|
|
@@ -535,6 +535,18 @@
|
|
|
535
535
|
</xsl:for-each>
|
|
536
536
|
</fo:block>
|
|
537
537
|
</xsl:if>
|
|
538
|
+
|
|
539
|
+
<!-- List of Examples -->
|
|
540
|
+
<xsl:if test="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
|
|
541
|
+
<xsl:call-template name="insertListOf_Title">
|
|
542
|
+
<xsl:with-param name="title" select="$title-list-examples"/>
|
|
543
|
+
</xsl:call-template>
|
|
544
|
+
<fo:block role="TOC">
|
|
545
|
+
<xsl:for-each select="$contents/mnx:doc[@num = $num]//mnx:examples/mnx:example">
|
|
546
|
+
<xsl:call-template name="insertListOf_Item"/>
|
|
547
|
+
</xsl:for-each>
|
|
548
|
+
</fo:block>
|
|
549
|
+
</xsl:if>
|
|
538
550
|
</xsl:if>
|
|
539
551
|
</fo:block>
|
|
540
552
|
</fo:block-container>
|
|
@@ -542,6 +554,7 @@
|
|
|
542
554
|
|
|
543
555
|
<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
|
|
544
556
|
<fo:block xsl:use-attribute-sets="toc-title-style">
|
|
557
|
+
<xsl:call-template name="refine_toc-title-style"/>
|
|
545
558
|
<xsl:apply-templates/>
|
|
546
559
|
</fo:block>
|
|
547
560
|
</xsl:template>
|
|
@@ -933,6 +946,16 @@
|
|
|
933
946
|
</xsl:if>
|
|
934
947
|
</xsl:variable>
|
|
935
948
|
|
|
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>
|
|
958
|
+
|
|
936
959
|
<xsl:variable name="title-list-recommendations">
|
|
937
960
|
<xsl:variable name="toc_requirement_title" select="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='requirement']/mn:title"/>
|
|
938
961
|
<xsl:value-of select="$toc_requirement_title"/>
|
|
@@ -1814,6 +1837,14 @@
|
|
|
1814
1837
|
|
|
1815
1838
|
<xsl:template match="@semx-id | @anchor" mode="update_xml_step1"/>
|
|
1816
1839
|
|
|
1840
|
+
<xsl:template match="mn:pagebreak" mode="update_xml_step1">
|
|
1841
|
+
<xsl:copy>
|
|
1842
|
+
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
|
1843
|
+
<xsl:attribute name="from_source_xml">true</xsl:attribute>
|
|
1844
|
+
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
|
1845
|
+
</xsl:copy>
|
|
1846
|
+
</xsl:template>
|
|
1847
|
+
|
|
1817
1848
|
<!-- END: update new Presentation XML -->
|
|
1818
1849
|
|
|
1819
1850
|
<!-- =========================================================================== -->
|
|
@@ -1851,6 +1882,7 @@
|
|
|
1851
1882
|
<xsl:for-each select="ancestor-or-self::*[ancestor::mn:preface or ancestor::mn:sections or ancestor-or-self::mn:annex]">
|
|
1852
1883
|
<xsl:if test="following-sibling::*">false</xsl:if>
|
|
1853
1884
|
</xsl:for-each>
|
|
1885
|
+
<xsl:if test="@from_source_xml = 'true'">false</xsl:if>
|
|
1854
1886
|
</xsl:variable>
|
|
1855
1887
|
|
|
1856
1888
|
<xsl:if test="contains($isLast, 'false')">
|
|
@@ -2748,6 +2780,7 @@
|
|
|
2748
2780
|
</xsl:attribute-set> <!-- sourcecode-style -->
|
|
2749
2781
|
|
|
2750
2782
|
<xsl:template name="refine_sourcecode-style">
|
|
2783
|
+
<xsl:call-template name="setKeepAttributes"/>
|
|
2751
2784
|
</xsl:template> <!-- refine_sourcecode-style -->
|
|
2752
2785
|
|
|
2753
2786
|
<xsl:attribute-set name="sourcecode-number-style">
|
|
@@ -3485,10 +3518,38 @@
|
|
|
3485
3518
|
<xsl:template name="refine_strike-style">
|
|
3486
3519
|
</xsl:template>
|
|
3487
3520
|
|
|
3521
|
+
<xsl:attribute-set name="hr-block-style">
|
|
3522
|
+
<xsl:attribute name="font-size">1pt</xsl:attribute>
|
|
3523
|
+
<xsl:attribute name="keep-with-previous">always</xsl:attribute>
|
|
3524
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
3525
|
+
<xsl:attribute name="padding-top">-2pt</xsl:attribute>
|
|
3526
|
+
<xsl:attribute name="space-after">4pt</xsl:attribute>
|
|
3527
|
+
</xsl:attribute-set>
|
|
3528
|
+
|
|
3529
|
+
<xsl:template name="refine_hr-block-style">
|
|
3530
|
+
</xsl:template>
|
|
3531
|
+
|
|
3532
|
+
<xsl:attribute-set name="hr-style">
|
|
3533
|
+
<xsl:attribute name="leader-pattern">rule</xsl:attribute>
|
|
3534
|
+
<xsl:attribute name="leader-length">100%</xsl:attribute>
|
|
3535
|
+
</xsl:attribute-set>
|
|
3536
|
+
|
|
3537
|
+
<xsl:template name="refine_hr-style">
|
|
3538
|
+
</xsl:template>
|
|
3539
|
+
|
|
3488
3540
|
<xsl:template match="mn:br">
|
|
3489
3541
|
<xsl:value-of select="$linebreak"/>
|
|
3490
3542
|
</xsl:template>
|
|
3491
3543
|
|
|
3544
|
+
<xsl:template match="mn:hr">
|
|
3545
|
+
<fo:block xsl:use-attribute-sets="hr-block-style">
|
|
3546
|
+
<xsl:call-template name="refine_hr-block-style"/>
|
|
3547
|
+
<fo:leader xsl:use-attribute-sets="hr-style">
|
|
3548
|
+
<xsl:call-template name="refine_hr-style"/>
|
|
3549
|
+
</fo:leader>
|
|
3550
|
+
</fo:block>
|
|
3551
|
+
</xsl:template>
|
|
3552
|
+
|
|
3492
3553
|
<xsl:template match="mn:em">
|
|
3493
3554
|
<fo:inline xsl:use-attribute-sets="em-style">
|
|
3494
3555
|
<xsl:call-template name="refine_em_style"/>
|
|
@@ -4718,6 +4779,7 @@
|
|
|
4718
4779
|
text line 1
|
|
4719
4780
|
text line 2
|
|
4720
4781
|
-->
|
|
4782
|
+
<xsl:variable name="example_display_in"><!-- don't change here, only for override xsl --></xsl:variable> <!-- block or inline -->
|
|
4721
4783
|
<xsl:template match="mn:example" name="example">
|
|
4722
4784
|
<xsl:call-template name="setNamedDestination"/>
|
|
4723
4785
|
<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
|
|
@@ -4727,7 +4789,8 @@
|
|
|
4727
4789
|
<xsl:call-template name="refine_example-style"/>
|
|
4728
4790
|
|
|
4729
4791
|
<xsl:variable name="fo_element">
|
|
4730
|
-
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>
|
|
4792
|
+
<xsl:if test=".//mn:table or .//mn:dl or *[not(self::mn:fmt-name)][1][self::mn:sourcecode]">block</xsl:if>
|
|
4793
|
+
<xsl:if test="normalize-space($example_display_in) != ''"><xsl:value-of select="$example_display_in"/></xsl:if>block
|
|
4731
4794
|
</xsl:variable>
|
|
4732
4795
|
|
|
4733
4796
|
<fo:block-container margin-left="0mm" role="SKIP">
|
|
@@ -6270,6 +6333,12 @@
|
|
|
6270
6333
|
<style name="{$key}-left"><xsl:value-of select="$value"/></style>
|
|
6271
6334
|
<style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
|
|
6272
6335
|
</xsl:if>
|
|
6336
|
+
<xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
|
|
6337
|
+
<style name="keep-together.within-page">always</style>
|
|
6338
|
+
</xsl:if>
|
|
6339
|
+
<xsl:if test="$key = 'page-break-after' and $value = 'always'">
|
|
6340
|
+
<style name="break-after">page</style>
|
|
6341
|
+
</xsl:if>
|
|
6273
6342
|
</xsl:for-each>
|
|
6274
6343
|
</xsl:variable>
|
|
6275
6344
|
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
|
@@ -6313,6 +6382,11 @@
|
|
|
6313
6382
|
|
|
6314
6383
|
<fo:block role="SKIP">
|
|
6315
6384
|
|
|
6385
|
+
<xsl:variable name="styles">
|
|
6386
|
+
<styles><xsl:call-template name="setTableStyles"/></styles>
|
|
6387
|
+
</xsl:variable>
|
|
6388
|
+
<xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
|
|
6389
|
+
|
|
6316
6390
|
<xsl:if test="$isGenerateTableIF = 'true'">
|
|
6317
6391
|
<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
|
|
6318
6392
|
</xsl:if>
|
|
@@ -8470,10 +8544,26 @@
|
|
|
8470
8544
|
<!-- ====== -->
|
|
8471
8545
|
<!-- ====== -->
|
|
8472
8546
|
|
|
8473
|
-
<xsl:attribute-set name="quote-style">
|
|
8547
|
+
<xsl:attribute-set name="quote-container-style">
|
|
8474
8548
|
<xsl:attribute name="margin-left">12mm</xsl:attribute>
|
|
8475
8549
|
<xsl:attribute name="margin-right">12mm</xsl:attribute>
|
|
8550
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
8551
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
8552
|
+
</xsl:attribute-set>
|
|
8553
|
+
|
|
8554
|
+
<xsl:template name="refine_quote-container-style">
|
|
8555
|
+
<xsl:if test="parent::mn:note">
|
|
8556
|
+
<xsl:if test="not(ancestor::mn:table)">
|
|
8557
|
+
<xsl:attribute name="margin-left">5mm</xsl:attribute>
|
|
8558
|
+
</xsl:if>
|
|
8559
|
+
</xsl:if>
|
|
8560
|
+
</xsl:template>
|
|
8561
|
+
|
|
8562
|
+
<xsl:attribute-set name="quote-style">
|
|
8563
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
8564
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
8476
8565
|
<xsl:attribute name="margin-top">12pt</xsl:attribute>
|
|
8566
|
+
|
|
8477
8567
|
</xsl:attribute-set> <!-- quote-style -->
|
|
8478
8568
|
|
|
8479
8569
|
<xsl:template name="refine_quote-style">
|
|
@@ -8481,6 +8571,7 @@
|
|
|
8481
8571
|
|
|
8482
8572
|
<xsl:attribute-set name="quote-source-style">
|
|
8483
8573
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
8574
|
+
<xsl:attribute name="margin-right">-12mm</xsl:attribute>
|
|
8484
8575
|
</xsl:attribute-set> <!-- quote-source-style -->
|
|
8485
8576
|
|
|
8486
8577
|
<xsl:template name="refine_quote-source-style">
|
|
@@ -8503,12 +8594,9 @@
|
|
|
8503
8594
|
|
|
8504
8595
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
8505
8596
|
|
|
8506
|
-
<xsl:
|
|
8507
|
-
<xsl:
|
|
8508
|
-
|
|
8509
|
-
</xsl:if>
|
|
8510
|
-
</xsl:if>
|
|
8511
|
-
<fo:block-container margin-left="0mm" role="SKIP">
|
|
8597
|
+
<fo:block-container xsl:use-attribute-sets="quote-container-style">
|
|
8598
|
+
<xsl:call-template name="refine_quote-container-style"/>
|
|
8599
|
+
|
|
8512
8600
|
<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
|
|
8513
8601
|
|
|
8514
8602
|
<xsl:call-template name="refine_quote-style"/>
|
|
@@ -8520,14 +8608,16 @@
|
|
|
8520
8608
|
</fo:block-container>
|
|
8521
8609
|
</fo:block-container>
|
|
8522
8610
|
<xsl:if test="mn:author or mn:fmt-source or mn:attribution">
|
|
8523
|
-
<fo:block
|
|
8524
|
-
<xsl:
|
|
8525
|
-
|
|
8526
|
-
|
|
8527
|
-
|
|
8528
|
-
|
|
8529
|
-
|
|
8530
|
-
|
|
8611
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
8612
|
+
<fo:block xsl:use-attribute-sets="quote-source-style">
|
|
8613
|
+
<xsl:call-template name="refine_quote-source-style"/>
|
|
8614
|
+
<!-- — ISO, ISO 7301:2011, Clause 1 -->
|
|
8615
|
+
<xsl:apply-templates select="mn:author"/>
|
|
8616
|
+
<xsl:apply-templates select="mn:fmt-source"/>
|
|
8617
|
+
<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
|
|
8618
|
+
<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
|
|
8619
|
+
</fo:block>
|
|
8620
|
+
</fo:block-container>
|
|
8531
8621
|
</xsl:if>
|
|
8532
8622
|
|
|
8533
8623
|
</fo:block-container>
|
|
@@ -12016,7 +12106,7 @@
|
|
|
12016
12106
|
<xsl:template name="refine_toc-pagenumber-style">
|
|
12017
12107
|
</xsl:template>
|
|
12018
12108
|
|
|
12019
|
-
<!-- List of Figures, Tables -->
|
|
12109
|
+
<!-- List of Figures, Tables, Examples -->
|
|
12020
12110
|
<xsl:attribute-set name="toc-listof-title-style">
|
|
12021
12111
|
<xsl:attribute name="role">TOCI</xsl:attribute>
|
|
12022
12112
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
|
@@ -12123,6 +12213,9 @@
|
|
|
12123
12213
|
<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='figure']/mn:title) or normalize-space($always) = 'true'">
|
|
12124
12214
|
<xsl:call-template name="processFigures_Contents"/>
|
|
12125
12215
|
</xsl:if>
|
|
12216
|
+
<xsl:if test="(//mn:metanorma/mn:metanorma-extension/mn:toc[@type='example']/mn:title)">
|
|
12217
|
+
<xsl:call-template name="processExamples_Contents"/>
|
|
12218
|
+
</xsl:if>
|
|
12126
12219
|
</xsl:template>
|
|
12127
12220
|
|
|
12128
12221
|
<xsl:template name="processTables_Contents">
|
|
@@ -12169,7 +12262,29 @@
|
|
|
12169
12262
|
</mnx:figures>
|
|
12170
12263
|
</xsl:template>
|
|
12171
12264
|
|
|
12172
|
-
<xsl:template
|
|
12265
|
+
<xsl:template name="processExamples_Contents">
|
|
12266
|
+
<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>
|
|
12283
|
+
</xsl:for-each>
|
|
12284
|
+
</mnx:examples>
|
|
12285
|
+
</xsl:template>
|
|
12286
|
+
|
|
12287
|
+
<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:example/mn:name | mnx:example/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name" mode="contents">
|
|
12173
12288
|
<xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
|
|
12174
12289
|
<xsl:apply-templates mode="contents"/>
|
|
12175
12290
|
<xsl:text> </xsl:text>
|
|
@@ -12178,40 +12293,40 @@
|
|
|
12178
12293
|
|
|
12179
12294
|
<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="contents"/>
|
|
12180
12295
|
|
|
12181
|
-
<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
|
|
12296
|
+
<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:example/mn:fmt-name | mnx:example/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name" mode="contents">
|
|
12182
12297
|
<xsl:apply-templates mode="contents"/>
|
|
12183
12298
|
<xsl:text> </xsl:text>
|
|
12184
12299
|
</xsl:template>
|
|
12185
12300
|
|
|
12186
|
-
<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name | mn:sourcecode/mn:name" mode="bookmarks">
|
|
12301
|
+
<xsl:template match="mn:figure/mn:name | mnx:figure/mn:name | mn:table/mn:name | mnx:table/mn:name | mn:example/mn:name | mnx:example/mn:name | mn:permission/mn:name | mnx:permission/mn:name | mn:recommendation/mn:name | mnx:recommendation/mn:name | mn:requirement/mn:name | mnx:requirement/mn:name | mn:sourcecode/mn:name" mode="bookmarks">
|
|
12187
12302
|
<xsl:if test="not(following-sibling::*[1][self::mn:fmt-name])">
|
|
12188
12303
|
<xsl:apply-templates mode="bookmarks"/>
|
|
12189
12304
|
<xsl:text> </xsl:text>
|
|
12190
12305
|
</xsl:if>
|
|
12191
12306
|
</xsl:template>
|
|
12192
12307
|
|
|
12193
|
-
<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name | mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
|
|
12308
|
+
<xsl:template match="mn:figure/mn:fmt-name | mnx:figure/mn:fmt-name | mn:table/mn:fmt-name | mnx:table/mn:fmt-name | mn:example/mn:fmt-name | mnx:example/mn:fmt-name | mn:permission/mn:fmt-name | mnx:permission/mn:fmt-name | mn:recommendation/mn:fmt-name | mnx:recommendation/mn:fmt-name | mn:requirement/mn:fmt-name | mnx:requirement/mn:fmt-name | mn:sourcecode/mn:fmt-name | mnx:sourcecode/mn:fmt-name" mode="bookmarks">
|
|
12194
12309
|
<xsl:apply-templates mode="bookmarks"/>
|
|
12195
12310
|
<xsl:text> </xsl:text>
|
|
12196
12311
|
</xsl:template>
|
|
12197
12312
|
|
|
12198
|
-
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
|
|
12313
|
+
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:name/text()" mode="contents" priority="2">
|
|
12199
12314
|
<xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
|
|
12200
12315
|
<xsl:value-of select="."/>
|
|
12201
12316
|
</xsl:if>
|
|
12202
12317
|
</xsl:template>
|
|
12203
12318
|
|
|
12204
|
-
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
|
|
12319
|
+
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement]/mn:fmt-name/text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement]/mn:fmt-name/text()" mode="contents" priority="2">
|
|
12205
12320
|
<xsl:value-of select="."/>
|
|
12206
12321
|
</xsl:template>
|
|
12207
12322
|
|
|
12208
|
-
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
|
|
12323
|
+
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:name//text()" mode="bookmarks" priority="2">
|
|
12209
12324
|
<xsl:if test="not(../following-sibling::*[1][self::mn:fmt-name])">
|
|
12210
12325
|
<xsl:value-of select="."/>
|
|
12211
12326
|
</xsl:if>
|
|
12212
12327
|
</xsl:template>
|
|
12213
12328
|
|
|
12214
|
-
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
|
|
12329
|
+
<xsl:template match="*[self::mn:figure or self::mn:table or self::mn:example or self::mn:permission or self::mn:recommendation or self::mn:requirement or self::mn:sourcecode]/mn:fmt-name//text() | *[self::mnx:figure or self::mnx:table or self::mnx:example or self::mnx:permission or self::mnx:recommendation or self::mnx:requirement or self::mnx:sourcecode]/mn:fmt-name//text()" mode="bookmarks" priority="2">
|
|
12215
12330
|
<xsl:value-of select="."/>
|
|
12216
12331
|
</xsl:template>
|
|
12217
12332
|
|
|
@@ -12444,6 +12559,11 @@
|
|
|
12444
12559
|
<xsl:with-param name="lang" select="@lang"/>
|
|
12445
12560
|
</xsl:call-template>
|
|
12446
12561
|
|
|
12562
|
+
<xsl:call-template name="insertExampleBookmarks">
|
|
12563
|
+
<xsl:with-param name="contents" select="mnx:contents"/>
|
|
12564
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
12565
|
+
</xsl:call-template>
|
|
12566
|
+
|
|
12447
12567
|
</fo:bookmark>
|
|
12448
12568
|
|
|
12449
12569
|
</xsl:for-each>
|
|
@@ -12462,6 +12582,11 @@
|
|
|
12462
12582
|
<xsl:with-param name="lang" select="@lang"/>
|
|
12463
12583
|
</xsl:call-template>
|
|
12464
12584
|
|
|
12585
|
+
<xsl:call-template name="insertExampleBookmarks">
|
|
12586
|
+
<xsl:with-param name="contents" select="mnx:contents"/>
|
|
12587
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
12588
|
+
</xsl:call-template>
|
|
12589
|
+
|
|
12465
12590
|
</xsl:for-each>
|
|
12466
12591
|
</xsl:otherwise>
|
|
12467
12592
|
</xsl:choose>
|
|
@@ -12478,6 +12603,11 @@
|
|
|
12478
12603
|
<xsl:with-param name="lang" select="@lang"/>
|
|
12479
12604
|
</xsl:call-template>
|
|
12480
12605
|
|
|
12606
|
+
<xsl:call-template name="insertExampleBookmarks">
|
|
12607
|
+
<xsl:with-param name="contents" select="$contents_nodes/mnx:contents"/>
|
|
12608
|
+
<xsl:with-param name="lang" select="@lang"/>
|
|
12609
|
+
</xsl:call-template>
|
|
12610
|
+
|
|
12481
12611
|
</xsl:otherwise>
|
|
12482
12612
|
</xsl:choose>
|
|
12483
12613
|
|
|
@@ -12558,6 +12688,46 @@
|
|
|
12558
12688
|
</fo:bookmark>
|
|
12559
12689
|
</xsl:if>
|
|
12560
12690
|
</xsl:template> <!-- insertTableBookmarks -->
|
|
12691
|
+
|
|
12692
|
+
<xsl:template name="insertExampleBookmarks">
|
|
12693
|
+
<xsl:param name="contents"/>
|
|
12694
|
+
<xsl:param name="lang"/>
|
|
12695
|
+
<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
|
|
12696
|
+
<xsl:if test="$contents_nodes/mnx:example">
|
|
12697
|
+
<fo:bookmark internal-destination="{$contents_nodes/mnx:example[1]/@id}" starting-state="hide">
|
|
12698
|
+
<fo:bookmark-title>
|
|
12699
|
+
<xsl:choose>
|
|
12700
|
+
<xsl:when test="$lang = 'fr'">Exemples</xsl:when>
|
|
12701
|
+
<xsl:otherwise>Examples</xsl:otherwise>
|
|
12702
|
+
</xsl:choose>
|
|
12703
|
+
</fo:bookmark-title>
|
|
12704
|
+
<xsl:for-each select="$contents_nodes/mnx:example">
|
|
12705
|
+
<fo:bookmark internal-destination="{@id}">
|
|
12706
|
+
<fo:bookmark-title>
|
|
12707
|
+
<xsl:value-of select="normalize-space(mnx:title)"/>
|
|
12708
|
+
</fo:bookmark-title>
|
|
12709
|
+
</fo:bookmark>
|
|
12710
|
+
</xsl:for-each>
|
|
12711
|
+
</fo:bookmark>
|
|
12712
|
+
</xsl:if>
|
|
12713
|
+
<xsl:if test="$contents_nodes//mnx:examples/mnx:example">
|
|
12714
|
+
<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
|
|
12715
|
+
|
|
12716
|
+
<xsl:variable name="bookmark-title">
|
|
12717
|
+
<xsl:value-of select="$title-list-examples"/>
|
|
12718
|
+
</xsl:variable>
|
|
12719
|
+
|
|
12720
|
+
<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
|
|
12721
|
+
|
|
12722
|
+
<xsl:for-each select="$contents_nodes//mnx:examples/mnx:example">
|
|
12723
|
+
<fo:bookmark internal-destination="{@id}">
|
|
12724
|
+
<!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
|
|
12725
|
+
<fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
|
|
12726
|
+
</fo:bookmark>
|
|
12727
|
+
</xsl:for-each>
|
|
12728
|
+
</fo:bookmark>
|
|
12729
|
+
</xsl:if>
|
|
12730
|
+
</xsl:template> <!-- insertExampleBookmarks -->
|
|
12561
12731
|
<!-- End Bookmarks -->
|
|
12562
12732
|
|
|
12563
12733
|
<!-- ============================ -->
|
|
@@ -13529,6 +13699,10 @@
|
|
|
13529
13699
|
<fo:block break-after="page"/>
|
|
13530
13700
|
</xsl:template>
|
|
13531
13701
|
|
|
13702
|
+
<xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
|
|
13703
|
+
<fo:block break-after="page"/>
|
|
13704
|
+
</xsl:template>
|
|
13705
|
+
|
|
13532
13706
|
<xsl:variable name="font_main_root_style">
|
|
13533
13707
|
<root-style xsl:use-attribute-sets="root-style">
|
|
13534
13708
|
</root-style>
|
|
@@ -187,6 +187,15 @@ Applicable to modify and delete</a:documentation>
|
|
|
187
187
|
<a:documentation>Optional caption of this block</a:documentation>
|
|
188
188
|
</attribute>
|
|
189
189
|
</optional>
|
|
190
|
+
<optional>
|
|
191
|
+
<attribute name="position">
|
|
192
|
+
<a:documentation>For an "add" change, whether the change is added before or after the location</a:documentation>
|
|
193
|
+
<choice>
|
|
194
|
+
<value>before</value>
|
|
195
|
+
<value>after</value>
|
|
196
|
+
</choice>
|
|
197
|
+
</attribute>
|
|
198
|
+
</optional>
|
|
190
199
|
<optional>
|
|
191
200
|
<element name="location">
|
|
192
201
|
<a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>
|
|
@@ -1893,15 +1902,40 @@ or as the string "auto"</a:documentation>
|
|
|
1893
1902
|
<a:documentation>Mathematically formatted text</a:documentation>
|
|
1894
1903
|
<element name="stem">
|
|
1895
1904
|
<ref name="StemAttributes"/>
|
|
1896
|
-
<
|
|
1897
|
-
<
|
|
1905
|
+
<optional>
|
|
1906
|
+
<text>
|
|
1898
1907
|
<a:documentation>The content of the mathematically formatted text</a:documentation>
|
|
1899
|
-
|
|
1900
|
-
|
|
1901
|
-
|
|
1902
|
-
|
|
1908
|
+
</text>
|
|
1909
|
+
</optional>
|
|
1910
|
+
<optional>
|
|
1911
|
+
<ref name="mathml"/>
|
|
1912
|
+
</optional>
|
|
1913
|
+
<optional>
|
|
1914
|
+
<ref name="asciimath"/>
|
|
1915
|
+
</optional>
|
|
1916
|
+
<optional>
|
|
1917
|
+
<ref name="latexmath"/>
|
|
1918
|
+
</optional>
|
|
1903
1919
|
</element>
|
|
1904
1920
|
</define>
|
|
1921
|
+
<define name="latexmath">
|
|
1922
|
+
<a:documentation>Encoding of LatexMath</a:documentation>
|
|
1923
|
+
<element name="latexmath">
|
|
1924
|
+
<text/>
|
|
1925
|
+
</element>
|
|
1926
|
+
</define>
|
|
1927
|
+
<define name="asciimath">
|
|
1928
|
+
<a:documentation>Encoding of AsciiMath</a:documentation>
|
|
1929
|
+
<element name="asciimath">
|
|
1930
|
+
<text/>
|
|
1931
|
+
</element>
|
|
1932
|
+
</define>
|
|
1933
|
+
<define name="mathml">
|
|
1934
|
+
<a:documentation>Encoding of MathML: the official W3C MathML 3.0 grammar (namespace
|
|
1935
|
+
http://www.w3.org/1998/Math/MathML), via the metanorma wrapper in
|
|
1936
|
+
grammars/mathml/. See grammars/mathml/README.adoc and basicdoc-models#35.</a:documentation>
|
|
1937
|
+
<externalRef href="metanorma-mathml.rng"/>
|
|
1938
|
+
</define>
|
|
1905
1939
|
<define name="StemAttributes">
|
|
1906
1940
|
<attribute name="type">
|
|
1907
1941
|
<a:documentation>The notation used to mathematically format the text</a:documentation>
|
data/lib/metanorma/cc/biblio.rng
CHANGED
|
@@ -1142,11 +1142,11 @@ NOTE: This should preferably be encoded as a URI or short identifier, rather th
|
|
|
1142
1142
|
<a:documentation>Information about how long the current description of the bibliographic item is valid for</a:documentation>
|
|
1143
1143
|
</ref>
|
|
1144
1144
|
</optional>
|
|
1145
|
-
<
|
|
1145
|
+
<zeroOrMore>
|
|
1146
1146
|
<ref name="depiction">
|
|
1147
1147
|
<a:documentation>Depiction of the bibliographic item, typically an image</a:documentation>
|
|
1148
1148
|
</ref>
|
|
1149
|
-
</
|
|
1149
|
+
</zeroOrMore>
|
|
1150
1150
|
</define>
|
|
1151
1151
|
<define name="ReducedBibliographicItem">
|
|
1152
1152
|
<a:documentation>Reduced description of a bibliographic resource, without mandatory title and docidentifier, used for document relations
|
|
@@ -2015,15 +2015,11 @@ provided that it is not the entire bibliographic item that is so related</a:docu
|
|
|
2015
2015
|
<a:documentation>A version of the bibliographic item (within an edition). Can be used for drafts</a:documentation>
|
|
2016
2016
|
<element name="version">
|
|
2017
2017
|
<optional>
|
|
2018
|
-
<
|
|
2019
|
-
<a:documentation>
|
|
2020
|
-
</
|
|
2021
|
-
</optional>
|
|
2022
|
-
<optional>
|
|
2023
|
-
<ref name="draft">
|
|
2024
|
-
<a:documentation>The identifier for the current draft of the bibliographic item</a:documentation>
|
|
2025
|
-
</ref>
|
|
2018
|
+
<attribute name="type">
|
|
2019
|
+
<a:documentation>Versioning scheme, in case of multiple versioning schemes</a:documentation>
|
|
2020
|
+
</attribute>
|
|
2026
2021
|
</optional>
|
|
2022
|
+
<text/>
|
|
2027
2023
|
</element>
|
|
2028
2024
|
</define>
|
|
2029
2025
|
<define name="vedition">
|
|
@@ -2063,13 +2059,13 @@ provided that it is not the entire bibliographic item that is so related</a:docu
|
|
|
2063
2059
|
<ref name="LocalizedString"/>
|
|
2064
2060
|
</element>
|
|
2065
2061
|
</optional>
|
|
2066
|
-
<
|
|
2062
|
+
<zeroOrMore>
|
|
2067
2063
|
<element name="taxon">
|
|
2068
2064
|
<a:documentation>The keywords as a hierarchical taxonomy. For example, the sequence of `taxon` elements
|
|
2069
2065
|
`pump`, `centrifugal pump`, `line shaft pump` represents a taxonomic classification</a:documentation>
|
|
2070
2066
|
<ref name="LocalizedString"/>
|
|
2071
2067
|
</element>
|
|
2072
|
-
</
|
|
2068
|
+
</zeroOrMore>
|
|
2073
2069
|
<zeroOrMore>
|
|
2074
2070
|
<ref name="vocabid">
|
|
2075
2071
|
<a:documentation>Identifiers for the keyword as a controlled vocabulary</a:documentation>
|