metanorma-bipm 1.1.11 → 1.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/bipm/isodoc.rng +254 -27
- data/lib/isodoc/bipm/base_convert.rb +4 -3
- data/lib/isodoc/bipm/bipm.brochure.xsl +200 -33
- data/lib/isodoc/bipm/bipm.guide.xsl +200 -33
- data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +200 -33
- data/lib/isodoc/bipm/bipm.rapport.xsl +200 -33
- data/lib/isodoc/bipm/html/htmlstyle.css +4 -2
- data/lib/isodoc/bipm/html/htmlstyle.scss +4 -1
- data/lib/isodoc/bipm/jcgm.standard.xsl +117 -19
- data/lib/metanorma/bipm/version.rb +1 -1
- data/metanorma-bipm.gemspec +3 -3
- metadata +12 -12
@@ -185,12 +185,21 @@
|
|
185
185
|
<!-- internal cover page -->
|
186
186
|
<fo:simple-page-master master-name="internal-cover-page-jcgm" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
187
187
|
<fo:region-body margin-top="11mm" margin-bottom="21mm" margin-left="25mm" margin-right="19mm"/>
|
188
|
-
<fo:region-before extent="11mm"/>
|
188
|
+
<fo:region-before region-name="header" extent="11mm"/>
|
189
189
|
<fo:region-after region-name="internal-cover-page-jcgm-footer" extent="21mm"/>
|
190
190
|
<fo:region-start extent="25mm"/>
|
191
191
|
<fo:region-end extent="19mm"/>
|
192
192
|
</fo:simple-page-master>
|
193
193
|
|
194
|
+
<!-- blank page -->
|
195
|
+
<fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
196
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
197
|
+
<fo:region-before region-name="header-blank" extent="{$marginTop}mm"/>
|
198
|
+
<fo:region-after region-name="footer-blank" extent="{$marginBottom}mm"/>
|
199
|
+
<fo:region-start region-name="left-region" extent="17mm"/>
|
200
|
+
<fo:region-end region-name="right-region" extent="26.5mm"/>
|
201
|
+
</fo:simple-page-master>
|
202
|
+
|
194
203
|
<fo:simple-page-master master-name="odd-jcgm" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
195
204
|
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
|
196
205
|
<fo:region-before region-name="header-odd-jcgm" extent="{$marginTop}mm"/> <!-- display-align="center" -->
|
@@ -207,6 +216,7 @@
|
|
207
216
|
</fo:simple-page-master>
|
208
217
|
<fo:page-sequence-master master-name="document-jcgm">
|
209
218
|
<fo:repeatable-page-master-alternatives>
|
219
|
+
<fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
|
210
220
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-jcgm"/>
|
211
221
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-jcgm"/>
|
212
222
|
</fo:repeatable-page-master-alternatives>
|
@@ -241,6 +251,7 @@
|
|
241
251
|
</fo:static-content>
|
242
252
|
<fo:flow flow-name="xsl-region-body">
|
243
253
|
<xsl:call-template name="insert_Logo-BIPM-Metro"/>
|
254
|
+
<xsl:call-template name="insertDraftWatermark"/>
|
244
255
|
<fo:block-container font-weight="bold">
|
245
256
|
<fo:block font-size="16.5pt">
|
246
257
|
<xsl:value-of select="(//jcgm:bipm-standard)[1]/jcgm:bibdata/jcgm:ext/jcgm:editorialgroup/jcgm:committee/@acronym"/>
|
@@ -286,6 +297,7 @@
|
|
286
297
|
</fo:block>
|
287
298
|
</fo:static-content>
|
288
299
|
<fo:flow flow-name="xsl-region-body">
|
300
|
+
<xsl:call-template name="insertDraftWatermark"/>
|
289
301
|
<fo:table table-layout="fixed" width="100%" font-size="13pt">
|
290
302
|
<fo:table-column column-width="134mm"/>
|
291
303
|
<fo:table-column column-width="30mm"/>
|
@@ -927,9 +939,10 @@
|
|
927
939
|
</xsl:variable>
|
928
940
|
<fo:block line-height="1.1" role="H{$level}">
|
929
941
|
<fo:block font-weight="bold" keep-with-next="always">
|
930
|
-
<xsl:apply-templates select="ancestor::*[local-name()='term']/*[local-name()='name']" mode="presentation"/>
|
942
|
+
<xsl:apply-templates select="ancestor::*[local-name()='term'][1]/*[local-name()='name']" mode="presentation"/>
|
931
943
|
</fo:block>
|
932
944
|
<fo:block font-weight="bold" keep-with-next="always">
|
945
|
+
<xsl:call-template name="setStyle_preferred"/>
|
933
946
|
<xsl:apply-templates/>
|
934
947
|
</fo:block>
|
935
948
|
</fo:block>
|
@@ -944,6 +957,7 @@
|
|
944
957
|
<xsl:apply-templates select="preceding-sibling::*[local-name()='term_name'][1]" mode="presentation"/>
|
945
958
|
</fo:block>
|
946
959
|
<fo:block font-weight="bold" keep-with-next="always">
|
960
|
+
<xsl:call-template name="setStyle_preferred"/>
|
947
961
|
<xsl:apply-templates/>
|
948
962
|
</fo:block>
|
949
963
|
</fo:block>
|
@@ -1268,7 +1282,11 @@
|
|
1268
1282
|
</xsl:variable>
|
1269
1283
|
|
1270
1284
|
<xsl:template name="insertHeaderFooter">
|
1285
|
+
<xsl:param name="isDraft"/>
|
1271
1286
|
<fo:static-content flow-name="header-even-jcgm" role="artifact">
|
1287
|
+
<xsl:call-template name="insertDraftWatermark">
|
1288
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
1289
|
+
</xsl:call-template>
|
1272
1290
|
<fo:block-container height="98%">
|
1273
1291
|
<fo:block font-size="13pt" font-weight="bold" padding-top="12mm">
|
1274
1292
|
<xsl:value-of select="$header_text"/>
|
@@ -1287,6 +1305,9 @@
|
|
1287
1305
|
</fo:block-container>
|
1288
1306
|
</fo:static-content>
|
1289
1307
|
<fo:static-content flow-name="header-odd-jcgm" role="artifact">
|
1308
|
+
<xsl:call-template name="insertDraftWatermark">
|
1309
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
1310
|
+
</xsl:call-template>
|
1290
1311
|
<fo:block-container height="98%">
|
1291
1312
|
<fo:block font-size="13pt" font-weight="bold" text-align="right" padding-top="12mm">
|
1292
1313
|
<xsl:value-of select="$header_text"/>
|
@@ -1302,9 +1323,49 @@
|
|
1302
1323
|
<fo:inline font-size="12pt" font-weight="bold"><fo:page-number/></fo:inline>
|
1303
1324
|
</fo:inline>
|
1304
1325
|
</fo:block>
|
1305
|
-
|
1306
1326
|
</fo:block-container>
|
1307
1327
|
</fo:static-content>
|
1328
|
+
<fo:static-content flow-name="header-blank" role="artifact">
|
1329
|
+
<xsl:call-template name="insertDraftWatermark">
|
1330
|
+
<xsl:with-param name="isDraft" select="$isDraft"/>
|
1331
|
+
</xsl:call-template>
|
1332
|
+
<fo:block/>
|
1333
|
+
</fo:static-content>
|
1334
|
+
</xsl:template>
|
1335
|
+
|
1336
|
+
<xsl:template name="insertDraftWatermark">
|
1337
|
+
<xsl:param name="isDraft"/>
|
1338
|
+
<xsl:if test="$isDraft = 'true' or normalize-space(//jcgm:bipm-standard/jcgm:bibdata/jcgm:version/jcgm:draft or contains(//jcgm:bipm-standard/jcgm:bibdata/jcgm:status/jcgm:stage, 'draft') or contains(//jcgm:bipm-standard/jcgm:bibdata/jcgm:status/jcgm:stage, 'projet')) = 'true'">
|
1339
|
+
<!-- DRAFT -->
|
1340
|
+
<xsl:variable name="draft_label">
|
1341
|
+
<xsl:call-template name="getLocalizedString">
|
1342
|
+
<xsl:with-param name="key">draft_label</xsl:with-param>
|
1343
|
+
</xsl:call-template>
|
1344
|
+
</xsl:variable>
|
1345
|
+
<fo:block-container absolute-position="fixed" left="0mm" top="30mm">
|
1346
|
+
<fo:block line-height="0">
|
1347
|
+
<fo:instream-foreign-object fox:alt-text="DRAFT">
|
1348
|
+
<svg:svg xmlns:svg="http://www.w3.org/2000/svg" width="200mm" height="250mm">
|
1349
|
+
<svg:g transform="rotate(-45) scale(0.6, 1)">
|
1350
|
+
<xsl:variable name="font-size">
|
1351
|
+
<xsl:choose>
|
1352
|
+
<xsl:when test="string-length($draft_label) > 5">150</xsl:when>
|
1353
|
+
<xsl:otherwise>260</xsl:otherwise>
|
1354
|
+
</xsl:choose>
|
1355
|
+
</xsl:variable>
|
1356
|
+
<svg:text x="-175mm" y="205mm" style="font-family:Arial;font-size:{$font-size}pt;font-weight:normal;fill:rgb(223, 223, 223);">
|
1357
|
+
<xsl:if test="string-length($draft_label) > 5">
|
1358
|
+
<xsl:attribute name="x">-175mm</xsl:attribute>
|
1359
|
+
<xsl:attribute name="y">180mm</xsl:attribute>
|
1360
|
+
</xsl:if>
|
1361
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($draft_label))"/>
|
1362
|
+
</svg:text>
|
1363
|
+
</svg:g>
|
1364
|
+
</svg:svg>
|
1365
|
+
</fo:instream-foreign-object>
|
1366
|
+
</fo:block>
|
1367
|
+
</fo:block-container>
|
1368
|
+
</xsl:if>
|
1308
1369
|
</xsl:template>
|
1309
1370
|
|
1310
1371
|
<xsl:template match="jcgm:title">
|
@@ -2116,6 +2177,8 @@
|
|
2116
2177
|
|
2117
2178
|
<title-list-figures lang="en">List of Figures</title-list-figures>
|
2118
2179
|
|
2180
|
+
<title-table-figures lang="en">Table of Figures</title-table-figures>
|
2181
|
+
|
2119
2182
|
<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
|
2120
2183
|
|
2121
2184
|
<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
|
@@ -2622,7 +2685,8 @@
|
|
2622
2685
|
<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
|
2623
2686
|
|
2624
2687
|
</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
|
2625
|
-
|
2688
|
+
|
2689
|
+
<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
|
2626
2690
|
<xsl:sort select="@displayorder" data-type="number"/>
|
2627
2691
|
<xsl:apply-templates select="." mode="contents"/>
|
2628
2692
|
</xsl:for-each>
|
@@ -2632,7 +2696,7 @@
|
|
2632
2696
|
<xsl:apply-templates select="." mode="contents"/>
|
2633
2697
|
</xsl:for-each>
|
2634
2698
|
|
2635
|
-
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
2699
|
+
<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
|
2636
2700
|
<xsl:sort select="@displayorder" data-type="number"/>
|
2637
2701
|
<xsl:apply-templates select="." mode="contents"/>
|
2638
2702
|
</xsl:for-each>
|
@@ -4151,6 +4215,7 @@
|
|
4151
4215
|
<fo:table-cell>
|
4152
4216
|
|
4153
4217
|
<fo:block margin-top="6pt">
|
4218
|
+
<xsl:copy-of select="@id"/>
|
4154
4219
|
|
4155
4220
|
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
4156
4221
|
|
@@ -4990,14 +5055,18 @@
|
|
4990
5055
|
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
|
4991
5056
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
4992
5057
|
</xsl:template><xsl:template match="*[local-name() = 'terms']">
|
5058
|
+
<!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
|
4993
5059
|
<fo:block id="{@id}">
|
4994
5060
|
<xsl:apply-templates/>
|
4995
5061
|
</fo:block>
|
4996
5062
|
</xsl:template><xsl:template match="*[local-name() = 'term']">
|
5063
|
+
<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
|
4997
5064
|
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
|
4998
5065
|
|
4999
5066
|
|
5000
|
-
|
5067
|
+
<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
|
5068
|
+
|
5069
|
+
</xsl:if>
|
5001
5070
|
<xsl:apply-templates/>
|
5002
5071
|
</fo:block>
|
5003
5072
|
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
|
@@ -5059,6 +5128,7 @@
|
|
5059
5128
|
<xsl:otherwise>
|
5060
5129
|
<fo:block xsl:use-attribute-sets="image-style">
|
5061
5130
|
|
5131
|
+
|
5062
5132
|
<xsl:variable name="src">
|
5063
5133
|
<xsl:call-template name="image_src"/>
|
5064
5134
|
</xsl:variable>
|
@@ -5420,12 +5490,12 @@
|
|
5420
5490
|
</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
|
5421
5491
|
<xsl:apply-templates mode="contents"/>
|
5422
5492
|
<xsl:text> </xsl:text>
|
5423
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">
|
5493
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] | *[local-name() = 'table']/*[local-name() = 'name'] | *[local-name() = 'permission']/*[local-name() = 'name'] | *[local-name() = 'recommendation']/*[local-name() = 'name'] | *[local-name() = 'requirement']/*[local-name() = 'name'] | *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
|
5424
5494
|
<xsl:apply-templates mode="bookmarks"/>
|
5425
5495
|
<xsl:text> </xsl:text>
|
5426
5496
|
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
|
5427
5497
|
<xsl:value-of select="."/>
|
5428
|
-
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']
|
5498
|
+
</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement' or local-name() = 'sourcecode']/*[local-name() = 'name']//text()" mode="bookmarks" priority="2">
|
5429
5499
|
<xsl:value-of select="."/>
|
5430
5500
|
</xsl:template><xsl:template match="node()" mode="contents">
|
5431
5501
|
<xsl:apply-templates mode="contents"/>
|
@@ -5523,6 +5593,8 @@
|
|
5523
5593
|
|
5524
5594
|
|
5525
5595
|
|
5596
|
+
|
5597
|
+
|
5526
5598
|
</fo:bookmark-tree>
|
5527
5599
|
</xsl:if>
|
5528
5600
|
</xsl:template><xsl:template name="insertFigureBookmarks">
|
@@ -5693,6 +5765,8 @@
|
|
5693
5765
|
|
5694
5766
|
|
5695
5767
|
|
5768
|
+
|
5769
|
+
|
5696
5770
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
5697
5771
|
<xsl:variable name="_font-size">
|
5698
5772
|
|
@@ -5726,13 +5800,17 @@
|
|
5726
5800
|
|
5727
5801
|
|
5728
5802
|
|
5803
|
+
|
5804
|
+
|
5729
5805
|
<xsl:apply-templates/>
|
5730
5806
|
</fo:block>
|
5731
|
-
|
5807
|
+
|
5732
5808
|
|
5733
5809
|
<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
|
5734
5810
|
|
5735
5811
|
|
5812
|
+
|
5813
|
+
|
5736
5814
|
</fo:block-container>
|
5737
5815
|
</fo:block-container>
|
5738
5816
|
</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
|
@@ -5968,7 +6046,8 @@
|
|
5968
6046
|
</fo:block>
|
5969
6047
|
</fo:table-cell>
|
5970
6048
|
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
|
5971
|
-
<fo:block font-size="11pt"
|
6049
|
+
<fo:block font-size="11pt">
|
6050
|
+
|
5972
6051
|
<xsl:apply-templates/>
|
5973
6052
|
</fo:block>
|
5974
6053
|
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
|
@@ -6078,6 +6157,7 @@
|
|
6078
6157
|
</xsl:choose>
|
6079
6158
|
</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
|
6080
6159
|
<fo:block xsl:use-attribute-sets="termsource-style">
|
6160
|
+
|
6081
6161
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
6082
6162
|
<xsl:variable name="termsource_text">
|
6083
6163
|
<xsl:apply-templates/>
|
@@ -6088,13 +6168,15 @@
|
|
6088
6168
|
<!-- <xsl:apply-templates /> -->
|
6089
6169
|
<xsl:copy-of select="$termsource_text"/>
|
6090
6170
|
</xsl:when>
|
6091
|
-
<xsl:otherwise>
|
6171
|
+
<xsl:otherwise>
|
6172
|
+
|
6092
6173
|
|
6093
6174
|
<xsl:text>[</xsl:text>
|
6094
6175
|
|
6095
6176
|
<!-- <xsl:apply-templates /> -->
|
6096
6177
|
<xsl:copy-of select="$termsource_text"/>
|
6097
6178
|
|
6179
|
+
|
6098
6180
|
<xsl:text>]</xsl:text>
|
6099
6181
|
|
6100
6182
|
</xsl:otherwise>
|
@@ -6186,12 +6268,20 @@
|
|
6186
6268
|
</xsl:template><xsl:template match="*[local-name() = 'author']">
|
6187
6269
|
<xsl:text>— </xsl:text>
|
6188
6270
|
<xsl:apply-templates/>
|
6189
|
-
</xsl:template><xsl:
|
6271
|
+
</xsl:template><xsl:variable name="bibitem_hidden_">
|
6272
|
+
<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
|
6273
|
+
<xsl:copy-of select="."/>
|
6274
|
+
</xsl:for-each>
|
6275
|
+
<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
|
6276
|
+
<xsl:copy-of select="."/>
|
6277
|
+
</xsl:for-each>
|
6278
|
+
</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
|
6190
6279
|
|
6191
6280
|
<xsl:variable name="bibitemid">
|
6192
6281
|
<xsl:choose>
|
6193
|
-
<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"
|
6194
|
-
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"
|
6282
|
+
<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
|
6283
|
+
<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
|
6284
|
+
<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
|
6195
6285
|
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
|
6196
6286
|
</xsl:choose>
|
6197
6287
|
</xsl:variable>
|
@@ -6280,10 +6370,10 @@
|
|
6280
6370
|
</xsl:choose>
|
6281
6371
|
</xsl:variable>
|
6282
6372
|
|
6283
|
-
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
|
6373
|
+
<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
|
6284
6374
|
|
6285
6375
|
<xsl:choose>
|
6286
|
-
<xsl:when test="$
|
6376
|
+
<xsl:when test="$lang = 'zh'">
|
6287
6377
|
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
|
6288
6378
|
</xsl:when>
|
6289
6379
|
<xsl:when test="../../@inline-header = 'true'">
|
@@ -6326,15 +6416,20 @@
|
|
6326
6416
|
<fo:block xsl:use-attribute-sets="deprecates-style">
|
6327
6417
|
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
|
6328
6418
|
</fo:block>
|
6419
|
+
</xsl:template><xsl:template name="setStyle_preferred">
|
6420
|
+
<xsl:if test="*[local-name() = 'strong']">
|
6421
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
6422
|
+
</xsl:if>
|
6329
6423
|
</xsl:template><xsl:template match="*[local-name() = 'definition']">
|
6330
6424
|
<fo:block xsl:use-attribute-sets="definition-style">
|
6331
6425
|
<xsl:apply-templates/>
|
6332
6426
|
</fo:block>
|
6333
6427
|
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
|
6334
6428
|
<xsl:apply-templates/>
|
6335
|
-
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
|
6429
|
+
</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
|
6336
6430
|
<fo:inline> <xsl:apply-templates/></fo:inline>
|
6337
|
-
<fo:block
|
6431
|
+
<!-- <fo:block> </fo:block> -->
|
6432
|
+
<fo:block/>
|
6338
6433
|
</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
|
6339
6434
|
|
6340
6435
|
<fo:block>
|
@@ -7269,12 +7364,15 @@
|
|
7269
7364
|
<xsl:param name="default">left</xsl:param>
|
7270
7365
|
<xsl:attribute name="text-align">
|
7271
7366
|
<xsl:choose>
|
7272
|
-
<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
|
7367
|
+
<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
|
7273
7368
|
<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
|
7274
7369
|
<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
|
7275
7370
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
7276
7371
|
</xsl:choose>
|
7277
7372
|
</xsl:attribute>
|
7373
|
+
<xsl:if test="@align = 'indent'">
|
7374
|
+
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
7375
|
+
</xsl:if>
|
7278
7376
|
</xsl:template><xsl:template name="number-to-words">
|
7279
7377
|
<xsl:param name="number"/>
|
7280
7378
|
<xsl:param name="first"/>
|
data/metanorma-bipm.gemspec
CHANGED
@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
|
|
26
26
|
spec.require_paths = ["lib"]
|
27
27
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
|
28
28
|
|
29
|
-
spec.add_dependency "metanorma-generic", "~> 1.
|
30
|
-
spec.add_dependency "metanorma-iso", "~> 1.
|
29
|
+
spec.add_dependency "metanorma-generic", "~> 1.11.0"
|
30
|
+
spec.add_dependency "metanorma-iso", "~> 1.10.0"
|
31
31
|
|
32
|
-
spec.add_development_dependency "
|
32
|
+
spec.add_development_dependency "debug"
|
33
33
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
34
34
|
spec.add_development_dependency "guard", "~> 2.14"
|
35
35
|
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-bipm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.2.3
|
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-
|
11
|
+
date: 2021-11-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|
@@ -16,42 +16,42 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.
|
19
|
+
version: 1.11.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.
|
26
|
+
version: 1.11.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: metanorma-iso
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.
|
33
|
+
version: 1.10.0
|
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: 1.
|
40
|
+
version: 1.10.0
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
|
-
name:
|
42
|
+
name: debug
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - "
|
45
|
+
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '
|
47
|
+
version: '0'
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- - "
|
52
|
+
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: '
|
54
|
+
version: '0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: equivalent-xml
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
271
271
|
- !ruby/object:Gem::Version
|
272
272
|
version: '0'
|
273
273
|
requirements: []
|
274
|
-
rubygems_version: 3.
|
274
|
+
rubygems_version: 3.2.22
|
275
275
|
signing_key:
|
276
276
|
specification_version: 4
|
277
277
|
summary: metanorma-bipm lets you write BIPM standards in Metanorma.
|