metanorma-bipm 2.2.11 → 2.2.12

Sign up to get free protection for your applications and to get access to all the features.
@@ -2736,6 +2736,10 @@
2736
2736
  </xsl:attribute-set> <!-- formula-stem-number-style -->
2737
2737
  <!-- End Formula's styles -->
2738
2738
 
2739
+ <xsl:template name="refine_formula-stem-number-style">
2740
+
2741
+ </xsl:template>
2742
+
2739
2743
  <xsl:attribute-set name="image-style">
2740
2744
  <xsl:attribute name="text-align">center</xsl:attribute>
2741
2745
 
@@ -3232,13 +3236,13 @@
3232
3236
 
3233
3237
  <xsl:template name="processPrefaceSectionsDefault_Contents">
3234
3238
  <xsl:variable name="nodes_preface_">
3235
- <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
3239
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
3236
3240
  <node id="{@id}"/>
3237
3241
  </xsl:for-each>
3238
3242
  </xsl:variable>
3239
3243
  <xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
3240
3244
 
3241
- <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
3245
+ <xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
3242
3246
  <xsl:sort select="@displayorder" data-type="number"/>
3243
3247
 
3244
3248
  <!-- process Section's title -->
@@ -3272,12 +3276,12 @@
3272
3276
  <xsl:apply-templates select="." mode="contents"/>
3273
3277
  </xsl:for-each>
3274
3278
 
3275
- <xsl:for-each select="/*/*[local-name()='annex']">
3279
+ <!-- <xsl:for-each select="/*/*[local-name()='annex']">
3276
3280
  <xsl:sort select="@displayorder" data-type="number"/>
3277
3281
  <xsl:apply-templates select="." mode="contents"/>
3278
- </xsl:for-each>
3282
+ </xsl:for-each> -->
3279
3283
 
3280
- <xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
3284
+ <xsl:for-each select="/*/*[local-name()='annex'] | /*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] | /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
3281
3285
  <xsl:sort select="@displayorder" data-type="number"/>
3282
3286
  <xsl:apply-templates select="." mode="contents"/>
3283
3287
  </xsl:for-each>
@@ -3728,7 +3732,7 @@
3728
3732
  <fo:table-row>
3729
3733
  <fo:table-cell column-number="2">
3730
3734
  <xsl:copy-of select="$table-preamble"/>
3731
- <fo:block>
3735
+ <fo:block role="SKIP">
3732
3736
  <xsl:call-template name="setTrackChangesStyles">
3733
3737
  <xsl:with-param name="isAdded" select="$isAdded"/>
3734
3738
  <xsl:with-param name="isDeleted" select="$isDeleted"/>
@@ -3771,7 +3775,7 @@
3771
3775
  <xsl:param name="continued"/>
3772
3776
  <xsl:if test="normalize-space() != ''">
3773
3777
 
3774
- <fo:block xsl:use-attribute-sets="table-name-style">
3778
+ <fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
3775
3779
 
3776
3780
  <xsl:call-template name="refine_table-name-style">
3777
3781
  <xsl:with-param name="continued" select="$continued"/>
@@ -4162,8 +4166,8 @@
4162
4166
  <xsl:template name="table-header-title">
4163
4167
  <xsl:param name="cols-count"/>
4164
4168
  <!-- row for title -->
4165
- <fo:table-row>
4166
- <fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
4169
+ <fo:table-row role="SKIP">
4170
+ <fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black" role="SKIP">
4167
4171
 
4168
4172
  <xsl:call-template name="refine_table-header-title-style"/>
4169
4173
 
@@ -4172,14 +4176,14 @@
4172
4176
  </xsl:apply-templates>
4173
4177
 
4174
4178
  <xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
4175
- <fo:block/>
4179
+ <fo:block role="SKIP"/>
4176
4180
  </xsl:if>
4177
4181
 
4178
4182
  <xsl:for-each select="ancestor::*[local-name()='table'][1]">
4179
4183
  <xsl:call-template name="table_name_fn_display"/>
4180
4184
  </xsl:for-each>
4181
4185
 
4182
- <fo:block text-align="right" font-style="italic">
4186
+ <fo:block text-align="right" font-style="italic" role="SKIP">
4183
4187
  <xsl:text> </xsl:text>
4184
4188
  <fo:retrieve-table-marker retrieve-class-name="table_continued"/>
4185
4189
  </fo:block>
@@ -4378,21 +4382,21 @@
4378
4382
  <xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
4379
4383
  <xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
4380
4384
 
4381
- <fo:table-row height="0" keep-with-next.within-page="always">
4382
- <fo:table-cell>
4385
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
4386
+ <fo:table-cell role="SKIP">
4383
4387
 
4384
4388
  <fo:marker marker-class-name="table_continued"/>
4385
4389
 
4386
- <fo:block/>
4390
+ <fo:block role="SKIP"/>
4387
4391
  </fo:table-cell>
4388
4392
  </fo:table-row>
4389
- <fo:table-row height="0" keep-with-next.within-page="always">
4390
- <fo:table-cell>
4393
+ <fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
4394
+ <fo:table-cell role="SKIP">
4391
4395
 
4392
4396
  <fo:marker marker-class-name="table_continued">
4393
4397
  <xsl:value-of select="$title_continued"/>
4394
4398
  </fo:marker>
4395
- <fo:block/>
4399
+ <fo:block role="SKIP"/>
4396
4400
  </fo:table-cell>
4397
4401
  </fo:table-row>
4398
4402
 
@@ -4533,7 +4537,7 @@
4533
4537
 
4534
4538
  <xsl:call-template name="refine_table-header-cell-style"/>
4535
4539
 
4536
- <fo:block>
4540
+ <fo:block role="SKIP">
4537
4541
  <xsl:apply-templates/>
4538
4542
  </fo:block>
4539
4543
  </fo:table-cell>
@@ -4586,7 +4590,7 @@
4586
4590
  <xsl:attribute name="text-align">left</xsl:attribute>
4587
4591
  </xsl:if>
4588
4592
 
4589
- <fo:block>
4593
+ <fo:block role="SKIP">
4590
4594
 
4591
4595
  <xsl:if test="$isGenerateTableIF = 'true'">
4592
4596
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -5463,7 +5467,7 @@
5463
5467
  -->
5464
5468
  <fo:table-row>
5465
5469
  <fo:table-cell number-columns-spanned="2">
5466
- <fo:block>
5470
+ <fo:block role="SKIP">
5467
5471
  <xsl:call-template name="note"/>
5468
5472
  </fo:block>
5469
5473
  </fo:table-cell>
@@ -5528,7 +5532,7 @@
5528
5532
 
5529
5533
  <xsl:call-template name="refine_dt-cell-style"/>
5530
5534
 
5531
- <fo:block xsl:use-attribute-sets="dt-block-style">
5535
+ <fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
5532
5536
  <xsl:copy-of select="@id"/>
5533
5537
 
5534
5538
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -5558,7 +5562,7 @@
5558
5562
 
5559
5563
  <xsl:call-template name="refine_dd-cell-style"/>
5560
5564
 
5561
- <fo:block>
5565
+ <fo:block role="SKIP">
5562
5566
 
5563
5567
  <xsl:if test="$isGenerateTableIF = 'true'">
5564
5568
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -5934,11 +5938,41 @@
5934
5938
 
5935
5939
  <xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
5936
5940
  <xsl:variable name="text" select="normalize-space(.)"/>
5937
- <fo:inline font-size="75%">
5941
+ <fo:inline font-size="75%" role="SKIP">
5938
5942
  <xsl:if test="string-length($text) &gt; 0">
5939
- <xsl:call-template name="recursiveSmallCaps">
5940
- <xsl:with-param name="text" select="$text"/>
5941
- </xsl:call-template>
5943
+ <xsl:variable name="smallCapsText">
5944
+ <xsl:call-template name="recursiveSmallCaps">
5945
+ <xsl:with-param name="text" select="$text"/>
5946
+ </xsl:call-template>
5947
+ </xsl:variable>
5948
+ <!-- merge neighboring fo:inline -->
5949
+ <xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
5950
+ <xsl:choose>
5951
+ <xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
5952
+ <xsl:when test="self::fo:inline and @font-size">
5953
+ <xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
5954
+ <!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
5955
+ <xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
5956
+ <xsl:variable name="next_text">
5957
+ <xsl:choose>
5958
+ <xsl:when test="$next_text_ = 0">99999999</xsl:when>
5959
+ <xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
5960
+ </xsl:choose>
5961
+ </xsl:variable>
5962
+ <!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
5963
+ <fo:inline>
5964
+ <xsl:copy-of select="@*"/>
5965
+ <xsl:copy-of select="./node()"/>
5966
+ <xsl:for-each select="following-sibling::node()[position() &lt; $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
5967
+ <xsl:copy-of select="./node()"/>
5968
+ </xsl:for-each>
5969
+ </fo:inline>
5970
+ </xsl:when>
5971
+ <xsl:otherwise>
5972
+ <xsl:copy-of select="."/>
5973
+ </xsl:otherwise>
5974
+ </xsl:choose>
5975
+ </xsl:for-each>
5942
5976
  </xsl:if>
5943
5977
  </fo:inline>
5944
5978
  </xsl:template>
@@ -5950,7 +5984,7 @@
5950
5984
  <xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
5951
5985
  <xsl:choose>
5952
5986
  <xsl:when test="$char=$upperCase">
5953
- <fo:inline font-size="{100 div 0.75}%">
5987
+ <fo:inline font-size="{100 div 0.75}%" role="SKIP">
5954
5988
  <xsl:value-of select="$upperCase"/>
5955
5989
  </fo:inline>
5956
5990
  </xsl:when>
@@ -6112,6 +6146,10 @@
6112
6146
 
6113
6147
  <xsl:when test="not(contains($text, $separator))">
6114
6148
  <word>
6149
+ <xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
6150
+ <xsl:text>
6151
+  </xsl:text> <!-- to add distance between dt and dd -->
6152
+ </xsl:if>
6115
6153
  <xsl:call-template name="enclose_text_in_tags">
6116
6154
  <xsl:with-param name="text" select="normalize-space($text)"/>
6117
6155
  <xsl:with-param name="tags" select="$tags"/>
@@ -6120,6 +6158,10 @@
6120
6158
  </xsl:when>
6121
6159
  <xsl:otherwise>
6122
6160
  <word>
6161
+ <xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
6162
+ <xsl:text>
6163
+  </xsl:text> <!-- to add distance between dt and dd -->
6164
+ </xsl:if>
6123
6165
  <xsl:call-template name="enclose_text_in_tags">
6124
6166
  <xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
6125
6167
  <xsl:with-param name="tags" select="$tags"/>
@@ -6303,6 +6345,10 @@
6303
6345
  <xsl:template name="getSimpleTable">
6304
6346
  <xsl:param name="id"/>
6305
6347
 
6348
+ <!-- <test0>
6349
+ <xsl:copy-of select="."/>
6350
+ </test0> -->
6351
+
6306
6352
  <xsl:variable name="simple-table">
6307
6353
 
6308
6354
  <!-- Step 0. replace <br/> to <p>...</p> -->
@@ -7355,7 +7401,7 @@
7355
7401
  <fo:table-body>
7356
7402
  <fo:table-row>
7357
7403
  <fo:table-cell display-align="center">
7358
- <fo:block xsl:use-attribute-sets="formula-stem-block-style">
7404
+ <fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
7359
7405
 
7360
7406
  <xsl:call-template name="refine_formula-stem-block-style"/>
7361
7407
 
@@ -7363,7 +7409,10 @@
7363
7409
  </fo:block>
7364
7410
  </fo:table-cell>
7365
7411
  <fo:table-cell display-align="center">
7366
- <fo:block xsl:use-attribute-sets="formula-stem-number-style">
7412
+ <fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
7413
+
7414
+ <xsl:call-template name="refine_formula-stem-number-style"/>
7415
+
7367
7416
  <xsl:apply-templates select="../*[local-name() = 'name']"/>
7368
7417
  </fo:block>
7369
7418
  </fo:table-cell>
@@ -8874,7 +8923,7 @@
8874
8923
  <!-- second td with sourcecode -->
8875
8924
  <xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
8876
8925
  <fo:table-cell>
8877
- <fo:block>
8926
+ <fo:block role="SKIP">
8878
8927
  <xsl:apply-templates/>
8879
8928
  </fo:block>
8880
8929
  </fo:table-cell>
@@ -9361,7 +9410,7 @@
9361
9410
 
9362
9411
  <xsl:call-template name="setTableCellAttributes"/>
9363
9412
 
9364
- <fo:block>
9413
+ <fo:block role="SKIP">
9365
9414
  <xsl:apply-templates/>
9366
9415
  </fo:block>
9367
9416
  </fo:table-cell>
@@ -9383,7 +9432,7 @@
9383
9432
 
9384
9433
  <xsl:call-template name="setTableCellAttributes"/>
9385
9434
 
9386
- <fo:block>
9435
+ <fo:block role="SKIP">
9387
9436
  <xsl:apply-templates/>
9388
9437
  </fo:block>
9389
9438
  </fo:table-cell>
@@ -10169,7 +10218,48 @@
10169
10218
  </xsl:choose>
10170
10219
  </xsl:when>
10171
10220
  <xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
10172
- <xsl:value-of select="@label"/>
10221
+
10222
+ <xsl:variable name="label">
10223
+
10224
+ <xsl:variable name="type" select="../@type"/>
10225
+
10226
+ <xsl:variable name="style_prefix_">
10227
+ <xsl:if test="$type = 'roman'">
10228
+ <!-- Example: (i) -->
10229
+ </xsl:if>
10230
+ </xsl:variable>
10231
+ <xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
10232
+
10233
+ <xsl:variable name="style_suffix_">
10234
+ <xsl:choose>
10235
+ <xsl:when test="$type = 'arabic'">
10236
+ .
10237
+ </xsl:when>
10238
+ <xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
10239
+ )
10240
+ </xsl:when>
10241
+ <xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
10242
+ .
10243
+ </xsl:when>
10244
+ <xsl:when test="$type = 'roman'">
10245
+ )
10246
+ </xsl:when>
10247
+ <xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
10248
+ </xsl:choose>
10249
+ </xsl:variable>
10250
+ <xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
10251
+
10252
+ <xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
10253
+ <xsl:value-of select="$style_prefix"/>
10254
+ </xsl:if>
10255
+ <xsl:value-of select="@label"/>
10256
+ <xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
10257
+ <xsl:value-of select="$style_suffix"/>
10258
+ </xsl:if>
10259
+ </xsl:variable>
10260
+
10261
+ <xsl:value-of select="normalize-space($label)"/>
10262
+
10173
10263
  </xsl:when>
10174
10264
  <xsl:otherwise> <!-- for ordered lists 'ol' -->
10175
10265
 
@@ -10362,7 +10452,7 @@
10362
10452
  <xsl:call-template name="refine_list-item-style"/>
10363
10453
 
10364
10454
  <fo:list-item-label end-indent="label-end()">
10365
- <fo:block xsl:use-attribute-sets="list-item-label-style">
10455
+ <fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
10366
10456
 
10367
10457
  <xsl:call-template name="refine_list-item-label-style"/>
10368
10458
 
@@ -10376,7 +10466,7 @@
10376
10466
  </fo:block>
10377
10467
  </fo:list-item-label>
10378
10468
  <fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
10379
- <fo:block>
10469
+ <fo:block role="SKIP">
10380
10470
 
10381
10471
  <xsl:call-template name="refine_list-item-body-style"/>
10382
10472
 
@@ -10655,10 +10745,10 @@
10655
10745
  <fo:table-body>
10656
10746
  <fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
10657
10747
 
10658
- <fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
10659
- <fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
10660
- <fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
10661
- <fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
10748
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
10749
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
10750
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
10751
+ <fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
10662
10752
  </fo:table-row>
10663
10753
  <xsl:apply-templates/>
10664
10754
  </fo:table-body>
@@ -10673,7 +10763,7 @@
10673
10763
 
10674
10764
  <xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
10675
10765
  <fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
10676
- <fo:block><xsl:apply-templates/></fo:block>
10766
+ <fo:block role="SKIP"><xsl:apply-templates/></fo:block>
10677
10767
  </fo:table-cell>
10678
10768
  </xsl:template>
10679
10769
  <!-- ============ -->
@@ -10744,8 +10834,8 @@
10744
10834
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
10745
10835
  <fo:list-item>
10746
10836
  <fo:list-item-label end-indent="label-end()">
10747
- <fo:block>
10748
- <fo:inline>
10837
+ <fo:block role="SKIP">
10838
+ <fo:inline role="SKIP">
10749
10839
 
10750
10840
  <xsl:apply-templates select="*[local-name() = 'biblio-tag']">
10751
10841
  <xsl:with-param name="biblio_tag_part">first</xsl:with-param>
@@ -10754,7 +10844,7 @@
10754
10844
  </fo:block>
10755
10845
  </fo:list-item-label>
10756
10846
  <fo:list-item-body start-indent="body-start()">
10757
- <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style">
10847
+ <fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
10758
10848
  <xsl:call-template name="processBibitem">
10759
10849
  <xsl:with-param name="biblio_tag_part">last</xsl:with-param>
10760
10850
  </xsl:call-template>
@@ -10981,7 +11071,7 @@
10981
11071
  <xsl:for-each select="*[local-name() = 'tab']">
10982
11072
  <xsl:variable name="current_id" select="generate-id()"/>
10983
11073
  <fo:table-cell>
10984
- <fo:block line-height-shift-adjustment="disregard-shifts">
11074
+ <fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
10985
11075
  <xsl:call-template name="insert_basic_link">
10986
11076
  <xsl:with-param name="element">
10987
11077
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -10999,7 +11089,7 @@
10999
11089
  </xsl:for-each>
11000
11090
  <!-- last column - for page numbers -->
11001
11091
  <fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
11002
- <fo:block>
11092
+ <fo:block role="SKIP">
11003
11093
  <xsl:call-template name="insert_basic_link">
11004
11094
  <xsl:with-param name="element">
11005
11095
  <fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -0,0 +1,15 @@
1
+ == copyright-statement
2
+ === {blank}
3
+
4
+ [align=center]
5
+ © Bureau International des Poids et Mesures {{ docyear }} all rights reserved
6
+
7
+ == license-statement
8
+ === Copyright statement
9
+ This document is distributed under the terms of the Creative Commons Attribution 4.0 International License (http://creativecommons.org/licenses/by/4.0/:[]), which permits unrestricted use, distribution, and reproduction in any medium, provided you give appropriate credit to the original author(s) and the source, provide a link to the Creative Commons license, and indicate if changes were made.
10
+
11
+ == feedback-statement
12
+ BIPM +
13
+ Pavillon de Breteuil +
14
+ F-92312 Sèvres Cedex +
15
+ FRANCE
@@ -0,0 +1,14 @@
1
+ == copyright-statement
2
+ === {blank}
3
+ [align="center"]
4
+ © Bureau international des poids et mesures {{ docyear }} tous droits réservés
5
+
6
+ == license-statement
7
+ === Note concernant les droits d’auteur
8
+ Ce document est distribué selon les termes et conditions de la licence Creative Commons Attribution 4.0 International (http://creativecommons.org/licenses/by/4.0/:[]), qui permet l’utilisation sans restriction, la distribution et la reproduction sur quelque support que soit, sous réserve de mentionner dûment l’auteur ou les auteurs originaux ainsi que la source de l’œuvre, d’intégrer un lien vers la licence Creative Commons et d’indiquer si des modifications ont été effectuées.
9
+
10
+ == feedback-statement
11
+ BIPM +
12
+ Pavillon de Breteuil +
13
+ F-92312 Sèvres Cedex +
14
+ FRANCE
@@ -0,0 +1,32 @@
1
+ == copyright-statement
2
+ === {blank}
3
+ © JCGM {{ docyear }}
4
+
5
+ Copyright of this JCGM guidance document is shared jointly by the JCGM member organizations (BIPM, IEC,
6
+ IFCC, ILAC, ISO, IUPAC, IUPAP and OIML).
7
+
8
+ == license-statement
9
+ === Copyright
10
+ Even if electronic versions are available free of charge on the website of one or more of the JCGM member organizations, economic and moral copyrights related to all JCGM publications are internationally protected. The JCGM does not, without its written authorisation, permit third parties to rewrite or re-brand issues, to sell copies to the public, or to broadcast or use on-line its publications. Equally, the JCGM also objects to distortion, augmentation or mutilation of its publications, including its titles, slogans and logos, and those of its member organizations.
11
+
12
+ === Official versions and translations
13
+ The only official versions of documents are those published by the JCGM, in their original languages.
14
+
15
+ The JCGM’s publications may be translated into languages other than those in which the documents were originally published by the JCGM. Permission must be obtained from the JCGM before a translation can be made. All translations should respect the original and official format of the formulae and units (without any conversion to other formulae or units), and contain the following statement (to be translated into the chosen language):
16
+
17
+ ____
18
+ All JCGM’s products are internationally protected by copyright. This translation of the original JCGM document has been produced with the permission of the JCGM. The JCGM retains full internationally protected copyright on the design and content of this document and on the JCGM’s titles, slogan and logos. The member organizations of the JCGM also retain full internationally protected right on their titles, slogans and logos included in the JCGM’s publications. The only official version is the document published by the JCGM, in the original languages.
19
+ ____
20
+
21
+ The JCGM does not accept any liability for the relevance, accuracy, completeness or quality of the information and materials offered in any translation. A copy of the translation shall be provided to the JCGM at the time of publication.
22
+
23
+ === Reproduction
24
+ The JCGM’s publications may be reproduced, provided written permission has been granted by the JCGM. A sample of any reproduced document shall be provided to the JCGM at the time of reproduction and contain the following statement:A
25
+
26
+ ____
27
+ This document is reproduced with the permission of the JCGM, which retains full internationally protected copyright on the design and content of this document and on the JCGM’s titles, slogans and logos. The member organizations of the JCGM also retain full internationally protected right on their titles, slogans and logos included in the JCGM’s publications. The only official versions are the original versions of the documents published by the JCGM.
28
+ ____
29
+
30
+ == legal-statement
31
+ === Disclaimer
32
+ The JCGM and its member organizations have published this document to enhance access to information about metrology. They endeavor to update it on a regular basis, but cannot guarantee the accuracy at all times and shall not be responsible for any direct or indirect damage that may result from its use. Any reference to commercial products of any kind (including but not restricted to any software, data or hardware) or links to websites, over which the JCGM and its member organizations have no control and for which they assume no responsibility, does not imply any approval, endorsement or recommendation by the JCGM and its member organizations.
@@ -96,10 +96,12 @@ module Metanorma
96
96
  end
97
97
  end
98
98
 
99
- def boilerplate_file(xmldoc)
100
- return super unless @jcgm
101
-
102
- File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.xml")
99
+ def boilerplate_file(_xmldoc)
100
+ if @jcgm
101
+ File.join(File.dirname(__FILE__), "boilerplate-jcgm-en.adoc")
102
+ else
103
+ File.join(File.dirname(__FILE__), "boilerplate-#{@lang}.adoc")
104
+ end
103
105
  end
104
106
 
105
107
  def sections_cleanup(xml)
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module BIPM
3
- VERSION = "2.2.11".freeze
3
+ VERSION = "2.2.12".freeze
4
4
  end
5
5
  end
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: 2.2.11
4
+ version: 2.2.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-06-05 00:00:00.000000000 Z
11
+ date: 2023-06-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -266,9 +266,9 @@ files:
266
266
  - lib/metanorma/bipm/biblio-standoc.rng
267
267
  - lib/metanorma/bipm/biblio.rng
268
268
  - lib/metanorma/bipm/bipm.rng
269
- - lib/metanorma/bipm/boilerplate-en.xml
270
- - lib/metanorma/bipm/boilerplate-fr.xml
271
- - lib/metanorma/bipm/boilerplate-jcgm-en.xml
269
+ - lib/metanorma/bipm/boilerplate-en.adoc
270
+ - lib/metanorma/bipm/boilerplate-fr.adoc
271
+ - lib/metanorma/bipm/boilerplate-jcgm-en.adoc
272
272
  - lib/metanorma/bipm/converter.rb
273
273
  - lib/metanorma/bipm/front.rb
274
274
  - lib/metanorma/bipm/isodoc.rng
@@ -1,20 +0,0 @@
1
- <boilerplate>
2
- <copyright-statement>
3
- <clause>
4
- <p align="center"> © Bureau International des Poids et Mesures {{ docyear }} all rights reserved</p>
5
- </clause>
6
- </copyright-statement>
7
- <license-statement>
8
- <clause>
9
- <title>Copyright statement</title>
10
- <p>This document is distributed under the terms of the Creative Commons Attribution 4.0 International License (<link target="http://creativecommons.org/licenses/by/4.0/"/>), which permits unrestricted use, distribution, and reproduction in any medium, provided you give appropriate credit to the original author(s) and the source, provide a link to the Creative Commons license, and indicate if changes were made.</p>
11
- </clause>
12
- </license-statement>
13
- <feedback-statement>
14
- <p>BIPM<br/>
15
- Pavillon de Breteuil<br/>
16
- F-92312 Sèvres Cedex<br/>
17
- FRANCE</p>
18
- </feedback-statement>
19
- </boilerplate>
20
-
@@ -1,20 +0,0 @@
1
- <boilerplate>
2
- <copyright-statement>
3
- <clause>
4
- <p align="center"> © Bureau international des poids et mesures {{ docyear }} tous droits réservés</p>
5
- </clause>
6
- </copyright-statement>
7
- <license-statement>
8
- <clause>
9
- <title>Note concernant les droits d’auteur</title>
10
- <p>Ce document est distribué selon les termes et conditions de la licence Creative Commons Attribution 4.0 International (<link target="http://creativecommons.org/licenses/by/4.0/"/>), qui permet l’utilisation sans restriction, la distribution et la reproduction sur quelque support que soit, sous réserve de mentionner dûment l’auteur ou les auteurs originaux ainsi que la source de l’œuvre, d’intégrer un lien vers la licence Creative Commons et d’indiquer si des modifications ont été effectuées.</p>
11
- </clause>
12
- </license-statement>
13
- <feedback-statement>
14
- <p>BIPM<br/>
15
- Pavillon de Breteuil<br/>
16
- F-92312 Sèvres Cedex<br/>
17
- FRANCE</p>
18
- </feedback-statement>
19
- </boilerplate>
20
-
@@ -1,37 +0,0 @@
1
- <boilerplate>
2
- <copyright-statement>
3
- <clause>
4
- <p> © JCGM {{ docyear }} </p>
5
- <p>Copyright of this JCGM guidance document is shared jointly by the JCGM member organizations (BIPM, IEC,
6
- IFCC, ILAC, ISO, IUPAC, IUPAP and OIML).</p>
7
- </clause>
8
- </copyright-statement>
9
- <license-statement>
10
- <clause>
11
- <title>Copyright</title>
12
- <p>Even if electronic versions are available free of charge on the website of one or more of the JCGM member organizations, economic and moral copyrights related to all JCGM publications are internationally protected. The JCGM does not, without its written authorisation, permit third parties to rewrite or re-brand issues, to sell copies to the public, or to broadcast or use on-line its publications. Equally, the JCGM also objects to distortion, augmentation or mutilation of its publications, including its titles, slogans and logos, and those of its member organizations.</p>
13
- </clause>
14
- <clause>
15
- <title>Official versions and translations</title>
16
- <p>The only official versions of documents are those published by the JCGM, in their original languages.</p>
17
-
18
- <p>The JCGM’s publications may be translated into languages other than those in which the documents were originally published by the JCGM. Permission must be obtained from the JCGM before a translation can be made. All translations should respect the original and official format of the formulae and units (without any conversion to other formulae or units), and contain the following statement (to be translated into the chosen language):</p>
19
-
20
- <quote>All JCGM’s products are internationally protected by copyright. This translation of the original JCGM document has been produced with the permission of the JCGM. The JCGM retains full internationally protected copyright on the design and content of this document and on the JCGM’s titles, slogan and logos. The member organizations of the JCGM also retain full internationally protected right on their titles, slogans and logos included in the JCGM’s publications. The only official version is the document published by the JCGM, in the original languages.</quote>
21
-
22
- <p>The JCGM does not accept any liability for the relevance, accuracy, completeness or quality of the information and materials offered in any translation. A copy of the translation shall be provided to the JCGM at the time of publication.</p>
23
- </clause>
24
- <clause>
25
- <title>Reproduction</title>
26
- <p>The JCGM’s publications may be reproduced, provided written permission has been granted by the JCGM. A sample of any reproduced document shall be provided to the JCGM at the time of reproduction and contain the following statement:</p>
27
- <quote>This document is reproduced with the permission of the JCGM, which retains full internationally protected copyright on the design and content of this document and on the JCGM’s titles, slogans and logos. The member organizations of the JCGM also retain full internationally protected right on their titles, slogans and logos included in the JCGM’s publications. The only official versions are the original versions of the documents published by the JCGM.</quote>
28
- </clause>
29
- </license-statement>
30
- <legal-statement>
31
- <clause>
32
- <title>Disclaimer</title>
33
- <p>The JCGM and its member organizations have published this document to enhance access to information about metrology. They endeavor to update it on a regular basis, but cannot guarantee the accuracy at all times and shall not be responsible for any direct or indirect damage that may result from its use. Any reference to commercial products of any kind (including but not restricted to any software, data or hardware) or links to websites, over which the JCGM and its member organizations have no control and for which they assume no responsibility, does not imply any approval, endorsement or recommendation by the JCGM and its member organizations.</p>
34
- </clause>
35
- </legal-statement>
36
- </boilerplate>
37
-