metanorma-iso 1.10.5 → 1.10.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +3 -33
- data/lib/isodoc/iso/iso.amendment.xsl +78 -11
- data/lib/isodoc/iso/iso.international-standard.xsl +78 -11
- data/lib/metanorma/iso/version.rb +1 -1
- data/metanorma-iso.gemspec +1 -1
- data/spec/asciidoctor/base_spec.rb +2 -2
- data/spec/isodoc/section_spec.rb +1 -1
- data/spec/metanorma/processor_spec.rb +1 -1
- metadata +8 -13
- data/lib/isodoc/iso/html/htmlstyle.css +0 -47
- data/lib/isodoc/iso/html/isodoc.css +0 -1327
- data/lib/isodoc/iso/html/style-human.css +0 -1010
- data/lib/isodoc/iso/html/style-iso.css +0 -1036
- data/lib/isodoc/iso/html/wordstyle.css +0 -1701
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 21ca1b89516933df5070519917f8092fc8707f121360d004676a5b9c6c560c08
|
4
|
+
data.tar.gz: c840ab50752e09f94da711cd9d92d4e232704718de10fdfab8cfbf86c428e21c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1b715123158dead59a52c186fe318a5d98d05c61dfd04dd793b9a6355e3a7f0718e055b3113259af22bdeabc5d8b5ca3683d76b803afb7249ef82e8e625e64ed
|
7
|
+
data.tar.gz: 129d8e858ec89afe0df4b006236caa309aefe8e046f22fc761482b9efbb22b009590189ed82c565828eafef9c806812bacf3489c7e4cb3674f3f280ac6d94a29
|
data/.github/workflows/rake.yml
CHANGED
@@ -1,5 +1,3 @@
|
|
1
|
-
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
-
# See https://github.com/metanorma/cimas
|
3
1
|
name: rake
|
4
2
|
|
5
3
|
on:
|
@@ -10,34 +8,6 @@ on:
|
|
10
8
|
|
11
9
|
jobs:
|
12
10
|
rake:
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
strategy:
|
17
|
-
fail-fast: false
|
18
|
-
matrix:
|
19
|
-
ruby: [ '3.0', '2.7', '2.6', '2.5' ]
|
20
|
-
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
21
|
-
experimental: [ false ]
|
22
|
-
steps:
|
23
|
-
- uses: actions/checkout@master
|
24
|
-
|
25
|
-
- uses: ruby/setup-ruby@v1
|
26
|
-
with:
|
27
|
-
ruby-version: ${{ matrix.ruby }}
|
28
|
-
bundler-cache: true
|
29
|
-
|
30
|
-
- uses: metanorma/metanorma-build-scripts/plantuml-setup-action@master
|
31
|
-
|
32
|
-
- run: bundle exec rake
|
33
|
-
|
34
|
-
tests-passed:
|
35
|
-
needs: rake
|
36
|
-
runs-on: ubuntu-latest
|
37
|
-
steps:
|
38
|
-
- uses: peter-evans/repository-dispatch@v1
|
39
|
-
with:
|
40
|
-
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
41
|
-
repository: ${{ github.repository }}
|
42
|
-
event-type: tests-passed
|
43
|
-
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
11
|
+
uses: metanorma/metanorma-build-scripts/.github/workflows/plantuml-rake.yml@main
|
12
|
+
secrets:
|
13
|
+
pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
@@ -1811,7 +1811,10 @@
|
|
1811
1811
|
<fo:list-item-label end-indent="label-end()">
|
1812
1812
|
<fo:block>
|
1813
1813
|
<fo:inline id="{@id}">
|
1814
|
-
<xsl:
|
1814
|
+
<xsl:value-of select="iso:docidentifier[@type = 'metanorma-ordinal']"/>
|
1815
|
+
<xsl:if test="not(iso:docidentifier[@type = 'metanorma-ordinal'])">
|
1816
|
+
<xsl:number format="[1]"/>
|
1817
|
+
</xsl:if>
|
1815
1818
|
</fo:inline>
|
1816
1819
|
</fo:block>
|
1817
1820
|
</fo:list-item-label>
|
@@ -1824,9 +1827,6 @@
|
|
1824
1827
|
</fo:list-block>
|
1825
1828
|
</xsl:template>
|
1826
1829
|
|
1827
|
-
<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem" mode="contents"/> [not(@normative='true')] -->
|
1828
|
-
<xsl:template match="iso:references/iso:bibitem" mode="contents"/>
|
1829
|
-
|
1830
1830
|
<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem/iso:title"> iso:references[not(@normative='true')]/ -->
|
1831
1831
|
<xsl:template match="iso:bibitem/iso:title">
|
1832
1832
|
<fo:inline font-style="italic">
|
@@ -5702,11 +5702,58 @@
|
|
5702
5702
|
<xsl:value-of select="."/>
|
5703
5703
|
</xsl:template><xsl:template match="node()" mode="contents">
|
5704
5704
|
<xsl:apply-templates mode="contents"/>
|
5705
|
+
</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="2" mode="contents">
|
5706
|
+
<xsl:variable name="level">
|
5707
|
+
<xsl:call-template name="getLevel">
|
5708
|
+
<xsl:with-param name="depth" select="@depth"/>
|
5709
|
+
</xsl:call-template>
|
5710
|
+
</xsl:variable>
|
5711
|
+
|
5712
|
+
<xsl:variable name="section">
|
5713
|
+
<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
|
5714
|
+
</xsl:variable>
|
5715
|
+
|
5716
|
+
<xsl:variable name="type">floating-title</xsl:variable>
|
5717
|
+
|
5718
|
+
<xsl:variable name="display">
|
5719
|
+
<xsl:choose>
|
5720
|
+
<xsl:when test="normalize-space(@id) = ''">false</xsl:when>
|
5721
|
+
<xsl:when test="$level <= $toc_level">true</xsl:when>
|
5722
|
+
<xsl:otherwise>false</xsl:otherwise>
|
5723
|
+
</xsl:choose>
|
5724
|
+
</xsl:variable>
|
5725
|
+
|
5726
|
+
<xsl:variable name="skip">false</xsl:variable>
|
5727
|
+
|
5728
|
+
<xsl:if test="$skip = 'false'">
|
5729
|
+
|
5730
|
+
<xsl:variable name="title">
|
5731
|
+
<xsl:choose>
|
5732
|
+
<xsl:when test="*[local-name() = 'tab']">
|
5733
|
+
<xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
|
5734
|
+
</xsl:when>
|
5735
|
+
<xsl:otherwise>
|
5736
|
+
<xsl:copy-of select="node()"/>
|
5737
|
+
</xsl:otherwise>
|
5738
|
+
</xsl:choose>
|
5739
|
+
</xsl:variable>
|
5740
|
+
|
5741
|
+
<xsl:variable name="root">
|
5742
|
+
<xsl:if test="ancestor-or-self::*[local-name() = 'preface']">preface</xsl:if>
|
5743
|
+
<xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
|
5744
|
+
</xsl:variable>
|
5745
|
+
|
5746
|
+
<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
|
5747
|
+
<title>
|
5748
|
+
<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
|
5749
|
+
</title>
|
5750
|
+
</item>
|
5751
|
+
</xsl:if>
|
5705
5752
|
</xsl:template><xsl:template match="node()" mode="bookmarks">
|
5706
5753
|
<xsl:apply-templates mode="bookmarks"/>
|
5707
5754
|
</xsl:template><xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
|
5708
5755
|
<xsl:apply-templates select="."/>
|
5709
|
-
</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
|
5756
|
+
</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
|
5710
5757
|
<xsl:apply-templates mode="bookmarks"/>
|
5711
5758
|
</xsl:template><xsl:template name="addBookmarks">
|
5712
5759
|
<xsl:param name="contents"/>
|
@@ -6622,6 +6669,8 @@
|
|
6622
6669
|
<xsl:if test="*[local-name() = 'strong']">
|
6623
6670
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
6624
6671
|
</xsl:if>
|
6672
|
+
</xsl:template><xsl:template match="*[local-name() = 'preferred']/text()[contains(., ';')] | *[local-name() = 'preferred']/*[local-name() = 'strong']/text()[contains(., ';')]">
|
6673
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
|
6625
6674
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
6626
6675
|
<fo:block xsl:use-attribute-sets="definition-style">
|
6627
6676
|
<xsl:apply-templates/>
|
@@ -6947,7 +6996,12 @@
|
|
6947
6996
|
|
6948
6997
|
|
6949
6998
|
|
6950
|
-
|
6999
|
+
|
7000
|
+
|
7001
|
+
|
7002
|
+
|
7003
|
+
|
7004
|
+
|
6951
7005
|
|
6952
7006
|
|
6953
7007
|
|
@@ -6958,7 +7012,7 @@
|
|
6958
7012
|
<xsl:if test="*[local-name() = 'docidentifier']">
|
6959
7013
|
<xsl:choose>
|
6960
7014
|
<xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/>
|
6961
|
-
<xsl:otherwise><xsl:value-of select="*[local-name() = '
|
7015
|
+
<xsl:otherwise><xsl:value-of select="*[local-name()='docidentifier'][not(@type = 'metanorma-ordinal')]"/></xsl:otherwise>
|
6962
7016
|
</xsl:choose>
|
6963
7017
|
</xsl:if>
|
6964
7018
|
</xsl:variable>
|
@@ -6979,10 +7033,19 @@
|
|
6979
7033
|
<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
|
6980
7034
|
<!-- end ISO bibitem processing -->
|
6981
7035
|
|
7036
|
+
|
6982
7037
|
|
7038
|
+
|
7039
|
+
|
7040
|
+
<!-- end MPFD bibitem processing -->
|
7041
|
+
|
7042
|
+
<!-- start M3D bibitem processing -->
|
7043
|
+
|
7044
|
+
|
7045
|
+
|
6983
7046
|
|
6984
7047
|
</xsl:template><xsl:template name="processBibitemDocId">
|
6985
|
-
<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
|
7048
|
+
<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
|
6986
7049
|
<xsl:choose>
|
6987
7050
|
<xsl:when test="normalize-space($_doc_ident) != ''">
|
6988
7051
|
<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
|
@@ -6996,7 +7059,7 @@
|
|
6996
7059
|
<xsl:if test="$type != ''">
|
6997
7060
|
<xsl:value-of select="$type"/><xsl:text> </xsl:text>
|
6998
7061
|
</xsl:if> -->
|
6999
|
-
<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
|
7062
|
+
<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma') and not(@type = 'metanorma-ordinal')]"/>
|
7000
7063
|
</xsl:otherwise>
|
7001
7064
|
</xsl:choose>
|
7002
7065
|
</xsl:template><xsl:template name="processPersonalAuthor">
|
@@ -7102,8 +7165,12 @@
|
|
7102
7165
|
<fo:block> </fo:block>
|
7103
7166
|
</fo:block-container>
|
7104
7167
|
</xsl:template><xsl:variable name="toc_level">
|
7168
|
+
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
7169
|
+
<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
|
7170
|
+
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
7105
7171
|
<xsl:choose>
|
7106
|
-
<xsl:when test="
|
7172
|
+
<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
7173
|
+
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
7107
7174
|
<xsl:otherwise><!-- default value -->
|
7108
7175
|
|
7109
7176
|
|
@@ -7205,7 +7272,7 @@
|
|
7205
7272
|
</td>
|
7206
7273
|
</xsl:for-each>
|
7207
7274
|
<td>333</td> <!-- page number, just for fill -->
|
7208
|
-
</xsl:template><xsl:template match="*[local-name() = 'variant-title']
|
7275
|
+
</xsl:template><xsl:template match="*[local-name() = 'variant-title']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
|
7209
7276
|
<fo:inline padding-right="5mm"> </fo:inline>
|
7210
7277
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
7211
7278
|
</xsl:template><xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare">
|
@@ -1811,7 +1811,10 @@
|
|
1811
1811
|
<fo:list-item-label end-indent="label-end()">
|
1812
1812
|
<fo:block>
|
1813
1813
|
<fo:inline id="{@id}">
|
1814
|
-
<xsl:
|
1814
|
+
<xsl:value-of select="iso:docidentifier[@type = 'metanorma-ordinal']"/>
|
1815
|
+
<xsl:if test="not(iso:docidentifier[@type = 'metanorma-ordinal'])">
|
1816
|
+
<xsl:number format="[1]"/>
|
1817
|
+
</xsl:if>
|
1815
1818
|
</fo:inline>
|
1816
1819
|
</fo:block>
|
1817
1820
|
</fo:list-item-label>
|
@@ -1824,9 +1827,6 @@
|
|
1824
1827
|
</fo:list-block>
|
1825
1828
|
</xsl:template>
|
1826
1829
|
|
1827
|
-
<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem" mode="contents"/> [not(@normative='true')] -->
|
1828
|
-
<xsl:template match="iso:references/iso:bibitem" mode="contents"/>
|
1829
|
-
|
1830
1830
|
<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem/iso:title"> iso:references[not(@normative='true')]/ -->
|
1831
1831
|
<xsl:template match="iso:bibitem/iso:title">
|
1832
1832
|
<fo:inline font-style="italic">
|
@@ -5702,11 +5702,58 @@
|
|
5702
5702
|
<xsl:value-of select="."/>
|
5703
5703
|
</xsl:template><xsl:template match="node()" mode="contents">
|
5704
5704
|
<xsl:apply-templates mode="contents"/>
|
5705
|
+
</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="2" mode="contents">
|
5706
|
+
<xsl:variable name="level">
|
5707
|
+
<xsl:call-template name="getLevel">
|
5708
|
+
<xsl:with-param name="depth" select="@depth"/>
|
5709
|
+
</xsl:call-template>
|
5710
|
+
</xsl:variable>
|
5711
|
+
|
5712
|
+
<xsl:variable name="section">
|
5713
|
+
<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
|
5714
|
+
</xsl:variable>
|
5715
|
+
|
5716
|
+
<xsl:variable name="type">floating-title</xsl:variable>
|
5717
|
+
|
5718
|
+
<xsl:variable name="display">
|
5719
|
+
<xsl:choose>
|
5720
|
+
<xsl:when test="normalize-space(@id) = ''">false</xsl:when>
|
5721
|
+
<xsl:when test="$level <= $toc_level">true</xsl:when>
|
5722
|
+
<xsl:otherwise>false</xsl:otherwise>
|
5723
|
+
</xsl:choose>
|
5724
|
+
</xsl:variable>
|
5725
|
+
|
5726
|
+
<xsl:variable name="skip">false</xsl:variable>
|
5727
|
+
|
5728
|
+
<xsl:if test="$skip = 'false'">
|
5729
|
+
|
5730
|
+
<xsl:variable name="title">
|
5731
|
+
<xsl:choose>
|
5732
|
+
<xsl:when test="*[local-name() = 'tab']">
|
5733
|
+
<xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
|
5734
|
+
</xsl:when>
|
5735
|
+
<xsl:otherwise>
|
5736
|
+
<xsl:copy-of select="node()"/>
|
5737
|
+
</xsl:otherwise>
|
5738
|
+
</xsl:choose>
|
5739
|
+
</xsl:variable>
|
5740
|
+
|
5741
|
+
<xsl:variable name="root">
|
5742
|
+
<xsl:if test="ancestor-or-self::*[local-name() = 'preface']">preface</xsl:if>
|
5743
|
+
<xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
|
5744
|
+
</xsl:variable>
|
5745
|
+
|
5746
|
+
<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
|
5747
|
+
<title>
|
5748
|
+
<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
|
5749
|
+
</title>
|
5750
|
+
</item>
|
5751
|
+
</xsl:if>
|
5705
5752
|
</xsl:template><xsl:template match="node()" mode="bookmarks">
|
5706
5753
|
<xsl:apply-templates mode="bookmarks"/>
|
5707
5754
|
</xsl:template><xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
|
5708
5755
|
<xsl:apply-templates select="."/>
|
5709
|
-
</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
|
5756
|
+
</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
|
5710
5757
|
<xsl:apply-templates mode="bookmarks"/>
|
5711
5758
|
</xsl:template><xsl:template name="addBookmarks">
|
5712
5759
|
<xsl:param name="contents"/>
|
@@ -6622,6 +6669,8 @@
|
|
6622
6669
|
<xsl:if test="*[local-name() = 'strong']">
|
6623
6670
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
6624
6671
|
</xsl:if>
|
6672
|
+
</xsl:template><xsl:template match="*[local-name() = 'preferred']/text()[contains(., ';')] | *[local-name() = 'preferred']/*[local-name() = 'strong']/text()[contains(., ';')]">
|
6673
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
|
6625
6674
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
6626
6675
|
<fo:block xsl:use-attribute-sets="definition-style">
|
6627
6676
|
<xsl:apply-templates/>
|
@@ -6947,7 +6996,12 @@
|
|
6947
6996
|
|
6948
6997
|
|
6949
6998
|
|
6950
|
-
|
6999
|
+
|
7000
|
+
|
7001
|
+
|
7002
|
+
|
7003
|
+
|
7004
|
+
|
6951
7005
|
|
6952
7006
|
|
6953
7007
|
|
@@ -6958,7 +7012,7 @@
|
|
6958
7012
|
<xsl:if test="*[local-name() = 'docidentifier']">
|
6959
7013
|
<xsl:choose>
|
6960
7014
|
<xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/>
|
6961
|
-
<xsl:otherwise><xsl:value-of select="*[local-name() = '
|
7015
|
+
<xsl:otherwise><xsl:value-of select="*[local-name()='docidentifier'][not(@type = 'metanorma-ordinal')]"/></xsl:otherwise>
|
6962
7016
|
</xsl:choose>
|
6963
7017
|
</xsl:if>
|
6964
7018
|
</xsl:variable>
|
@@ -6979,10 +7033,19 @@
|
|
6979
7033
|
<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
|
6980
7034
|
<!-- end ISO bibitem processing -->
|
6981
7035
|
|
7036
|
+
|
6982
7037
|
|
7038
|
+
|
7039
|
+
|
7040
|
+
<!-- end MPFD bibitem processing -->
|
7041
|
+
|
7042
|
+
<!-- start M3D bibitem processing -->
|
7043
|
+
|
7044
|
+
|
7045
|
+
|
6983
7046
|
|
6984
7047
|
</xsl:template><xsl:template name="processBibitemDocId">
|
6985
|
-
<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
|
7048
|
+
<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
|
6986
7049
|
<xsl:choose>
|
6987
7050
|
<xsl:when test="normalize-space($_doc_ident) != ''">
|
6988
7051
|
<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
|
@@ -6996,7 +7059,7 @@
|
|
6996
7059
|
<xsl:if test="$type != ''">
|
6997
7060
|
<xsl:value-of select="$type"/><xsl:text> </xsl:text>
|
6998
7061
|
</xsl:if> -->
|
6999
|
-
<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
|
7062
|
+
<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma') and not(@type = 'metanorma-ordinal')]"/>
|
7000
7063
|
</xsl:otherwise>
|
7001
7064
|
</xsl:choose>
|
7002
7065
|
</xsl:template><xsl:template name="processPersonalAuthor">
|
@@ -7102,8 +7165,12 @@
|
|
7102
7165
|
<fo:block> </fo:block>
|
7103
7166
|
</fo:block-container>
|
7104
7167
|
</xsl:template><xsl:variable name="toc_level">
|
7168
|
+
<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
|
7169
|
+
<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
|
7170
|
+
<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
|
7105
7171
|
<xsl:choose>
|
7106
|
-
<xsl:when test="
|
7172
|
+
<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
|
7173
|
+
<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when> <!-- if there is value in xml -->
|
7107
7174
|
<xsl:otherwise><!-- default value -->
|
7108
7175
|
|
7109
7176
|
|
@@ -7205,7 +7272,7 @@
|
|
7205
7272
|
</td>
|
7206
7273
|
</xsl:for-each>
|
7207
7274
|
<td>333</td> <!-- page number, just for fill -->
|
7208
|
-
</xsl:template><xsl:template match="*[local-name() = 'variant-title']
|
7275
|
+
</xsl:template><xsl:template match="*[local-name() = 'variant-title']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
|
7209
7276
|
<fo:inline padding-right="5mm"> </fo:inline>
|
7210
7277
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
7211
7278
|
</xsl:template><xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare">
|
data/metanorma-iso.gemspec
CHANGED
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
|
|
30
30
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
|
31
31
|
|
32
32
|
spec.add_dependency "metanorma-standoc", "~> 1.11.0"
|
33
|
-
spec.add_dependency "mnconvert", "~>
|
33
|
+
spec.add_dependency "mnconvert", "~> 1.14"
|
34
34
|
spec.add_dependency "ruby-jing"
|
35
35
|
spec.add_dependency "tokenizer", "~> 0.3.0"
|
36
36
|
spec.add_dependency "twitter_cldr"
|
@@ -641,7 +641,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
641
641
|
<substage>60</substage>
|
642
642
|
</status>
|
643
643
|
<copyright>
|
644
|
-
<from
|
644
|
+
<from>#{Time.new.year}</from>
|
645
645
|
<owner>
|
646
646
|
<organization>
|
647
647
|
<name>International Organization for Standardization</name>
|
@@ -718,7 +718,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
718
718
|
<substage>60</substage>
|
719
719
|
</status>
|
720
720
|
<copyright>
|
721
|
-
<from
|
721
|
+
<from>#{Time.new.year}</from>
|
722
722
|
<owner>
|
723
723
|
<organization>
|
724
724
|
<name>International Organization for Standardization</name>
|
data/spec/isodoc/section_spec.rb
CHANGED
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.10.
|
4
|
+
version: 1.10.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-01-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-standoc
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
33
|
+
version: '1.14'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '1.14'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: ruby-jing
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -318,17 +318,12 @@ files:
|
|
318
318
|
- lib/isodoc/iso/html/header.html
|
319
319
|
- lib/isodoc/iso/html/html_iso_intro.html
|
320
320
|
- lib/isodoc/iso/html/html_iso_titlepage.html
|
321
|
-
- lib/isodoc/iso/html/htmlstyle.css
|
322
321
|
- lib/isodoc/iso/html/htmlstyle.scss
|
323
|
-
- lib/isodoc/iso/html/isodoc.css
|
324
322
|
- lib/isodoc/iso/html/isodoc.scss
|
325
|
-
- lib/isodoc/iso/html/style-human.css
|
326
323
|
- lib/isodoc/iso/html/style-human.scss
|
327
|
-
- lib/isodoc/iso/html/style-iso.css
|
328
324
|
- lib/isodoc/iso/html/style-iso.scss
|
329
325
|
- lib/isodoc/iso/html/word_iso_intro.html
|
330
326
|
- lib/isodoc/iso/html/word_iso_titlepage.html
|
331
|
-
- lib/isodoc/iso/html/wordstyle.css
|
332
327
|
- lib/isodoc/iso/html/wordstyle.scss
|
333
328
|
- lib/isodoc/iso/html_convert.rb
|
334
329
|
- lib/isodoc/iso/i18n-en.yaml
|
@@ -413,7 +408,7 @@ homepage: https://github.com/metanorma/metanorma-iso
|
|
413
408
|
licenses:
|
414
409
|
- BSD-2-Clause
|
415
410
|
metadata: {}
|
416
|
-
post_install_message:
|
411
|
+
post_install_message:
|
417
412
|
rdoc_options: []
|
418
413
|
require_paths:
|
419
414
|
- lib
|
@@ -428,8 +423,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
428
423
|
- !ruby/object:Gem::Version
|
429
424
|
version: '0'
|
430
425
|
requirements: []
|
431
|
-
rubygems_version: 3.
|
432
|
-
signing_key:
|
426
|
+
rubygems_version: 3.0.3
|
427
|
+
signing_key:
|
433
428
|
specification_version: 4
|
434
429
|
summary: metanorma-iso lets you write ISO standards in AsciiDoc.
|
435
430
|
test_files: []
|
@@ -1,47 +0,0 @@
|
|
1
|
-
p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
|
2
|
-
mso-style-noshow: yes;
|
3
|
-
mso-style-priority: 99;
|
4
|
-
mso-style-link: "Comment Text Char";
|
5
|
-
margin-top: 0cm;
|
6
|
-
margin-right: 0cm;
|
7
|
-
margin-bottom: 12.0pt;
|
8
|
-
margin-left: 0cm;
|
9
|
-
text-align: justify;
|
10
|
-
line-height: 12.0pt;
|
11
|
-
mso-pagination: widow-orphan;
|
12
|
-
tab-stops: 20.15pt;
|
13
|
-
font-size: {{normalfontsize}};
|
14
|
-
font-family: {{bodyfont}};
|
15
|
-
mso-fareast-font-family: Calibri;
|
16
|
-
mso-bidi-font-family: "Times New Roman";
|
17
|
-
mso-ansi-language: EN-GB;
|
18
|
-
mso-fareast-language: EN-US; }
|
19
|
-
|
20
|
-
span.MsoCommentReference {
|
21
|
-
mso-style-noshow: yes;
|
22
|
-
mso-style-priority: 99;
|
23
|
-
mso-style-parent: "";
|
24
|
-
mso-ansi-font-size: 9.0pt;
|
25
|
-
mso-bidi-font-size: 9.0pt; }
|
26
|
-
|
27
|
-
p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
|
28
|
-
mso-style-noshow: yes;
|
29
|
-
mso-style-priority: 99;
|
30
|
-
mso-style-parent: "Comment Text";
|
31
|
-
mso-style-link: "Comment Subject Char";
|
32
|
-
mso-style-next: "Comment Text";
|
33
|
-
margin-top: 0cm;
|
34
|
-
margin-right: 0cm;
|
35
|
-
margin-bottom: 12.0pt;
|
36
|
-
margin-left: 0cm;
|
37
|
-
text-align: justify;
|
38
|
-
line-height: 12.0pt;
|
39
|
-
mso-pagination: widow-orphan;
|
40
|
-
tab-stops: 20.15pt;
|
41
|
-
font-size: 10.0pt;
|
42
|
-
font-family: {{headerfont}};
|
43
|
-
mso-fareast-font-family: Calibri;
|
44
|
-
mso-bidi-font-family: "Times New Roman";
|
45
|
-
mso-ansi-language: EN-GB;
|
46
|
-
mso-fareast-language: EN-US;
|
47
|
-
font-weight: bold; }
|