metanorma-ogc 1.3.8 → 1.4.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e1cf7a554aa5d0925f31dadc79986085ae51643cdcc2e3367087da1b2dc9e99b
4
- data.tar.gz: 95a95b35de2d3f9613779bcef6a32b3a21ecfd7b4df77c3411b9da2755369a35
3
+ metadata.gz: 28745dd5a01a192127b2f83263b77bef14f84b34a29250917c52ef19b299abbf
4
+ data.tar.gz: d4b8436c3181ddb7ec37a138ba92de16e8ca52b598aa7bb776fe6a96e857f558
5
5
  SHA512:
6
- metadata.gz: 4b11e5d10627ebd1946e97cdd36ac9c32018033d3044242437149212d9ff6f182ba8c5e1fd9fda1a8fbb66629e36f2de8c40e20ed3022e33aa55a3850dc27141
7
- data.tar.gz: b362a4c65d8c69d3ab99251c9067d6c5a3225e1d391c05953eab122ce5b0a154c17c6d4ac25c5933d12f7542a2c57d42120e8e9eb9561f5b959ded3c2128ddb4
6
+ metadata.gz: 3eef074b538b1ebd105b1cdf5964738635da7995356276e1eb137199a812d7ca47116d29eca8074fbd5f031b40aa511c8d3e1895b97399f733e9a0e795932815
7
+ data.tar.gz: a7ff610163cc1661bcf9fc85a7e112e01b974d1a324a6f6347c6c53b78a9153b6a6f29e90f8ecebaa3c97de1955f26051e6981882467fd3f9af997979f5ab83a
@@ -62,6 +62,19 @@
62
62
  </optional>
63
63
  </element>
64
64
  </define>
65
+ <define name="DocumentSubtype">
66
+ <choice>
67
+ <value>conceptual-model</value>
68
+ <value>conceptual-model-and-encoding</value>
69
+ <value>conceptual-model-and-implementation</value>
70
+ <value>encoding</value>
71
+ <value>extension</value>
72
+ <value>implementation</value>
73
+ <value>profile</value>
74
+ <value>profile-with-extension</value>
75
+ <value>general</value>
76
+ </choice>
77
+ </define>
65
78
  </include>
66
79
  <define name="TextElement" combine="choice">
67
80
  <ref name="hi"/>
@@ -79,19 +92,6 @@
79
92
  </zeroOrMore>
80
93
  </element>
81
94
  </define>
82
- <define name="DocumentSubtype">
83
- <choice>
84
- <value>conceptual-model</value>
85
- <value>conceptual-model-and-encoding</value>
86
- <value>conceptual-model-and-implementation</value>
87
- <value>encoding</value>
88
- <value>extension</value>
89
- <value>implementation</value>
90
- <value>profile</value>
91
- <value>profile-with-extension</value>
92
- <value>general</value>
93
- </choice>
94
- </define>
95
95
  <define name="submitters">
96
96
  <element name="submitters">
97
97
  <ref name="Basic-Section"/>
@@ -64,9 +64,9 @@
64
64
  <optional>
65
65
  <ref name="label"/>
66
66
  </optional>
67
- <optional>
67
+ <zeroOrMore>
68
68
  <ref name="subject"/>
69
- </optional>
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
- <text/>
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
- <text/>
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>
@@ -1774,6 +1774,7 @@
1774
1774
 
1775
1775
 
1776
1776
 
1777
+
1777
1778
 
1778
1779
  <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
1779
1780
 
@@ -2263,6 +2264,8 @@
2263
2264
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2264
2265
  </xsl:if>
2265
2266
 
2267
+
2268
+
2266
2269
  <xsl:choose>
2267
2270
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
2268
2271
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2547,9 +2550,9 @@
2547
2550
  <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2548
2551
  <xsl:with-param name="continued">true</xsl:with-param>
2549
2552
  </xsl:apply-templates>
2550
- <xsl:for-each select="ancestor::*[local-name()='table'][1]">
2551
- <xsl:call-template name="fn_name_display"/>
2552
- </xsl:for-each>
2553
+
2554
+
2555
+
2553
2556
 
2554
2557
  </fo:table-cell>
2555
2558
  </fo:table-row>
@@ -2633,7 +2636,11 @@
2633
2636
 
2634
2637
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2635
2638
 
2636
- <xsl:if test="$isNoteOrFnExist = 'true'">
2639
+ <xsl:variable name="isNoteOrFnExistShowAfterTable">
2640
+
2641
+ </xsl:variable>
2642
+
2643
+ <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
2637
2644
 
2638
2645
  <xsl:variable name="cols-count">
2639
2646
  <xsl:choose>
@@ -2776,6 +2783,19 @@
2776
2783
 
2777
2784
  </fo:table-body>
2778
2785
 
2786
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2787
+ <xsl:choose>
2788
+ <xsl:when test="substring-after(., '—') != ''">
2789
+ <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2790
+ </xsl:when>
2791
+ <xsl:otherwise>
2792
+ <xsl:value-of select="."/>
2793
+ </xsl:otherwise>
2794
+ </xsl:choose>
2795
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2796
+ <xsl:apply-templates mode="presentation_name"/>
2797
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2798
+ <xsl:apply-templates select="."/>
2779
2799
  </xsl:template><xsl:template match="*[local-name()='tr']">
2780
2800
  <xsl:variable name="parent-name" select="local-name(..)"/>
2781
2801
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -2964,20 +2984,12 @@
2964
2984
  <xsl:apply-templates/>
2965
2985
  </xsl:template><xsl:template name="fn_display">
2966
2986
  <xsl:variable name="references">
2987
+
2967
2988
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
2968
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2969
-
2970
-
2971
- <xsl:attribute name="id">
2972
- <xsl:value-of select="@reference"/>
2973
- <xsl:text>_</xsl:text>
2974
- <xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
2975
- </xsl:attribute>
2976
-
2977
- <xsl:apply-templates/>
2978
- </fn>
2989
+ <xsl:call-template name="create_fn"/>
2979
2990
  </xsl:for-each>
2980
2991
  </xsl:variable>
2992
+
2981
2993
  <xsl:for-each select="xalan:nodeset($references)//fn">
2982
2994
  <xsl:variable name="reference" select="@reference"/>
2983
2995
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -3013,6 +3025,18 @@
3013
3025
  </fo:block>
3014
3026
  </xsl:if>
3015
3027
  </xsl:for-each>
3028
+ </xsl:template><xsl:template name="create_fn">
3029
+ <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
3030
+
3031
+
3032
+ <xsl:attribute name="id">
3033
+ <xsl:value-of select="@reference"/>
3034
+ <xsl:text>_</xsl:text>
3035
+ <xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
3036
+ </xsl:attribute>
3037
+
3038
+ <xsl:apply-templates/>
3039
+ </fn>
3016
3040
  </xsl:template><xsl:template name="fn_name_display">
3017
3041
  <!-- <xsl:variable name="references">
3018
3042
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -4023,19 +4047,6 @@
4023
4047
  <!-- replace start and end spaces to non-break space -->
4024
4048
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
4025
4049
  </xsl:copy>
4026
- </xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
4027
- <xsl:copy>
4028
- <xsl:apply-templates select="@*|node()" mode="mathml"/>
4029
- </xsl:copy>
4030
- <xsl:choose>
4031
- <!-- if in msub, then don't add space -->
4032
- <xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
4033
- <!-- if next char in digit, don't add space -->
4034
- <xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
4035
- <xsl:otherwise>
4036
- <mathml:mspace width="0.5ex"/>
4037
- </xsl:otherwise>
4038
- </xsl:choose>
4039
4050
  </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">
4040
4051
  <xsl:variable name="target">
4041
4052
  <xsl:choose>
@@ -5274,7 +5285,19 @@
5274
5285
  </fo:inline>
5275
5286
  </xsl:if>
5276
5287
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
5277
- <fo:inline><xsl:apply-templates/></fo:inline>
5288
+ <xsl:variable name="element">inline
5289
+
5290
+ </xsl:variable>
5291
+ <xsl:choose>
5292
+ <xsl:when test="contains($element, 'block')">
5293
+ <fo:block xsl:use-attribute-sets="example-p-style">
5294
+ <xsl:apply-templates/>
5295
+ </fo:block>
5296
+ </xsl:when>
5297
+ <xsl:otherwise>
5298
+ <fo:inline><xsl:apply-templates/></fo:inline>
5299
+ </xsl:otherwise>
5300
+ </xsl:choose>
5278
5301
  </xsl:template><xsl:template match="*[local-name() = 'example']">
5279
5302
  <fo:block id="{@id}" xsl:use-attribute-sets="example-style">
5280
5303
 
@@ -5857,7 +5880,6 @@
5857
5880
  </xsl:template><xsl:template name="processBibitem">
5858
5881
 
5859
5882
 
5860
- <!-- end BIPM bibitem processing-->
5861
5883
 
5862
5884
 
5863
5885
  <!-- start OGC bibtem processing -->
@@ -1774,6 +1774,7 @@
1774
1774
 
1775
1775
 
1776
1776
 
1777
+
1777
1778
 
1778
1779
  <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
1779
1780
 
@@ -2263,6 +2264,8 @@
2263
2264
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2264
2265
  </xsl:if>
2265
2266
 
2267
+
2268
+
2266
2269
  <xsl:choose>
2267
2270
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
2268
2271
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2547,9 +2550,9 @@
2547
2550
  <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2548
2551
  <xsl:with-param name="continued">true</xsl:with-param>
2549
2552
  </xsl:apply-templates>
2550
- <xsl:for-each select="ancestor::*[local-name()='table'][1]">
2551
- <xsl:call-template name="fn_name_display"/>
2552
- </xsl:for-each>
2553
+
2554
+
2555
+
2553
2556
 
2554
2557
  </fo:table-cell>
2555
2558
  </fo:table-row>
@@ -2633,7 +2636,11 @@
2633
2636
 
2634
2637
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2635
2638
 
2636
- <xsl:if test="$isNoteOrFnExist = 'true'">
2639
+ <xsl:variable name="isNoteOrFnExistShowAfterTable">
2640
+
2641
+ </xsl:variable>
2642
+
2643
+ <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
2637
2644
 
2638
2645
  <xsl:variable name="cols-count">
2639
2646
  <xsl:choose>
@@ -2776,6 +2783,19 @@
2776
2783
 
2777
2784
  </fo:table-body>
2778
2785
 
2786
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2787
+ <xsl:choose>
2788
+ <xsl:when test="substring-after(., '—') != ''">
2789
+ <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2790
+ </xsl:when>
2791
+ <xsl:otherwise>
2792
+ <xsl:value-of select="."/>
2793
+ </xsl:otherwise>
2794
+ </xsl:choose>
2795
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2796
+ <xsl:apply-templates mode="presentation_name"/>
2797
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2798
+ <xsl:apply-templates select="."/>
2779
2799
  </xsl:template><xsl:template match="*[local-name()='tr']">
2780
2800
  <xsl:variable name="parent-name" select="local-name(..)"/>
2781
2801
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -2964,20 +2984,12 @@
2964
2984
  <xsl:apply-templates/>
2965
2985
  </xsl:template><xsl:template name="fn_display">
2966
2986
  <xsl:variable name="references">
2987
+
2967
2988
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
2968
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2969
-
2970
-
2971
- <xsl:attribute name="id">
2972
- <xsl:value-of select="@reference"/>
2973
- <xsl:text>_</xsl:text>
2974
- <xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
2975
- </xsl:attribute>
2976
-
2977
- <xsl:apply-templates/>
2978
- </fn>
2989
+ <xsl:call-template name="create_fn"/>
2979
2990
  </xsl:for-each>
2980
2991
  </xsl:variable>
2992
+
2981
2993
  <xsl:for-each select="xalan:nodeset($references)//fn">
2982
2994
  <xsl:variable name="reference" select="@reference"/>
2983
2995
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -3013,6 +3025,18 @@
3013
3025
  </fo:block>
3014
3026
  </xsl:if>
3015
3027
  </xsl:for-each>
3028
+ </xsl:template><xsl:template name="create_fn">
3029
+ <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
3030
+
3031
+
3032
+ <xsl:attribute name="id">
3033
+ <xsl:value-of select="@reference"/>
3034
+ <xsl:text>_</xsl:text>
3035
+ <xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
3036
+ </xsl:attribute>
3037
+
3038
+ <xsl:apply-templates/>
3039
+ </fn>
3016
3040
  </xsl:template><xsl:template name="fn_name_display">
3017
3041
  <!-- <xsl:variable name="references">
3018
3042
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -4023,19 +4047,6 @@
4023
4047
  <!-- replace start and end spaces to non-break space -->
4024
4048
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
4025
4049
  </xsl:copy>
4026
- </xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
4027
- <xsl:copy>
4028
- <xsl:apply-templates select="@*|node()" mode="mathml"/>
4029
- </xsl:copy>
4030
- <xsl:choose>
4031
- <!-- if in msub, then don't add space -->
4032
- <xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
4033
- <!-- if next char in digit, don't add space -->
4034
- <xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
4035
- <xsl:otherwise>
4036
- <mathml:mspace width="0.5ex"/>
4037
- </xsl:otherwise>
4038
- </xsl:choose>
4039
4050
  </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">
4040
4051
  <xsl:variable name="target">
4041
4052
  <xsl:choose>
@@ -5274,7 +5285,19 @@
5274
5285
  </fo:inline>
5275
5286
  </xsl:if>
5276
5287
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
5277
- <fo:inline><xsl:apply-templates/></fo:inline>
5288
+ <xsl:variable name="element">inline
5289
+
5290
+ </xsl:variable>
5291
+ <xsl:choose>
5292
+ <xsl:when test="contains($element, 'block')">
5293
+ <fo:block xsl:use-attribute-sets="example-p-style">
5294
+ <xsl:apply-templates/>
5295
+ </fo:block>
5296
+ </xsl:when>
5297
+ <xsl:otherwise>
5298
+ <fo:inline><xsl:apply-templates/></fo:inline>
5299
+ </xsl:otherwise>
5300
+ </xsl:choose>
5278
5301
  </xsl:template><xsl:template match="*[local-name() = 'example']">
5279
5302
  <fo:block id="{@id}" xsl:use-attribute-sets="example-style">
5280
5303
 
@@ -5857,7 +5880,6 @@
5857
5880
  </xsl:template><xsl:template name="processBibitem">
5858
5881
 
5859
5882
 
5860
- <!-- end BIPM bibitem processing-->
5861
5883
 
5862
5884
 
5863
5885
  <!-- start OGC bibtem processing -->
@@ -1774,6 +1774,7 @@
1774
1774
 
1775
1775
 
1776
1776
 
1777
+
1777
1778
 
1778
1779
  <xsl:attribute name="margin-bottom">14pt</xsl:attribute>
1779
1780
 
@@ -2263,6 +2264,8 @@
2263
2264
  <xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
2264
2265
  </xsl:if>
2265
2266
 
2267
+
2268
+
2266
2269
  <xsl:choose>
2267
2270
  <xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
2268
2271
  <xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2547,9 +2550,9 @@
2547
2550
  <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
2548
2551
  <xsl:with-param name="continued">true</xsl:with-param>
2549
2552
  </xsl:apply-templates>
2550
- <xsl:for-each select="ancestor::*[local-name()='table'][1]">
2551
- <xsl:call-template name="fn_name_display"/>
2552
- </xsl:for-each>
2553
+
2554
+
2555
+
2553
2556
 
2554
2557
  </fo:table-cell>
2555
2558
  </fo:table-row>
@@ -2633,7 +2636,11 @@
2633
2636
 
2634
2637
  <xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
2635
2638
 
2636
- <xsl:if test="$isNoteOrFnExist = 'true'">
2639
+ <xsl:variable name="isNoteOrFnExistShowAfterTable">
2640
+
2641
+ </xsl:variable>
2642
+
2643
+ <xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
2637
2644
 
2638
2645
  <xsl:variable name="cols-count">
2639
2646
  <xsl:choose>
@@ -2776,6 +2783,19 @@
2776
2783
 
2777
2784
  </fo:table-body>
2778
2785
 
2786
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
2787
+ <xsl:choose>
2788
+ <xsl:when test="substring-after(., '—') != ''">
2789
+ <xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
2790
+ </xsl:when>
2791
+ <xsl:otherwise>
2792
+ <xsl:value-of select="."/>
2793
+ </xsl:otherwise>
2794
+ </xsl:choose>
2795
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
2796
+ <xsl:apply-templates mode="presentation_name"/>
2797
+ </xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
2798
+ <xsl:apply-templates select="."/>
2779
2799
  </xsl:template><xsl:template match="*[local-name()='tr']">
2780
2800
  <xsl:variable name="parent-name" select="local-name(..)"/>
2781
2801
  <!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
@@ -2964,20 +2984,12 @@
2964
2984
  <xsl:apply-templates/>
2965
2985
  </xsl:template><xsl:template name="fn_display">
2966
2986
  <xsl:variable name="references">
2987
+
2967
2988
  <xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
2968
- <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
2969
-
2970
-
2971
- <xsl:attribute name="id">
2972
- <xsl:value-of select="@reference"/>
2973
- <xsl:text>_</xsl:text>
2974
- <xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
2975
- </xsl:attribute>
2976
-
2977
- <xsl:apply-templates/>
2978
- </fn>
2989
+ <xsl:call-template name="create_fn"/>
2979
2990
  </xsl:for-each>
2980
2991
  </xsl:variable>
2992
+
2981
2993
  <xsl:for-each select="xalan:nodeset($references)//fn">
2982
2994
  <xsl:variable name="reference" select="@reference"/>
2983
2995
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
@@ -3013,6 +3025,18 @@
3013
3025
  </fo:block>
3014
3026
  </xsl:if>
3015
3027
  </xsl:for-each>
3028
+ </xsl:template><xsl:template name="create_fn">
3029
+ <fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
3030
+
3031
+
3032
+ <xsl:attribute name="id">
3033
+ <xsl:value-of select="@reference"/>
3034
+ <xsl:text>_</xsl:text>
3035
+ <xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
3036
+ </xsl:attribute>
3037
+
3038
+ <xsl:apply-templates/>
3039
+ </fn>
3016
3040
  </xsl:template><xsl:template name="fn_name_display">
3017
3041
  <!-- <xsl:variable name="references">
3018
3042
  <xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
@@ -4023,19 +4047,6 @@
4023
4047
  <!-- replace start and end spaces to non-break space -->
4024
4048
  <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
4025
4049
  </xsl:copy>
4026
- </xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
4027
- <xsl:copy>
4028
- <xsl:apply-templates select="@*|node()" mode="mathml"/>
4029
- </xsl:copy>
4030
- <xsl:choose>
4031
- <!-- if in msub, then don't add space -->
4032
- <xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
4033
- <!-- if next char in digit, don't add space -->
4034
- <xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
4035
- <xsl:otherwise>
4036
- <mathml:mspace width="0.5ex"/>
4037
- </xsl:otherwise>
4038
- </xsl:choose>
4039
4050
  </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">
4040
4051
  <xsl:variable name="target">
4041
4052
  <xsl:choose>
@@ -5274,7 +5285,19 @@
5274
5285
  </fo:inline>
5275
5286
  </xsl:if>
5276
5287
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
5277
- <fo:inline><xsl:apply-templates/></fo:inline>
5288
+ <xsl:variable name="element">inline
5289
+
5290
+ </xsl:variable>
5291
+ <xsl:choose>
5292
+ <xsl:when test="contains($element, 'block')">
5293
+ <fo:block xsl:use-attribute-sets="example-p-style">
5294
+ <xsl:apply-templates/>
5295
+ </fo:block>
5296
+ </xsl:when>
5297
+ <xsl:otherwise>
5298
+ <fo:inline><xsl:apply-templates/></fo:inline>
5299
+ </xsl:otherwise>
5300
+ </xsl:choose>
5278
5301
  </xsl:template><xsl:template match="*[local-name() = 'example']">
5279
5302
  <fo:block id="{@id}" xsl:use-attribute-sets="example-style">
5280
5303
 
@@ -5857,7 +5880,6 @@
5857
5880
  </xsl:template><xsl:template name="processBibitem">
5858
5881
 
5859
5882
 
5860
- <!-- end BIPM bibitem processing-->
5861
5883
 
5862
5884
 
5863
5885
  <!-- start OGC bibtem processing -->