metanorma-ribose 1.7.8 → 1.7.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/ribose/reqt.rng +15 -4
- data/lib/isodoc/ribose/ribose.standard.xsl +46 -24
- data/lib/metanorma/ribose/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: 85a67a65aaf39dbf6e67b37b7b49921cb2dc7dacf3035d028282902d4ed204be
|
4
|
+
data.tar.gz: baf1941de34db0f2381201e2d8deee08b71bae21d6d73a5bddd7a8a218723f80
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4d0122b1bcb9e25adf9152ea785c6ed7166a8c6d57b0b012d740ea28a40231429e650f8e12097d0bfb6ff0caf9ca1673260f6dc910b6a727655a1602150f5dc6
|
7
|
+
data.tar.gz: c84a21a248310430fc2d9d9d4ee9cb1f7d3b2dea88e2162b33d971fa34b515a1e9798a00d00486fc610c03ec5af229bebb59dc93febf6a5b23e70a33c9d02207
|
@@ -64,9 +64,9 @@
|
|
64
64
|
<optional>
|
65
65
|
<ref name="label"/>
|
66
66
|
</optional>
|
67
|
-
<
|
67
|
+
<zeroOrMore>
|
68
68
|
<ref name="subject"/>
|
69
|
-
</
|
69
|
+
</zeroOrMore>
|
70
70
|
<zeroOrMore>
|
71
71
|
<ref name="reqinherit"/>
|
72
72
|
</zeroOrMore>
|
@@ -80,6 +80,7 @@
|
|
80
80
|
<ref name="verification"/>
|
81
81
|
<ref name="import"/>
|
82
82
|
<ref name="description"/>
|
83
|
+
<ref name="component"/>
|
83
84
|
</choice>
|
84
85
|
</zeroOrMore>
|
85
86
|
<optional>
|
@@ -105,12 +106,16 @@
|
|
105
106
|
</define>
|
106
107
|
<define name="subject">
|
107
108
|
<element name="subject">
|
108
|
-
<
|
109
|
+
<oneOrMore>
|
110
|
+
<ref name="TextElement"/>
|
111
|
+
</oneOrMore>
|
109
112
|
</element>
|
110
113
|
</define>
|
111
114
|
<define name="reqinherit">
|
112
115
|
<element name="inherit">
|
113
|
-
<
|
116
|
+
<oneOrMore>
|
117
|
+
<ref name="TextElement"/>
|
118
|
+
</oneOrMore>
|
114
119
|
</element>
|
115
120
|
</define>
|
116
121
|
<define name="measurementtarget">
|
@@ -138,6 +143,12 @@
|
|
138
143
|
<ref name="RequirementSubpart"/>
|
139
144
|
</element>
|
140
145
|
</define>
|
146
|
+
<define name="component">
|
147
|
+
<element name="component">
|
148
|
+
<attribute name="class"/>
|
149
|
+
<ref name="RequirementSubpart"/>
|
150
|
+
</element>
|
151
|
+
</define>
|
141
152
|
<define name="reqt_references">
|
142
153
|
<element name="references">
|
143
154
|
<oneOrMore>
|
@@ -1734,6 +1734,7 @@
|
|
1734
1734
|
|
1735
1735
|
|
1736
1736
|
|
1737
|
+
|
1737
1738
|
|
1738
1739
|
<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
|
1739
1740
|
|
@@ -2231,6 +2232,8 @@
|
|
2231
2232
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
2232
2233
|
</xsl:if>
|
2233
2234
|
|
2235
|
+
|
2236
|
+
|
2234
2237
|
<xsl:choose>
|
2235
2238
|
<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
|
2236
2239
|
<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
|
@@ -2518,9 +2521,9 @@
|
|
2518
2521
|
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
|
2519
2522
|
<xsl:with-param name="continued">true</xsl:with-param>
|
2520
2523
|
</xsl:apply-templates>
|
2521
|
-
|
2522
|
-
|
2523
|
-
|
2524
|
+
|
2525
|
+
|
2526
|
+
|
2524
2527
|
|
2525
2528
|
</fo:table-cell>
|
2526
2529
|
</fo:table-row>
|
@@ -2602,7 +2605,11 @@
|
|
2602
2605
|
|
2603
2606
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
2604
2607
|
|
2605
|
-
<xsl:
|
2608
|
+
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
2609
|
+
|
2610
|
+
</xsl:variable>
|
2611
|
+
|
2612
|
+
<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
|
2606
2613
|
|
2607
2614
|
<xsl:variable name="cols-count">
|
2608
2615
|
<xsl:choose>
|
@@ -2745,6 +2752,19 @@
|
|
2745
2752
|
|
2746
2753
|
</fo:table-body>
|
2747
2754
|
|
2755
|
+
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
|
2756
|
+
<xsl:choose>
|
2757
|
+
<xsl:when test="substring-after(., '—') != ''">
|
2758
|
+
<xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
|
2759
|
+
</xsl:when>
|
2760
|
+
<xsl:otherwise>
|
2761
|
+
<xsl:value-of select="."/>
|
2762
|
+
</xsl:otherwise>
|
2763
|
+
</xsl:choose>
|
2764
|
+
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
|
2765
|
+
<xsl:apply-templates mode="presentation_name"/>
|
2766
|
+
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
|
2767
|
+
<xsl:apply-templates select="."/>
|
2748
2768
|
</xsl:template><xsl:template match="*[local-name()='tr']">
|
2749
2769
|
<xsl:variable name="parent-name" select="local-name(..)"/>
|
2750
2770
|
<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
|
@@ -2940,14 +2960,12 @@
|
|
2940
2960
|
<xsl:apply-templates/>
|
2941
2961
|
</xsl:template><xsl:template name="fn_display">
|
2942
2962
|
<xsl:variable name="references">
|
2963
|
+
|
2943
2964
|
<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
|
2944
|
-
<
|
2945
|
-
|
2946
|
-
|
2947
|
-
<xsl:apply-templates/>
|
2948
|
-
</fn>
|
2965
|
+
<xsl:call-template name="create_fn"/>
|
2949
2966
|
</xsl:for-each>
|
2950
2967
|
</xsl:variable>
|
2968
|
+
|
2951
2969
|
<xsl:for-each select="xalan:nodeset($references)//fn">
|
2952
2970
|
<xsl:variable name="reference" select="@reference"/>
|
2953
2971
|
<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
|
@@ -2981,6 +2999,12 @@
|
|
2981
2999
|
</fo:block>
|
2982
3000
|
</xsl:if>
|
2983
3001
|
</xsl:for-each>
|
3002
|
+
</xsl:template><xsl:template name="create_fn">
|
3003
|
+
<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
|
3004
|
+
|
3005
|
+
|
3006
|
+
<xsl:apply-templates/>
|
3007
|
+
</fn>
|
2984
3008
|
</xsl:template><xsl:template name="fn_name_display">
|
2985
3009
|
<!-- <xsl:variable name="references">
|
2986
3010
|
<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
|
@@ -3995,19 +4019,6 @@
|
|
3995
4019
|
<!-- replace start and end spaces to non-break space -->
|
3996
4020
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
|
3997
4021
|
</xsl:copy>
|
3998
|
-
</xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
|
3999
|
-
<xsl:copy>
|
4000
|
-
<xsl:apply-templates select="@*|node()" mode="mathml"/>
|
4001
|
-
</xsl:copy>
|
4002
|
-
<xsl:choose>
|
4003
|
-
<!-- if in msub, then don't add space -->
|
4004
|
-
<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
|
4005
|
-
<!-- if next char in digit, don't add space -->
|
4006
|
-
<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
|
4007
|
-
<xsl:otherwise>
|
4008
|
-
<mathml:mspace width="0.5ex"/>
|
4009
|
-
</xsl:otherwise>
|
4010
|
-
</xsl:choose>
|
4011
4022
|
</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">
|
4012
4023
|
<xsl:variable name="target">
|
4013
4024
|
<xsl:choose>
|
@@ -5211,7 +5222,19 @@
|
|
5211
5222
|
</fo:inline>
|
5212
5223
|
</xsl:if>
|
5213
5224
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
|
5214
|
-
<
|
5225
|
+
<xsl:variable name="element">inline
|
5226
|
+
|
5227
|
+
</xsl:variable>
|
5228
|
+
<xsl:choose>
|
5229
|
+
<xsl:when test="contains($element, 'block')">
|
5230
|
+
<fo:block xsl:use-attribute-sets="example-p-style">
|
5231
|
+
<xsl:apply-templates/>
|
5232
|
+
</fo:block>
|
5233
|
+
</xsl:when>
|
5234
|
+
<xsl:otherwise>
|
5235
|
+
<fo:inline><xsl:apply-templates/></fo:inline>
|
5236
|
+
</xsl:otherwise>
|
5237
|
+
</xsl:choose>
|
5215
5238
|
</xsl:template><xsl:template match="*[local-name() = 'example']">
|
5216
5239
|
<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
|
5217
5240
|
|
@@ -5796,7 +5819,6 @@
|
|
5796
5819
|
</xsl:template><xsl:template name="processBibitem">
|
5797
5820
|
|
5798
5821
|
|
5799
|
-
<!-- end BIPM bibitem processing-->
|
5800
5822
|
|
5801
5823
|
|
5802
5824
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-ribose
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-08-
|
11
|
+
date: 2021-08-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|