metanorma-iso 1.8.3 → 1.8.4
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/.github/workflows/rake.yml +3 -13
- data/.hound.yml +3 -1
- data/.rubocop.yml +3 -5
- data/lib/asciidoctor/iso/isodoc.rng +16 -0
- data/lib/asciidoctor/iso/isostandard-amd.rng +3 -0
- data/lib/asciidoctor/iso/isostandard.rng +11 -0
- data/lib/isodoc/iso/iso.amendment.xsl +44 -12
- data/lib/isodoc/iso/iso.international-standard.xsl +44 -12
- data/lib/isodoc/iso/xref.rb +10 -9
- data/lib/metanorma/iso/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 40c9fc0bf08ed5cca2885426c54c0b1970511fbdd14a7e982197bb57f95fc55b
|
4
|
+
data.tar.gz: 4695506d2644d2b01090cd4bfa7cd123672dd99de111a6c09f50fea1c84ed3c3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5b8317d64f94cee315afeb98045ff026c0b5df38ea7c141c4fa1d839d758dce919382ff5ae72c76893d296b74d69bae965a50096b7fdfb159b0085c122783a19
|
7
|
+
data.tar.gz: 2f6a2bdb6e5b33adbe3970838f4d4c2ca0f97fe8b40cbe66b828e5fec18fc5cd7932cc42a2880c0765d5b6621a26502d3ae0fa38533488e0cfebb2a1e96917ea
|
data/.github/workflows/rake.yml
CHANGED
@@ -4,7 +4,7 @@ name: rake
|
|
4
4
|
|
5
5
|
on:
|
6
6
|
push:
|
7
|
-
branches: [ master, main
|
7
|
+
branches: [ master, main ]
|
8
8
|
tags: [ v* ]
|
9
9
|
pull_request:
|
10
10
|
|
@@ -16,19 +16,9 @@ jobs:
|
|
16
16
|
strategy:
|
17
17
|
fail-fast: false
|
18
18
|
matrix:
|
19
|
-
ruby: [ '2.7', '2.6', '2.5', '2.4' ]
|
19
|
+
ruby: [ '3.0', '2.7', '2.6', '2.5', '2.4' ]
|
20
20
|
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
21
21
|
experimental: [ false ]
|
22
|
-
include:
|
23
|
-
- ruby: '3.0'
|
24
|
-
os: 'ubuntu-latest'
|
25
|
-
experimental: true
|
26
|
-
- ruby: '3.0'
|
27
|
-
os: 'windows-latest'
|
28
|
-
experimental: true
|
29
|
-
- ruby: '3.0'
|
30
|
-
os: 'macos-latest'
|
31
|
-
experimental: true
|
32
22
|
steps:
|
33
23
|
- uses: actions/checkout@master
|
34
24
|
|
@@ -49,5 +39,5 @@ jobs:
|
|
49
39
|
with:
|
50
40
|
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
51
41
|
repository: ${{ github.repository }}
|
52
|
-
event-type:
|
42
|
+
event-type: tests-passed
|
53
43
|
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
data/.hound.yml
CHANGED
data/.rubocop.yml
CHANGED
@@ -1,12 +1,10 @@
|
|
1
|
-
#
|
2
|
-
# https://github.com/
|
3
|
-
# All project-specific additions and overrides should be specified in this file.
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
+
# See https://github.com/metanorma/cimas
|
4
3
|
inherit_from:
|
5
4
|
- https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
|
6
5
|
|
7
6
|
# local repo-specific modifications
|
7
|
+
# ...
|
8
8
|
|
9
9
|
AllCops:
|
10
|
-
DisplayCopNames: false
|
11
|
-
StyleGuideCopsOnly: false
|
12
10
|
TargetRubyVersion: 2.4
|
@@ -45,6 +45,11 @@
|
|
45
45
|
<optional>
|
46
46
|
<attribute name="alt"/>
|
47
47
|
</optional>
|
48
|
+
<optional>
|
49
|
+
<attribute name="updatetype">
|
50
|
+
<data type="boolean"/>
|
51
|
+
</attribute>
|
52
|
+
</optional>
|
48
53
|
<text/>
|
49
54
|
</element>
|
50
55
|
</define>
|
@@ -543,6 +548,9 @@
|
|
543
548
|
</define>
|
544
549
|
<define name="BibDataExtensionType">
|
545
550
|
<ref name="doctype"/>
|
551
|
+
<optional>
|
552
|
+
<ref name="docsubtype"/>
|
553
|
+
</optional>
|
546
554
|
<optional>
|
547
555
|
<ref name="editorialgroup"/>
|
548
556
|
</optional>
|
@@ -890,6 +898,14 @@
|
|
890
898
|
</define>
|
891
899
|
</include>
|
892
900
|
<!-- end overrides -->
|
901
|
+
<define name="docsubtype">
|
902
|
+
<element name="docsubtype">
|
903
|
+
<ref name="DocumentSubtype"/>
|
904
|
+
</element>
|
905
|
+
</define>
|
906
|
+
<define name="DocumentSubtype">
|
907
|
+
<text/>
|
908
|
+
</define>
|
893
909
|
<define name="colgroup">
|
894
910
|
<element name="colgroup">
|
895
911
|
<oneOrMore>
|
@@ -38,6 +38,9 @@
|
|
38
38
|
</define>
|
39
39
|
<define name="BibDataExtensionType">
|
40
40
|
<ref name="doctype"/>
|
41
|
+
<optional>
|
42
|
+
<ref name="docsubtype"/>
|
43
|
+
</optional>
|
41
44
|
<optional>
|
42
45
|
<ref name="horizontal"/>
|
43
46
|
</optional>
|
@@ -259,6 +262,14 @@
|
|
259
262
|
<value>directive</value>
|
260
263
|
</choice>
|
261
264
|
</define>
|
265
|
+
<define name="DocumentSubtype">
|
266
|
+
<choice>
|
267
|
+
<value>specification</value>
|
268
|
+
<value>method-of-test</value>
|
269
|
+
<value>vocabulary</value>
|
270
|
+
<value>code-of-practice</value>
|
271
|
+
</choice>
|
272
|
+
</define>
|
262
273
|
<define name="structuredidentifier">
|
263
274
|
<element name="structuredidentifier">
|
264
275
|
<optional>
|
@@ -2662,6 +2662,7 @@
|
|
2662
2662
|
|
2663
2663
|
|
2664
2664
|
|
2665
|
+
|
2665
2666
|
</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
|
2666
2667
|
<xsl:attribute name="white-space">pre</xsl:attribute>
|
2667
2668
|
<xsl:attribute name="wrap-option">wrap</xsl:attribute>
|
@@ -2728,6 +2729,7 @@
|
|
2728
2729
|
|
2729
2730
|
|
2730
2731
|
|
2732
|
+
|
2731
2733
|
</xsl:attribute-set><xsl:attribute-set name="example-body-style">
|
2732
2734
|
|
2733
2735
|
|
@@ -2747,9 +2749,7 @@
|
|
2747
2749
|
|
2748
2750
|
|
2749
2751
|
|
2750
|
-
|
2751
|
-
|
2752
|
-
|
2752
|
+
|
2753
2753
|
|
2754
2754
|
|
2755
2755
|
|
@@ -2803,6 +2803,7 @@
|
|
2803
2803
|
|
2804
2804
|
|
2805
2805
|
|
2806
|
+
|
2806
2807
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
2807
2808
|
|
2808
2809
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
@@ -2828,11 +2829,13 @@
|
|
2828
2829
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
2829
2830
|
|
2830
2831
|
|
2832
|
+
|
2831
2833
|
</xsl:attribute-set><xsl:attribute-set name="eref-style">
|
2832
2834
|
|
2833
2835
|
|
2834
2836
|
|
2835
2837
|
|
2838
|
+
|
2836
2839
|
</xsl:attribute-set><xsl:attribute-set name="note-style">
|
2837
2840
|
|
2838
2841
|
|
@@ -2930,10 +2933,12 @@
|
|
2930
2933
|
|
2931
2934
|
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
2932
2935
|
|
2936
|
+
|
2933
2937
|
</xsl:attribute-set><xsl:attribute-set name="origin-style">
|
2934
2938
|
|
2935
2939
|
|
2936
2940
|
|
2941
|
+
|
2937
2942
|
</xsl:attribute-set><xsl:attribute-set name="term-style">
|
2938
2943
|
|
2939
2944
|
<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
|
@@ -3005,8 +3010,10 @@
|
|
3005
3010
|
</xsl:attribute-set><xsl:attribute-set name="admitted-style">
|
3006
3011
|
|
3007
3012
|
|
3013
|
+
|
3008
3014
|
</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
|
3009
3015
|
|
3016
|
+
|
3010
3017
|
</xsl:attribute-set><xsl:attribute-set name="definition-style">
|
3011
3018
|
|
3012
3019
|
|
@@ -3845,6 +3852,7 @@
|
|
3845
3852
|
|
3846
3853
|
|
3847
3854
|
|
3855
|
+
|
3848
3856
|
<xsl:if test="$lang = 'ar'">
|
3849
3857
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
3850
3858
|
</xsl:if>
|
@@ -4233,6 +4241,7 @@
|
|
4233
4241
|
|
4234
4242
|
|
4235
4243
|
|
4244
|
+
|
4236
4245
|
<xsl:variable name="title-key">
|
4237
4246
|
|
4238
4247
|
<xsl:call-template name="getLocalizedString">
|
@@ -4521,6 +4530,8 @@
|
|
4521
4530
|
|
4522
4531
|
<xsl:apply-templates/>
|
4523
4532
|
</fo:inline>
|
4533
|
+
</xsl:template><xsl:template match="*[local-name()='padding']">
|
4534
|
+
<fo:inline padding-right="{@value}"> </fo:inline>
|
4524
4535
|
</xsl:template><xsl:template match="*[local-name()='sup']">
|
4525
4536
|
<fo:inline font-size="80%" vertical-align="super">
|
4526
4537
|
<xsl:apply-templates/>
|
@@ -5020,6 +5031,16 @@
|
|
5020
5031
|
<mathml:mspace width="0.5ex"/>
|
5021
5032
|
</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
|
5022
5033
|
<xsl:variable name="target">
|
5034
|
+
<xsl:choose>
|
5035
|
+
<xsl:when test="@updatetype = 'true'">
|
5036
|
+
<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
|
5037
|
+
</xsl:when>
|
5038
|
+
<xsl:otherwise>
|
5039
|
+
<xsl:value-of select="normalize-space(@target)"/>
|
5040
|
+
</xsl:otherwise>
|
5041
|
+
</xsl:choose>
|
5042
|
+
</xsl:variable>
|
5043
|
+
<xsl:variable name="target_text">
|
5023
5044
|
<xsl:choose>
|
5024
5045
|
<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
|
5025
5046
|
<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
|
@@ -5032,19 +5053,19 @@
|
|
5032
5053
|
<fo:inline xsl:use-attribute-sets="link-style">
|
5033
5054
|
|
5034
5055
|
<xsl:choose>
|
5035
|
-
<xsl:when test="$
|
5056
|
+
<xsl:when test="$target_text = ''">
|
5036
5057
|
<xsl:apply-templates/>
|
5037
5058
|
</xsl:when>
|
5038
5059
|
<xsl:otherwise>
|
5039
|
-
<fo:basic-link external-destination="{
|
5060
|
+
<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
|
5040
5061
|
<xsl:choose>
|
5041
5062
|
<xsl:when test="normalize-space(.) = ''">
|
5042
|
-
<!-- <xsl:value-of select="$target"/> -->
|
5043
5063
|
<xsl:call-template name="add-zero-spaces-link-java">
|
5044
|
-
<xsl:with-param name="text" select="$
|
5064
|
+
<xsl:with-param name="text" select="$target_text"/>
|
5045
5065
|
</xsl:call-template>
|
5046
5066
|
</xsl:when>
|
5047
5067
|
<xsl:otherwise>
|
5068
|
+
<!-- output text from <link>text</link> -->
|
5048
5069
|
<xsl:apply-templates/>
|
5049
5070
|
</xsl:otherwise>
|
5050
5071
|
</xsl:choose>
|
@@ -5620,6 +5641,7 @@
|
|
5620
5641
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
5621
5642
|
|
5622
5643
|
<fo:block-container margin-left="0mm">
|
5644
|
+
<xsl:copy-of select="@id"/>
|
5623
5645
|
<xsl:if test="parent::*[local-name() = 'note']">
|
5624
5646
|
<xsl:attribute name="margin-left">
|
5625
5647
|
<xsl:choose>
|
@@ -5897,6 +5919,7 @@
|
|
5897
5919
|
</xsl:template><xsl:template match="*[local-name() = 'example']">
|
5898
5920
|
<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
|
5899
5921
|
|
5922
|
+
|
5900
5923
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
5901
5924
|
|
5902
5925
|
<xsl:variable name="element">
|
@@ -6010,14 +6033,12 @@
|
|
6010
6033
|
<fo:inline>
|
6011
6034
|
|
6012
6035
|
|
6013
|
-
<!-- <xsl:call-template name="getLocalizedString">
|
6014
|
-
<xsl:with-param name="key">source</xsl:with-param>
|
6015
|
-
</xsl:call-template> -->
|
6016
6036
|
<xsl:value-of select="$localized.source"/>
|
6037
|
+
<xsl:text>: </xsl:text>
|
6038
|
+
|
6017
6039
|
|
6018
6040
|
|
6019
6041
|
|
6020
|
-
<xsl:text>: </xsl:text>
|
6021
6042
|
</fo:inline>
|
6022
6043
|
|
6023
6044
|
<fo:inline xsl:use-attribute-sets="origin-style">
|
@@ -6123,6 +6144,7 @@
|
|
6123
6144
|
|
6124
6145
|
|
6125
6146
|
|
6147
|
+
|
6126
6148
|
<xsl:choose>
|
6127
6149
|
<xsl:when test="$depth = 2">3</xsl:when>
|
6128
6150
|
<xsl:otherwise>4</xsl:otherwise>
|
@@ -6836,6 +6858,9 @@
|
|
6836
6858
|
<xsl:when test="parent::*[local-name() = 'preface']">
|
6837
6859
|
<xsl:value-of select="$level_total - 1"/>
|
6838
6860
|
</xsl:when>
|
6861
|
+
<xsl:when test="ancestor::*[local-name() = 'preface'] and not(ancestor::*[local-name() = 'foreword']) and not(ancestor::*[local-name() = 'introduction'])"> <!-- for preface/clause -->
|
6862
|
+
<xsl:value-of select="$level_total - 1"/>
|
6863
|
+
</xsl:when>
|
6839
6864
|
<xsl:when test="ancestor::*[local-name() = 'preface']">
|
6840
6865
|
<xsl:value-of select="$level_total - 2"/>
|
6841
6866
|
</xsl:when>
|
@@ -6976,7 +7001,14 @@
|
|
6976
7001
|
<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
|
6977
7002
|
<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
6978
7003
|
</xsl:when>
|
6979
|
-
<xsl:otherwise
|
7004
|
+
<xsl:otherwise>
|
7005
|
+
<xsl:variable name="key_">
|
7006
|
+
<xsl:call-template name="capitalize">
|
7007
|
+
<xsl:with-param name="str" select="translate($key, '_', ' ')"/>
|
7008
|
+
</xsl:call-template>
|
7009
|
+
</xsl:variable>
|
7010
|
+
<xsl:value-of select="$key_"/>
|
7011
|
+
</xsl:otherwise>
|
6980
7012
|
</xsl:choose>
|
6981
7013
|
|
6982
7014
|
</xsl:template><xsl:template name="setTrackChangesStyles">
|
@@ -2662,6 +2662,7 @@
|
|
2662
2662
|
|
2663
2663
|
|
2664
2664
|
|
2665
|
+
|
2665
2666
|
</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
|
2666
2667
|
<xsl:attribute name="white-space">pre</xsl:attribute>
|
2667
2668
|
<xsl:attribute name="wrap-option">wrap</xsl:attribute>
|
@@ -2728,6 +2729,7 @@
|
|
2728
2729
|
|
2729
2730
|
|
2730
2731
|
|
2732
|
+
|
2731
2733
|
</xsl:attribute-set><xsl:attribute-set name="example-body-style">
|
2732
2734
|
|
2733
2735
|
|
@@ -2747,9 +2749,7 @@
|
|
2747
2749
|
|
2748
2750
|
|
2749
2751
|
|
2750
|
-
|
2751
|
-
|
2752
|
-
|
2752
|
+
|
2753
2753
|
|
2754
2754
|
|
2755
2755
|
|
@@ -2803,6 +2803,7 @@
|
|
2803
2803
|
|
2804
2804
|
|
2805
2805
|
|
2806
|
+
|
2806
2807
|
</xsl:attribute-set><xsl:attribute-set name="appendix-style">
|
2807
2808
|
|
2808
2809
|
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
@@ -2828,11 +2829,13 @@
|
|
2828
2829
|
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
2829
2830
|
|
2830
2831
|
|
2832
|
+
|
2831
2833
|
</xsl:attribute-set><xsl:attribute-set name="eref-style">
|
2832
2834
|
|
2833
2835
|
|
2834
2836
|
|
2835
2837
|
|
2838
|
+
|
2836
2839
|
</xsl:attribute-set><xsl:attribute-set name="note-style">
|
2837
2840
|
|
2838
2841
|
|
@@ -2930,10 +2933,12 @@
|
|
2930
2933
|
|
2931
2934
|
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
2932
2935
|
|
2936
|
+
|
2933
2937
|
</xsl:attribute-set><xsl:attribute-set name="origin-style">
|
2934
2938
|
|
2935
2939
|
|
2936
2940
|
|
2941
|
+
|
2937
2942
|
</xsl:attribute-set><xsl:attribute-set name="term-style">
|
2938
2943
|
|
2939
2944
|
<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
|
@@ -3005,8 +3010,10 @@
|
|
3005
3010
|
</xsl:attribute-set><xsl:attribute-set name="admitted-style">
|
3006
3011
|
|
3007
3012
|
|
3013
|
+
|
3008
3014
|
</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
|
3009
3015
|
|
3016
|
+
|
3010
3017
|
</xsl:attribute-set><xsl:attribute-set name="definition-style">
|
3011
3018
|
|
3012
3019
|
|
@@ -3845,6 +3852,7 @@
|
|
3845
3852
|
|
3846
3853
|
|
3847
3854
|
|
3855
|
+
|
3848
3856
|
<xsl:if test="$lang = 'ar'">
|
3849
3857
|
<xsl:attribute name="padding-right">1mm</xsl:attribute>
|
3850
3858
|
</xsl:if>
|
@@ -4233,6 +4241,7 @@
|
|
4233
4241
|
|
4234
4242
|
|
4235
4243
|
|
4244
|
+
|
4236
4245
|
<xsl:variable name="title-key">
|
4237
4246
|
|
4238
4247
|
<xsl:call-template name="getLocalizedString">
|
@@ -4521,6 +4530,8 @@
|
|
4521
4530
|
|
4522
4531
|
<xsl:apply-templates/>
|
4523
4532
|
</fo:inline>
|
4533
|
+
</xsl:template><xsl:template match="*[local-name()='padding']">
|
4534
|
+
<fo:inline padding-right="{@value}"> </fo:inline>
|
4524
4535
|
</xsl:template><xsl:template match="*[local-name()='sup']">
|
4525
4536
|
<fo:inline font-size="80%" vertical-align="super">
|
4526
4537
|
<xsl:apply-templates/>
|
@@ -5020,6 +5031,16 @@
|
|
5020
5031
|
<mathml:mspace width="0.5ex"/>
|
5021
5032
|
</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
|
5022
5033
|
<xsl:variable name="target">
|
5034
|
+
<xsl:choose>
|
5035
|
+
<xsl:when test="@updatetype = 'true'">
|
5036
|
+
<xsl:value-of select="concat(normalize-space(@target), '.pdf')"/>
|
5037
|
+
</xsl:when>
|
5038
|
+
<xsl:otherwise>
|
5039
|
+
<xsl:value-of select="normalize-space(@target)"/>
|
5040
|
+
</xsl:otherwise>
|
5041
|
+
</xsl:choose>
|
5042
|
+
</xsl:variable>
|
5043
|
+
<xsl:variable name="target_text">
|
5023
5044
|
<xsl:choose>
|
5024
5045
|
<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
|
5025
5046
|
<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
|
@@ -5032,19 +5053,19 @@
|
|
5032
5053
|
<fo:inline xsl:use-attribute-sets="link-style">
|
5033
5054
|
|
5034
5055
|
<xsl:choose>
|
5035
|
-
<xsl:when test="$
|
5056
|
+
<xsl:when test="$target_text = ''">
|
5036
5057
|
<xsl:apply-templates/>
|
5037
5058
|
</xsl:when>
|
5038
5059
|
<xsl:otherwise>
|
5039
|
-
<fo:basic-link external-destination="{
|
5060
|
+
<fo:basic-link external-destination="{$target}" fox:alt-text="{$target}">
|
5040
5061
|
<xsl:choose>
|
5041
5062
|
<xsl:when test="normalize-space(.) = ''">
|
5042
|
-
<!-- <xsl:value-of select="$target"/> -->
|
5043
5063
|
<xsl:call-template name="add-zero-spaces-link-java">
|
5044
|
-
<xsl:with-param name="text" select="$
|
5064
|
+
<xsl:with-param name="text" select="$target_text"/>
|
5045
5065
|
</xsl:call-template>
|
5046
5066
|
</xsl:when>
|
5047
5067
|
<xsl:otherwise>
|
5068
|
+
<!-- output text from <link>text</link> -->
|
5048
5069
|
<xsl:apply-templates/>
|
5049
5070
|
</xsl:otherwise>
|
5050
5071
|
</xsl:choose>
|
@@ -5620,6 +5641,7 @@
|
|
5620
5641
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
5621
5642
|
|
5622
5643
|
<fo:block-container margin-left="0mm">
|
5644
|
+
<xsl:copy-of select="@id"/>
|
5623
5645
|
<xsl:if test="parent::*[local-name() = 'note']">
|
5624
5646
|
<xsl:attribute name="margin-left">
|
5625
5647
|
<xsl:choose>
|
@@ -5897,6 +5919,7 @@
|
|
5897
5919
|
</xsl:template><xsl:template match="*[local-name() = 'example']">
|
5898
5920
|
<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
|
5899
5921
|
|
5922
|
+
|
5900
5923
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
5901
5924
|
|
5902
5925
|
<xsl:variable name="element">
|
@@ -6010,14 +6033,12 @@
|
|
6010
6033
|
<fo:inline>
|
6011
6034
|
|
6012
6035
|
|
6013
|
-
<!-- <xsl:call-template name="getLocalizedString">
|
6014
|
-
<xsl:with-param name="key">source</xsl:with-param>
|
6015
|
-
</xsl:call-template> -->
|
6016
6036
|
<xsl:value-of select="$localized.source"/>
|
6037
|
+
<xsl:text>: </xsl:text>
|
6038
|
+
|
6017
6039
|
|
6018
6040
|
|
6019
6041
|
|
6020
|
-
<xsl:text>: </xsl:text>
|
6021
6042
|
</fo:inline>
|
6022
6043
|
|
6023
6044
|
<fo:inline xsl:use-attribute-sets="origin-style">
|
@@ -6123,6 +6144,7 @@
|
|
6123
6144
|
|
6124
6145
|
|
6125
6146
|
|
6147
|
+
|
6126
6148
|
<xsl:choose>
|
6127
6149
|
<xsl:when test="$depth = 2">3</xsl:when>
|
6128
6150
|
<xsl:otherwise>4</xsl:otherwise>
|
@@ -6836,6 +6858,9 @@
|
|
6836
6858
|
<xsl:when test="parent::*[local-name() = 'preface']">
|
6837
6859
|
<xsl:value-of select="$level_total - 1"/>
|
6838
6860
|
</xsl:when>
|
6861
|
+
<xsl:when test="ancestor::*[local-name() = 'preface'] and not(ancestor::*[local-name() = 'foreword']) and not(ancestor::*[local-name() = 'introduction'])"> <!-- for preface/clause -->
|
6862
|
+
<xsl:value-of select="$level_total - 1"/>
|
6863
|
+
</xsl:when>
|
6839
6864
|
<xsl:when test="ancestor::*[local-name() = 'preface']">
|
6840
6865
|
<xsl:value-of select="$level_total - 2"/>
|
6841
6866
|
</xsl:when>
|
@@ -6976,7 +7001,14 @@
|
|
6976
7001
|
<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
|
6977
7002
|
<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
6978
7003
|
</xsl:when>
|
6979
|
-
<xsl:otherwise
|
7004
|
+
<xsl:otherwise>
|
7005
|
+
<xsl:variable name="key_">
|
7006
|
+
<xsl:call-template name="capitalize">
|
7007
|
+
<xsl:with-param name="str" select="translate($key, '_', ' ')"/>
|
7008
|
+
</xsl:call-template>
|
7009
|
+
</xsl:variable>
|
7010
|
+
<xsl:value-of select="$key_"/>
|
7011
|
+
</xsl:otherwise>
|
6980
7012
|
</xsl:choose>
|
6981
7013
|
|
6982
7014
|
</xsl:template><xsl:template name="setTrackChangesStyles">
|
data/lib/isodoc/iso/xref.rb
CHANGED
@@ -99,20 +99,21 @@ module IsoDoc
|
|
99
99
|
clause.xpath(ns(".//formula")).each do |t|
|
100
100
|
next if t["id"].nil? || t["id"].empty?
|
101
101
|
|
102
|
-
@anchors[t["id"]] =
|
103
|
-
|
104
|
-
|
105
|
-
|
102
|
+
@anchors[t["id"]] = anchor_struct(
|
103
|
+
"#{num}#{hiersep}#{c.increment(t).print}", t,
|
104
|
+
t["inequality"] ? @labels["inequality"] : @labels["formula"],
|
105
|
+
"formula", t["unnumbered"]
|
106
|
+
)
|
106
107
|
end
|
107
108
|
end
|
108
109
|
|
109
|
-
def figure_anchor(
|
110
|
-
@anchors[
|
110
|
+
def figure_anchor(elem, sublabel, label)
|
111
|
+
@anchors[elem["id"]] = anchor_struct(
|
111
112
|
(sublabel ? "#{label} #{sublabel}" : label),
|
112
|
-
nil, @labels["figure"], "figure",
|
113
|
+
nil, @labels["figure"], "figure", elem["unnumbered"]
|
113
114
|
)
|
114
|
-
sublabel &&
|
115
|
-
@anchors[
|
115
|
+
sublabel && elem["unnumbered"] != "true" and
|
116
|
+
@anchors[elem["id"]][:label] = sublabel
|
116
117
|
end
|
117
118
|
|
118
119
|
def sequential_figure_names(clause)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-iso
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.8.
|
4
|
+
version: 1.8.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-06-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: isodoc
|