metanorma-iec 2.1.2 → 2.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 73845b0f396ac7f5dd11ef15f2d9d7365aa2ced653f2f5611b0808d95f598acd
4
- data.tar.gz: 9b52cac8db8146bfee98bb78296c1eb4402304334bd4b0992bec81884a24e39f
3
+ metadata.gz: 535b9e23e62c05288443e4dafa15aee49770f661c97dd64d426cf6c10099ddf1
4
+ data.tar.gz: 958f1ca736bb2a30fdda5c5068d46ac58ec11a659a4cd7745faebeebac23ffa9
5
5
  SHA512:
6
- metadata.gz: 66995e9d3026f0aac838fb9b7478f9d2f40ebda4437beaa1758f9c08cecc1e5691eb0de777b4055fde6b3e1a667f9486d9b54df6080f9a8ffa7f88d8e1eeb97e
7
- data.tar.gz: 60ed769002bad5d29edc41899801579b08d5458901f1b8037754693bddc24a14726149fbdeca5d2c994dd734deaed56ad3440fdd9dd3531704e2c10cebb03d2e
6
+ metadata.gz: a826de8a5df40dc0ed6a1ff7d962dc18bcdc7db0128882231b48b4294fba4d75416e413ac219f8de09182ce0674bbe73c1fc84f1c0d106ec0a92416010e6ed02
7
+ data.tar.gz: c7720c6a1bf26b6134060b7a629e9b445bccbde1a03e4265858c4fc3fffbbcb985b6601660c621e0f85b38f8d69e6c91aa3603feed07871b7c79d518219c1e0a
@@ -2087,14 +2087,15 @@
2087
2087
  <xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
2088
2088
  </xsl:otherwise>
2089
2089
  </xsl:choose>
2090
- </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
2090
+ </xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="font_noto_sans">Noto Sans, Noto Sans HK, Noto Sans JP, Noto Sans KR, Noto Sans SC, Noto Sans TC</xsl:variable><xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable><xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable><xsl:attribute-set name="root-style">
2091
2091
 
2092
2092
 
2093
2093
 
2094
2094
 
2095
2095
 
2096
2096
 
2097
- <xsl:attribute name="font-family">Arial, Times New Roman, STIX Two Math, Source Han Sans</xsl:attribute>
2097
+ <xsl:attribute name="font-family">Arial, Times New Roman, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
2098
+ <xsl:attribute name="font-family-generic">Sans</xsl:attribute>
2098
2099
  <xsl:attribute name="font-size">10pt</xsl:attribute>
2099
2100
 
2100
2101
 
@@ -2107,6 +2108,7 @@
2107
2108
 
2108
2109
 
2109
2110
 
2111
+
2110
2112
  </xsl:attribute-set><xsl:template name="insertRootStyle">
2111
2113
  <xsl:param name="root-style"/>
2112
2114
  <xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
@@ -2118,17 +2120,60 @@
2118
2120
  </xsl:variable>
2119
2121
  <xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
2120
2122
 
2123
+ <xsl:variable name="font_family_generic" select="$root-style_/root-style/@font-family-generic"/>
2124
+
2121
2125
  <xsl:for-each select="$root-style_/root-style/@*">
2126
+
2122
2127
  <xsl:choose>
2123
- <xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
2128
+ <xsl:when test="local-name() = 'font-family-generic'"><!-- skip, it's using for determine 'sans' or 'serif' --></xsl:when>
2129
+ <xsl:when test="local-name() = 'font-family'">
2130
+
2131
+ <xsl:variable name="font_regional_prefix">
2132
+ <xsl:choose>
2133
+ <xsl:when test="$font_family_generic = 'Sans'">Noto Sans</xsl:when>
2134
+ <xsl:otherwise>Noto Serif</xsl:otherwise>
2135
+ </xsl:choose>
2136
+ </xsl:variable>
2137
+
2124
2138
  <xsl:attribute name="{local-name()}">
2125
- <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
2139
+
2140
+ <xsl:variable name="font_extended">
2141
+ <xsl:choose>
2142
+ <xsl:when test="$lang = 'zh'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
2143
+ <xsl:when test="$lang = 'hk'"><xsl:value-of select="$font_regional_prefix"/> HK</xsl:when>
2144
+ <xsl:when test="$lang = 'jp'"><xsl:value-of select="$font_regional_prefix"/> JP</xsl:when>
2145
+ <xsl:when test="$lang = 'kr'"><xsl:value-of select="$font_regional_prefix"/> KR</xsl:when>
2146
+ <xsl:when test="$lang = 'sc'"><xsl:value-of select="$font_regional_prefix"/> SC</xsl:when>
2147
+ <xsl:when test="$lang = 'tc'"><xsl:value-of select="$font_regional_prefix"/> TC</xsl:when>
2148
+ </xsl:choose>
2149
+ </xsl:variable>
2150
+ <xsl:if test="normalize-space($font_extended) != ''">
2151
+ <xsl:value-of select="$font_regional_prefix"/><xsl:text>, </xsl:text>
2152
+ <xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
2153
+ </xsl:if>
2154
+
2155
+ <xsl:value-of select="."/>
2156
+
2157
+ <xsl:if test="$additional_fonts != ''">
2158
+ <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
2159
+ </xsl:if>
2126
2160
  </xsl:attribute>
2127
2161
  </xsl:when>
2128
2162
  <xsl:otherwise>
2129
2163
  <xsl:copy-of select="."/>
2130
2164
  </xsl:otherwise>
2131
2165
  </xsl:choose>
2166
+
2167
+ <!-- <xsl:choose>
2168
+ <xsl:when test="local-name() = 'font-family'">
2169
+ <xsl:attribute name="{local-name()}">
2170
+ <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
2171
+ </xsl:attribute>
2172
+ </xsl:when>
2173
+ <xsl:otherwise>
2174
+ <xsl:copy-of select="."/>
2175
+ </xsl:otherwise>
2176
+ </xsl:choose> -->
2132
2177
  </xsl:for-each>
2133
2178
  </xsl:template><xsl:attribute-set name="copyright-statement-style">
2134
2179
 
@@ -2199,7 +2244,7 @@
2199
2244
 
2200
2245
 
2201
2246
 
2202
- <xsl:attribute name="font-family">Courier New</xsl:attribute>
2247
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2203
2248
  <xsl:attribute name="margin-top">5pt</xsl:attribute>
2204
2249
  <xsl:attribute name="margin-bottom">5pt</xsl:attribute>
2205
2250
 
@@ -2207,6 +2252,7 @@
2207
2252
 
2208
2253
 
2209
2254
 
2255
+
2210
2256
 
2211
2257
 
2212
2258
 
@@ -2250,12 +2296,14 @@
2250
2296
 
2251
2297
 
2252
2298
 
2299
+
2253
2300
 
2254
2301
  </xsl:attribute-set><xsl:attribute-set name="example-style">
2255
2302
 
2256
2303
 
2257
2304
 
2258
2305
 
2306
+
2259
2307
  <xsl:attribute name="space-before">8pt</xsl:attribute>
2260
2308
  <xsl:attribute name="space-after">8pt</xsl:attribute>
2261
2309
 
@@ -2292,6 +2340,7 @@
2292
2340
 
2293
2341
 
2294
2342
 
2343
+
2295
2344
 
2296
2345
 
2297
2346
 
@@ -2326,6 +2375,7 @@
2326
2375
 
2327
2376
  </xsl:attribute-set><xsl:variable name="table-border_">
2328
2377
 
2378
+
2329
2379
  </xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
2330
2380
  <xsl:attribute name="margin-left">0mm</xsl:attribute>
2331
2381
  <xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -2350,6 +2400,7 @@
2350
2400
 
2351
2401
 
2352
2402
 
2403
+
2353
2404
 
2354
2405
 
2355
2406
 
@@ -2380,6 +2431,7 @@
2380
2431
 
2381
2432
 
2382
2433
 
2434
+
2383
2435
  </xsl:attribute-set><xsl:attribute-set name="table-name-style">
2384
2436
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2385
2437
 
@@ -2391,6 +2443,7 @@
2391
2443
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2392
2444
  <xsl:attribute name="space-before">12pt</xsl:attribute>
2393
2445
 
2446
+
2394
2447
 
2395
2448
 
2396
2449
 
@@ -2474,6 +2527,7 @@
2474
2527
 
2475
2528
 
2476
2529
 
2530
+
2477
2531
  </xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
2478
2532
  <xsl:attribute name="border">solid black 1pt</xsl:attribute>
2479
2533
  <xsl:attribute name="padding-left">1mm</xsl:attribute>
@@ -2488,7 +2542,7 @@
2488
2542
 
2489
2543
  <xsl:attribute name="border">solid black 0.5pt</xsl:attribute>
2490
2544
 
2491
-
2545
+
2492
2546
 
2493
2547
 
2494
2548
 
@@ -2506,6 +2560,7 @@
2506
2560
 
2507
2561
 
2508
2562
 
2563
+
2509
2564
  </xsl:attribute-set><xsl:attribute-set name="table-fn-style">
2510
2565
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2511
2566
 
@@ -2513,12 +2568,14 @@
2513
2568
 
2514
2569
 
2515
2570
 
2571
+
2516
2572
  <xsl:attribute name="font-size">8pt</xsl:attribute>
2517
2573
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2518
2574
  <xsl:attribute name="text-indent">-6mm</xsl:attribute>
2519
2575
  <xsl:attribute name="margin-left">6mm</xsl:attribute>
2520
2576
 
2521
2577
 
2578
+
2522
2579
  </xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
2523
2580
  <xsl:attribute name="font-size">80%</xsl:attribute>
2524
2581
  <xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -2537,6 +2594,7 @@
2537
2594
 
2538
2595
 
2539
2596
 
2597
+
2540
2598
  </xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
2541
2599
  <xsl:attribute name="text-indent">0</xsl:attribute>
2542
2600
  <xsl:attribute name="start-indent">0</xsl:attribute>
@@ -2576,6 +2634,7 @@
2576
2634
 
2577
2635
 
2578
2636
 
2637
+
2579
2638
  </xsl:attribute-set><xsl:attribute-set name="dl-name-style">
2580
2639
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2581
2640
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -2586,6 +2645,7 @@
2586
2645
  <xsl:attribute name="font-weight">bold</xsl:attribute>
2587
2646
 
2588
2647
 
2648
+
2589
2649
 
2590
2650
 
2591
2651
 
@@ -2635,6 +2695,7 @@
2635
2695
  <xsl:attribute name="margin-top">5pt</xsl:attribute>
2636
2696
  <xsl:attribute name="margin-bottom">9pt</xsl:attribute>
2637
2697
 
2698
+
2638
2699
 
2639
2700
 
2640
2701
 
@@ -2701,6 +2762,8 @@
2701
2762
 
2702
2763
 
2703
2764
 
2765
+ </xsl:attribute-set><xsl:attribute-set name="termnote-p-style">
2766
+
2704
2767
  </xsl:attribute-set><xsl:attribute-set name="quote-style">
2705
2768
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
2706
2769
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
@@ -2751,6 +2814,7 @@
2751
2814
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
2752
2815
 
2753
2816
 
2817
+
2754
2818
 
2755
2819
 
2756
2820
 
@@ -2797,6 +2861,7 @@
2797
2861
 
2798
2862
 
2799
2863
 
2864
+
2800
2865
  </xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
2801
2866
  <xsl:attribute name="text-align">right</xsl:attribute>
2802
2867
 
@@ -2817,20 +2882,21 @@
2817
2882
  </xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
2818
2883
 
2819
2884
  </xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
2885
+ <xsl:attribute name="width">100%</xsl:attribute>
2886
+ <xsl:attribute name="content-height">100%</xsl:attribute>
2887
+ <xsl:attribute name="scaling">uniform</xsl:attribute>
2820
2888
 
2821
2889
 
2822
2890
 
2823
2891
 
2824
2892
  <xsl:attribute name="width">75%</xsl:attribute>
2825
2893
  <xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
2826
- <xsl:attribute name="scaling">uniform</xsl:attribute>
2827
2894
 
2828
-
2829
-
2895
+
2830
2896
  </xsl:attribute-set><xsl:attribute-set name="tt-style">
2831
2897
 
2832
2898
 
2833
- <xsl:attribute name="font-family">Courier New</xsl:attribute>
2899
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2834
2900
 
2835
2901
 
2836
2902
  </xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
@@ -2919,6 +2985,7 @@
2919
2985
 
2920
2986
 
2921
2987
 
2988
+
2922
2989
  </xsl:attribute-set><xsl:attribute-set name="list-name-style">
2923
2990
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
2924
2991
 
@@ -2984,6 +3051,7 @@
2984
3051
 
2985
3052
 
2986
3053
 
3054
+
2987
3055
  </xsl:attribute-set><xsl:attribute-set name="fn-body-style">
2988
3056
  <xsl:attribute name="font-weight">normal</xsl:attribute>
2989
3057
  <xsl:attribute name="font-style">normal</xsl:attribute>
@@ -3010,6 +3078,7 @@
3010
3078
 
3011
3079
 
3012
3080
 
3081
+
3013
3082
  </xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
3014
3083
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
3015
3084
 
@@ -3032,6 +3101,7 @@
3032
3101
 
3033
3102
 
3034
3103
 
3104
+
3035
3105
  </xsl:attribute-set><xsl:attribute-set name="admonition-style">
3036
3106
 
3037
3107
 
@@ -3053,12 +3123,13 @@
3053
3123
 
3054
3124
 
3055
3125
 
3126
+
3056
3127
  </xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
3128
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
3129
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
3057
3130
 
3058
3131
 
3059
3132
 
3060
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
3061
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
3062
3133
  <xsl:attribute name="font-weight">bold</xsl:attribute>
3063
3134
  <xsl:attribute name="padding">1mm</xsl:attribute>
3064
3135
  <xsl:attribute name="padding-top">2mm</xsl:attribute>
@@ -3070,6 +3141,7 @@
3070
3141
 
3071
3142
 
3072
3143
 
3144
+
3073
3145
  </xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
3074
3146
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3075
3147
 
@@ -3097,6 +3169,7 @@
3097
3169
 
3098
3170
 
3099
3171
 
3172
+
3100
3173
  </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
3101
3174
 
3102
3175
 
@@ -3136,6 +3209,7 @@
3136
3209
 
3137
3210
 
3138
3211
 
3212
+
3139
3213
  </xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-style">
3140
3214
 
3141
3215
 
@@ -3158,6 +3232,7 @@
3158
3232
 
3159
3233
 
3160
3234
 
3235
+
3161
3236
  </xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
3162
3237
 
3163
3238
 
@@ -3187,6 +3262,7 @@
3187
3262
 
3188
3263
 
3189
3264
 
3265
+
3190
3266
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
3191
3267
  <xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
3192
3268
 
@@ -3208,6 +3284,7 @@
3208
3284
 
3209
3285
 
3210
3286
 
3287
+
3211
3288
  </xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
3212
3289
  <xsl:attribute name="font-size">10pt</xsl:attribute>
3213
3290
  <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
@@ -3226,6 +3303,7 @@
3226
3303
 
3227
3304
 
3228
3305
 
3306
+
3229
3307
  </xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
3230
3308
 
3231
3309
 
@@ -3672,6 +3750,8 @@
3672
3750
 
3673
3751
 
3674
3752
 
3753
+
3754
+
3675
3755
 
3676
3756
 
3677
3757
 
@@ -3711,6 +3791,8 @@
3711
3791
 
3712
3792
 
3713
3793
 
3794
+
3795
+
3714
3796
  </xsl:element>
3715
3797
  </xsl:variable>
3716
3798
 
@@ -3856,23 +3938,29 @@
3856
3938
  </xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
3857
3939
  <xsl:param name="continued"/>
3858
3940
  <xsl:if test="normalize-space() != ''">
3859
- <fo:block xsl:use-attribute-sets="table-name-style">
3860
-
3861
-
3862
-
3863
-
3941
+
3942
+
3864
3943
 
3865
- <xsl:choose>
3866
- <xsl:when test="$continued = 'true'">
3944
+ <fo:block xsl:use-attribute-sets="table-name-style">
3945
+
3867
3946
 
3868
- </xsl:when>
3869
- <xsl:otherwise>
3870
- <xsl:apply-templates/>
3871
- </xsl:otherwise>
3872
- </xsl:choose>
3873
-
3947
+
3948
+
3949
+
3950
+ <xsl:choose>
3951
+ <xsl:when test="$continued = 'true'">
3952
+
3953
+ </xsl:when>
3954
+ <xsl:otherwise>
3955
+ <xsl:apply-templates/>
3956
+ </xsl:otherwise>
3957
+ </xsl:choose>
3958
+
3959
+
3960
+ </fo:block>
3961
+
3874
3962
 
3875
- </fo:block>
3963
+
3876
3964
  </xsl:if>
3877
3965
  </xsl:template><xsl:template name="calculate-columns-numbers">
3878
3966
  <xsl:param name="table-row"/>
@@ -4270,12 +4358,18 @@
4270
4358
  <fo:table-row>
4271
4359
  <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">
4272
4360
 
4273
- <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
4274
- <xsl:with-param name="continued">true</xsl:with-param>
4275
- </xsl:apply-templates>
4276
4361
 
4277
4362
 
4278
4363
 
4364
+ <xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
4365
+ <xsl:with-param name="continued">true</xsl:with-param>
4366
+ </xsl:apply-templates>
4367
+
4368
+
4369
+
4370
+
4371
+
4372
+
4279
4373
  </fo:table-cell>
4280
4374
  </fo:table-row>
4281
4375
  </xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -4386,7 +4480,10 @@
4386
4480
 
4387
4481
 
4388
4482
  <!-- fn processing -->
4389
- <xsl:call-template name="table_fn_display"/>
4483
+
4484
+ <xsl:call-template name="table_fn_display"/>
4485
+
4486
+
4390
4487
 
4391
4488
  <!-- for PAS display Notes after footnotes -->
4392
4489
 
@@ -4396,6 +4493,9 @@
4396
4493
  </fo:table-body>
4397
4494
 
4398
4495
  </fo:table>
4496
+
4497
+
4498
+
4399
4499
  </xsl:if>
4400
4500
  </xsl:template><xsl:template match="*[local-name()='tbody']">
4401
4501
 
@@ -4484,6 +4584,9 @@
4484
4584
 
4485
4585
 
4486
4586
 
4587
+
4588
+
4589
+
4487
4590
 
4488
4591
 
4489
4592
  <xsl:call-template name="setTableRowAttributes"/>
@@ -4503,6 +4606,8 @@
4503
4606
 
4504
4607
 
4505
4608
 
4609
+
4610
+
4506
4611
  <xsl:call-template name="setTableRowAttributes"/>
4507
4612
  <xsl:apply-templates/>
4508
4613
  </fo:table-row>
@@ -4593,6 +4698,8 @@
4593
4698
 
4594
4699
 
4595
4700
 
4701
+
4702
+
4596
4703
 
4597
4704
 
4598
4705
 
@@ -4664,7 +4771,11 @@
4664
4771
 
4665
4772
  <xsl:variable name="gen_id" select="generate-id(.)"/>
4666
4773
  <xsl:variable name="lang" select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
4667
- <xsl:variable name="reference" select="@reference"/>
4774
+ <xsl:variable name="reference_">
4775
+ <xsl:value-of select="@reference"/>
4776
+ <xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
4777
+ </xsl:variable>
4778
+ <xsl:variable name="reference" select="normalize-space($reference_)"/>
4668
4779
  <!-- fn sequence number in document -->
4669
4780
  <xsl:variable name="current_fn_number">
4670
4781
  <xsl:choose>
@@ -4739,7 +4850,7 @@
4739
4850
  <xsl:copy-of select="node()"/>
4740
4851
  </fn>
4741
4852
  </xsl:for-each>
4742
- <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
4853
+ <xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='boilerplate']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] | ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
4743
4854
  <xsl:sort select="@displayorder" data-type="number"/>
4744
4855
  <xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] | .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
4745
4856
  <!-- copy unique fn -->
@@ -6401,6 +6512,10 @@
6401
6512
  </xsl:variable>
6402
6513
  <fo:inline xsl:use-attribute-sets="link-style">
6403
6514
 
6515
+ <xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
6516
+ <xsl:attribute name="keep-together.within-line">always</xsl:attribute>
6517
+ </xsl:if>
6518
+
6404
6519
 
6405
6520
 
6406
6521
 
@@ -6411,6 +6526,7 @@
6411
6526
 
6412
6527
 
6413
6528
 
6529
+
6414
6530
  <xsl:choose>
6415
6531
  <xsl:when test="$target_text = ''">
6416
6532
  <xsl:apply-templates/>
@@ -6667,7 +6783,19 @@
6667
6783
  <xsl:value-of select="$suffix"/>
6668
6784
  </xsl:if>
6669
6785
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
6670
- <fo:inline><xsl:apply-templates/></fo:inline>
6786
+ <xsl:variable name="num"><xsl:number/></xsl:variable>
6787
+ <xsl:choose>
6788
+ <xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
6789
+ <fo:inline xsl:use-attribute-sets="termnote-p-style">
6790
+ <xsl:apply-templates/>
6791
+ </fo:inline>
6792
+ </xsl:when>
6793
+ <xsl:otherwise>
6794
+ <fo:block xsl:use-attribute-sets="termnote-p-style">
6795
+ <xsl:apply-templates/>
6796
+ </fo:block>
6797
+ </xsl:otherwise>
6798
+ </xsl:choose>
6671
6799
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
6672
6800
  <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
6673
6801
  <fo:block id="{@id}">
@@ -7493,7 +7621,7 @@
7493
7621
  </xsl:choose>
7494
7622
  </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
7495
7623
  <xsl:value-of select="."/>
7496
- </xsl:template><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
7624
+ </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
7497
7625
  <xsl:text> </xsl:text>
7498
7626
  </xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
7499
7627
  <xsl:copy>
@@ -8356,6 +8484,7 @@
8356
8484
 
8357
8485
 
8358
8486
 
8487
+
8359
8488
  </xsl:variable>
8360
8489
 
8361
8490
  <xsl:variable name="padding-right">
@@ -8973,7 +9102,7 @@
8973
9102
 
8974
9103
  </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
8975
9104
 
8976
- <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
9105
+ <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
8977
9106
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
8978
9107
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
8979
9108
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
@@ -8984,7 +9113,9 @@
8984
9113
 
8985
9114
  <xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
8986
9115
  <xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
8987
- <xsl:number format="[1]"/>
9116
+
9117
+ <xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
9118
+
8988
9119
  </xsl:if>
8989
9120
 
8990
9121
  </fo:inline>
@@ -9326,12 +9457,16 @@
9326
9457
  <fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
9327
9458
 
9328
9459
 
9460
+
9461
+
9329
9462
 
9330
9463
 
9331
9464
 
9332
9465
  <fo:block-container xsl:use-attribute-sets="admonition-container-style">
9333
9466
 
9334
9467
 
9468
+
9469
+
9335
9470
  <fo:block text-align="justify">
9336
9471
  <fo:inline>
9337
9472
  <xsl:call-template name="displayAdmonitionName">
@@ -9537,6 +9672,8 @@
9537
9672
  </xsl:when>
9538
9673
  <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
9539
9674
  </xsl:choose>
9675
+ </xsl:template><xsl:template match="*[local-name() = 'lang_none']">
9676
+ <fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
9540
9677
  </xsl:template><xsl:template name="printEdition">
9541
9678
  <xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
9542
9679
  <xsl:text> </xsl:text>
@@ -9643,6 +9780,27 @@
9643
9780
  </xsl:when>
9644
9781
  <xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
9645
9782
  </xsl:choose>
9783
+ </xsl:template><xsl:template name="getMonthLocalizedByNum">
9784
+ <xsl:param name="num"/>
9785
+ <xsl:variable name="monthStr">
9786
+ <xsl:choose>
9787
+ <xsl:when test="$num = '01'">january</xsl:when>
9788
+ <xsl:when test="$num = '02'">february</xsl:when>
9789
+ <xsl:when test="$num = '03'">march</xsl:when>
9790
+ <xsl:when test="$num = '04'">april</xsl:when>
9791
+ <xsl:when test="$num = '05'">may</xsl:when>
9792
+ <xsl:when test="$num = '06'">june</xsl:when>
9793
+ <xsl:when test="$num = '07'">july</xsl:when>
9794
+ <xsl:when test="$num = '08'">august</xsl:when>
9795
+ <xsl:when test="$num = '09'">september</xsl:when>
9796
+ <xsl:when test="$num = '10'">october</xsl:when>
9797
+ <xsl:when test="$num = '11'">november</xsl:when>
9798
+ <xsl:when test="$num = '12'">december</xsl:when>
9799
+ </xsl:choose>
9800
+ </xsl:variable>
9801
+ <xsl:call-template name="getLocalizedString">
9802
+ <xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param>
9803
+ </xsl:call-template>
9646
9804
  </xsl:template><xsl:template name="insertKeywords">
9647
9805
  <xsl:param name="sorting" select="'true'"/>
9648
9806
  <xsl:param name="charAtEnd" select="'.'"/>
@@ -9844,6 +10002,7 @@
9844
10002
 
9845
10003
 
9846
10004
 
10005
+
9847
10006
 
9848
10007
 
9849
10008
 
@@ -623,6 +623,97 @@
623
623
  <zeroOrMore>
624
624
  <ref name="bsource"/>
625
625
  </zeroOrMore>
626
+ <oneOrMore>
627
+ <ref name="docidentifier"/>
628
+ </oneOrMore>
629
+ <optional>
630
+ <ref name="docnumber"/>
631
+ </optional>
632
+ <zeroOrMore>
633
+ <ref name="bdate"/>
634
+ </zeroOrMore>
635
+ <zeroOrMore>
636
+ <ref name="contributor"/>
637
+ </zeroOrMore>
638
+ <optional>
639
+ <ref name="edition"/>
640
+ </optional>
641
+ <zeroOrMore>
642
+ <ref name="version"/>
643
+ </zeroOrMore>
644
+ <zeroOrMore>
645
+ <ref name="biblionote"/>
646
+ </zeroOrMore>
647
+ <zeroOrMore>
648
+ <ref name="language"/>
649
+ </zeroOrMore>
650
+ <zeroOrMore>
651
+ <ref name="script"/>
652
+ </zeroOrMore>
653
+ <zeroOrMore>
654
+ <ref name="bibabstract"/>
655
+ </zeroOrMore>
656
+ <optional>
657
+ <ref name="status"/>
658
+ </optional>
659
+ <zeroOrMore>
660
+ <ref name="copyright"/>
661
+ </zeroOrMore>
662
+ <zeroOrMore>
663
+ <ref name="docrelation"/>
664
+ </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="series"/>
667
+ </zeroOrMore>
668
+ <optional>
669
+ <ref name="medium"/>
670
+ </optional>
671
+ <zeroOrMore>
672
+ <ref name="bplace"/>
673
+ </zeroOrMore>
674
+ <zeroOrMore>
675
+ <ref name="bprice"/>
676
+ </zeroOrMore>
677
+ <zeroOrMore>
678
+ <ref name="extent"/>
679
+ </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
683
+ <zeroOrMore>
684
+ <ref name="accesslocation"/>
685
+ </zeroOrMore>
686
+ <zeroOrMore>
687
+ <ref name="license"/>
688
+ </zeroOrMore>
689
+ <zeroOrMore>
690
+ <ref name="bclassification"/>
691
+ </zeroOrMore>
692
+ <zeroOrMore>
693
+ <ref name="bkeyword"/>
694
+ </zeroOrMore>
695
+ <optional>
696
+ <ref name="validity"/>
697
+ </optional>
698
+ </define>
699
+ <define name="ReducedBibliographicItem">
700
+ <optional>
701
+ <attribute name="type">
702
+ <ref name="BibItemType"/>
703
+ </attribute>
704
+ </optional>
705
+ <optional>
706
+ <ref name="fetched"/>
707
+ </optional>
708
+ <optional>
709
+ <ref name="formattedref"/>
710
+ </optional>
711
+ <zeroOrMore>
712
+ <ref name="btitle"/>
713
+ </zeroOrMore>
714
+ <zeroOrMore>
715
+ <ref name="bsource"/>
716
+ </zeroOrMore>
626
717
  <zeroOrMore>
627
718
  <ref name="docidentifier"/>
628
719
  </zeroOrMore>
@@ -638,9 +729,9 @@
638
729
  <optional>
639
730
  <ref name="edition"/>
640
731
  </optional>
641
- <optional>
732
+ <zeroOrMore>
642
733
  <ref name="version"/>
643
- </optional>
734
+ </zeroOrMore>
644
735
  <zeroOrMore>
645
736
  <ref name="biblionote"/>
646
737
  </zeroOrMore>
@@ -833,6 +924,12 @@
833
924
  <data type="boolean"/>
834
925
  </attribute>
835
926
  </optional>
927
+ <optional>
928
+ <attribute name="language"/>
929
+ </optional>
930
+ <optional>
931
+ <attribute name="script"/>
932
+ </optional>
836
933
  <text/>
837
934
  </element>
838
935
  </define>
@@ -1172,7 +1269,7 @@
1172
1269
  </element>
1173
1270
  </optional>
1174
1271
  <element name="bibitem">
1175
- <ref name="BibliographicItem"/>
1272
+ <ref name="ReducedBibliographicItem"/>
1176
1273
  </element>
1177
1274
  <choice>
1178
1275
  <zeroOrMore>
@@ -1197,9 +1294,9 @@
1197
1294
  <optional>
1198
1295
  <ref name="revision-date"/>
1199
1296
  </optional>
1200
- <zeroOrMore>
1297
+ <optional>
1201
1298
  <ref name="draft"/>
1202
- </zeroOrMore>
1299
+ </optional>
1203
1300
  </element>
1204
1301
  </define>
1205
1302
  <define name="vedition">
@@ -703,6 +703,9 @@
703
703
  <optional>
704
704
  <attribute name="tag"/>
705
705
  </optional>
706
+ <optional>
707
+ <attribute name="type"/>
708
+ </optional>
706
709
  <optional>
707
710
  <attribute name="multilingual-rendering">
708
711
  <ref name="MultilingualRenderingType"/>
@@ -738,6 +741,9 @@
738
741
  <optional>
739
742
  <attribute name="tag"/>
740
743
  </optional>
744
+ <optional>
745
+ <attribute name="type"/>
746
+ </optional>
741
747
  <optional>
742
748
  <attribute name="multilingual-rendering">
743
749
  <ref name="MultilingualRenderingType"/>
@@ -2059,6 +2065,7 @@
2059
2065
  <value>compare</value>
2060
2066
  <value>contrast</value>
2061
2067
  <value>see</value>
2068
+ <value>seealso</value>
2062
2069
  </choice>
2063
2070
  </define>
2064
2071
  <define name="deprecates">
@@ -446,11 +446,6 @@
446
446
  <data type="int"/>
447
447
  </element>
448
448
  </define>
449
- <define name="approvalgroup">
450
- <element name="approvalgroup">
451
- <ref name="IsoWorkgroup"/>
452
- </element>
453
- </define>
454
449
  <define name="subcommittee">
455
450
  <element name="subcommittee">
456
451
  <ref name="IsoWorkgroup"/>
@@ -1,6 +1,6 @@
1
1
  module Metanorma
2
2
  module Iec
3
- VERSION = "2.1.2".freeze
3
+ VERSION = "2.1.3".freeze
4
4
  end
5
5
  end
6
6
 
@@ -442,9 +442,6 @@ RSpec.describe Metanorma::Iec do
442
442
  <agency>IEC</agency>
443
443
  <agency>IETF</agency>
444
444
  <agency>ISO</agency>
445
- <technical-committee/>
446
- <subcommittee/>
447
- <workgroup/>
448
445
  </editorialgroup>
449
446
  <structuredidentifier>
450
447
  <project-number part='1' subpart='1'>IEC/IETF/ISO 1000</project-number>
@@ -680,9 +677,6 @@ RSpec.describe Metanorma::Iec do
680
677
  <doctype>standard</doctype>
681
678
  <editorialgroup>
682
679
  <agency>IEC</agency>
683
- <technical-committee/>
684
- <subcommittee/>
685
- <workgroup/>
686
680
  </editorialgroup>
687
681
  <structuredidentifier>
688
682
  <project-number>IEC 1000</project-number>
@@ -884,9 +878,6 @@ RSpec.describe Metanorma::Iec do
884
878
  <doctype>standard</doctype>
885
879
  <editorialgroup>
886
880
  <agency>IEC</agency>
887
- <technical-committee/>
888
- <subcommittee/>
889
- <workgroup/>
890
881
  </editorialgroup>
891
882
  <structuredidentifier>
892
883
  <project-number>IEC 1000</project-number>
@@ -952,9 +943,6 @@ RSpec.describe Metanorma::Iec do
952
943
  <doctype>standard</doctype>
953
944
  <editorialgroup>
954
945
  <agency>IEC</agency>
955
- <technical-committee/>
956
- <subcommittee/>
957
- <workgroup/>
958
946
  </editorialgroup>
959
947
  <structuredidentifier>
960
948
  <project-number>IEC 1000</project-number>
@@ -52,12 +52,9 @@ RSpec.describe Metanorma::Iec do
52
52
  </owner>
53
53
  </copyright>
54
54
  <ext>
55
- <doctype>article</doctype>
55
+ <doctype>standard</doctype>
56
56
  <editorialgroup>
57
57
  <agency>IEC</agency>
58
- <technical-committee/>
59
- <subcommittee/>
60
- <workgroup/>
61
58
  </editorialgroup>
62
59
  <stagename>International standard</stagename>
63
60
  <tc-sc-officers-note>
@@ -57,13 +57,10 @@ RSpec.describe Metanorma::Iec do
57
57
  </owner>
58
58
  </copyright>
59
59
  <ext>
60
- <doctype>article</doctype>
60
+ <doctype>standard</doctype>
61
61
  <subdoctype>vocabulary</subdoctype>
62
62
  <editorialgroup>
63
63
  <agency>IEC</agency>
64
- <technical-committee/>
65
- <subcommittee/>
66
- <workgroup/>
67
64
  </editorialgroup>
68
65
  <structuredidentifier>
69
66
  <project-number>IEC 60050</project-number>
@@ -146,13 +143,10 @@ RSpec.describe Metanorma::Iec do
146
143
  </owner>
147
144
  </copyright>
148
145
  <ext>
149
- <doctype>article</doctype>
146
+ <doctype>standard</doctype>
150
147
  <subdoctype>vocabulary</subdoctype>
151
148
  <editorialgroup>
152
149
  <agency>IEC</agency>
153
- <technical-committee/>
154
- <subcommittee/>
155
- <workgroup/>
156
150
  </editorialgroup>
157
151
  <structuredidentifier>
158
152
  <project-number>IEC 60050</project-number>
@@ -229,13 +223,10 @@ RSpec.describe Metanorma::Iec do
229
223
  </owner>
230
224
  </copyright>
231
225
  <ext>
232
- <doctype>article</doctype>
226
+ <doctype>standard</doctype>
233
227
  <subdoctype>vocabulary</subdoctype>
234
228
  <editorialgroup>
235
229
  <agency>IEC</agency>
236
- <technical-committee/>
237
- <subcommittee/>
238
- <workgroup/>
239
230
  </editorialgroup>
240
231
  <structuredidentifier>
241
232
  <project-number>IEC 60050</project-number>
data/spec/spec_helper.rb CHANGED
@@ -177,9 +177,6 @@ BLANK_HDR = <<~"HDR".freeze
177
177
  <doctype>standard</doctype>
178
178
  <editorialgroup>
179
179
  <agency>IEC</agency>
180
- <technical-committee/>
181
- <subcommittee/>
182
- <workgroup/>
183
180
  </editorialgroup>
184
181
  <stagename>International standard</stagename>
185
182
  </ext>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iec
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.2
4
+ version: 2.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-06 00:00:00.000000000 Z
11
+ date: 2022-06-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-iso
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
298
298
  - !ruby/object:Gem::Version
299
299
  version: '0'
300
300
  requirements: []
301
- rubygems_version: 3.3.7
301
+ rubygems_version: 3.3.16
302
302
  signing_key:
303
303
  specification_version: 4
304
304
  summary: metanorma-iec lets you write IEC standards in AsciiDoc.