metanorma-itu 2.8.0 → 2.8.2

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.
Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/itu/html/htmlstyle.css +5 -0
  3. data/lib/isodoc/itu/html/htmlstyle.scss +5 -0
  4. data/lib/isodoc/itu/init.rb +2 -1
  5. data/lib/isodoc/itu/itu.implementers-guide.xsl +96 -94
  6. data/lib/isodoc/itu/itu.in-force.xsl +96 -94
  7. data/lib/isodoc/itu/itu.recommendation-annex.xsl +96 -94
  8. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +96 -94
  9. data/lib/isodoc/itu/itu.recommendation.xsl +96 -94
  10. data/lib/isodoc/itu/itu.resolution.xsl +96 -94
  11. data/lib/isodoc/itu/itu.service-publication.xsl +96 -94
  12. data/lib/isodoc/itu/itu.technical-paper.xsl +96 -94
  13. data/lib/isodoc/itu/itu.technical-report.xsl +96 -94
  14. data/lib/isodoc/itu/metadata.rb +4 -1
  15. data/lib/isodoc/itu/presentation_contribution.rb +2 -2
  16. data/lib/isodoc/itu/presentation_ref.rb +4 -4
  17. data/lib/isodoc/itu/presentation_xml_convert.rb +10 -0
  18. data/lib/isodoc/itu/word_convert.rb +0 -11
  19. data/lib/metanorma/itu/biblio.rng +18 -8
  20. data/lib/metanorma/itu/cleanup.rb +4 -4
  21. data/lib/metanorma/itu/converter.rb +4 -2
  22. data/lib/metanorma/itu/front.rb +38 -23
  23. data/lib/metanorma/itu/front_id.rb +39 -22
  24. data/lib/metanorma/itu/isodoc.rng +27 -10
  25. data/lib/metanorma/itu/version.rb +1 -1
  26. metadata +2 -2
data/lib/isodoc/itu/itu.resolution.xsl CHANGED
@@ -382,7 +382,21 @@
382
382
 
383
383
  <fo:flow flow-name="xsl-region-body">
384
384
 
385
- <xsl:if test="/mn:metanorma/mn:preface/*[not(@type = 'toc')] or /mn:metanorma/mn:bibdata/mn:keyword">
385
+ <xsl:variable name="showKeywords_">
386
+ <!-- From: https://github.com/metanorma/metanorma-itu/issues/730#issuecomment-3576320261
387
+ we removed keywords Metadata field from the cover page of Cs and TDs since the start of the precious study period. It no longer figures in the C and TD template file.
388
+ Keywords continue to be mandatory in the text of Recs and Suppls and Tech Papers / Reports. -->
389
+ <xsl:if test="/mn:metanorma/mn:bibdata/mn:keyword">
390
+ <xsl:choose>
391
+ <xsl:when test="$doctype = 'contribution'">false</xsl:when>
392
+ <xsl:when test="$TDnumber != ''">false</xsl:when>
393
+ <xsl:otherwise>true</xsl:otherwise>
394
+ </xsl:choose>
395
+ </xsl:if>
396
+ </xsl:variable>
397
+ <xsl:variable name="showKeywords" select="normalize-space($showKeywords_)"/>
398
+
399
+ <xsl:if test="/mn:metanorma/mn:preface/*[not(@type = 'toc')] or $showKeywords = 'true'">
386
400
 
387
401
  <xsl:if test="position() = 1">
388
402
  <fo:block-container font-size="14pt" font-weight="bold">
@@ -419,16 +433,20 @@
419
433
 
420
434
  <xsl:if test="position() = last()">
421
435
  <!-- Keywords -->
422
- <xsl:if test="/mn:metanorma/mn:bibdata/mn:keyword">
436
+ <xsl:if test="$showKeywords = 'true'">
423
437
  <fo:block font-size="12pt">
438
+ <xsl:if test="*[last()]/mn:table">
439
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
440
+ </xsl:if>
424
441
  <xsl:value-of select="$linebreak"/>
425
442
  <xsl:value-of select="$linebreak"/>
426
- </fo:block>
427
- <fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt">
428
- <xsl:value-of select="$i18n_keywords"/>
429
- </fo:block>
430
- <fo:block>
431
- <xsl:call-template name="insertKeywords"/>
443
+
444
+ <fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt" keep-with-next="always">
445
+ <xsl:value-of select="$i18n_keywords"/>
446
+ </fo:block>
447
+ <fo:block>
448
+ <xsl:call-template name="insertKeywords"/>
449
+ </fo:block>
432
450
  </fo:block>
433
451
  </xsl:if>
434
452
 
@@ -2116,29 +2134,6 @@
2116
2134
  </xsl:if>
2117
2135
  <xsl:apply-templates/>
2118
2136
  </xsl:template>
2119
-
2120
- <xsl:template match="mn:preface//mn:fmt-title" priority="3">
2121
- <!-- <xsl:if test="$doctype = 'service-publication'">
2122
- <fo:block>&#xa0;</fo:block>
2123
- <fo:block>&#xa0;</fo:block>
2124
- </xsl:if> -->
2125
- <xsl:variable name="level">
2126
- <xsl:call-template name="getLevel"/>
2127
- </xsl:variable>
2128
- <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
2129
- <fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt" keep-with-next="always" role="H{$level}">
2130
- <xsl:if test="$doctype = 'service-publication'">
2131
- <xsl:attribute name="margin-top">24pt</xsl:attribute>
2132
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2133
- <xsl:attribute name="font-size">12pt</xsl:attribute>
2134
- </xsl:if>
2135
- <xsl:apply-templates/>
2136
- <xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
2137
- </fo:block>
2138
- <!-- <xsl:if test="$doctype = 'service-publication'">
2139
- <fo:block keep-with-next="always">&#xa0;</fo:block>
2140
- </xsl:if> -->
2141
- </xsl:template>
2142
2137
  <!-- ============================= -->
2143
2138
  <!-- ============================= -->
2144
2139
 
@@ -2209,42 +2204,11 @@
2209
2204
  <!-- ====== -->
2210
2205
  <!-- title -->
2211
2206
  <!-- ====== -->
2212
- <xsl:template match="mn:annex/mn:fmt-title">
2213
- <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
2214
- <fo:block xsl:use-attribute-sets="annex-title-style">
2215
- <xsl:call-template name="refine_annex-title-style"/>
2216
- <fo:block>
2217
- <xsl:apply-templates/>
2218
- <xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
2219
- </fo:block>
2220
- <xsl:if test="$doctype != 'resolution'">
2221
- <fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
2222
- <!-- <xsl:choose>
2223
- <xsl:when test="parent::*[@obligation = 'informative']">
2224
- <xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
2225
- </xsl:when>
2226
- <xsl:otherwise>
2227
- <xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
2228
- </xsl:otherwise>
2229
- </xsl:choose> -->
2230
- <!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
2231
- <xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
2232
- </fo:block>
2233
- </xsl:if>
2234
- </fo:block>
2235
- </xsl:template>
2236
2207
 
2237
2208
  <!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
2238
2209
  <!-- renders in the annex/title template -->
2239
2210
  <xsl:template match="mn:annex/mn:p[preceding-sibling::*[1][self::mn:fmt-title or self::mn:variant-title]][starts-with(normalize-space(), '(')]" priority="3"/>
2240
2211
 
2241
- <!-- Bibliography -->
2242
- <xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
2243
- <fo:block xsl:use-attribute-sets="references-non-normative-title-style">
2244
- <xsl:apply-templates/>
2245
- </fo:block>
2246
- </xsl:template>
2247
-
2248
2212
  <xsl:template match="mn:fmt-title" name="title">
2249
2213
 
2250
2214
  <xsl:variable name="element-name">
@@ -2263,6 +2227,24 @@
2263
2227
 
2264
2228
  <xsl:apply-templates/>
2265
2229
  <xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
2230
+
2231
+ <xsl:if test="parent::mn:annex"><!-- Annex title -->
2232
+ <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
2233
+ <xsl:if test="$doctype != 'resolution'">
2234
+ <fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
2235
+ <!-- <xsl:choose>
2236
+ <xsl:when test="parent::*[@obligation = 'informative']">
2237
+ <xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
2238
+ </xsl:when>
2239
+ <xsl:otherwise>
2240
+ <xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
2241
+ </xsl:otherwise>
2242
+ </xsl:choose> -->
2243
+ <!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
2244
+ <xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
2245
+ </fo:block>
2246
+ </xsl:if>
2247
+ </xsl:if>
2266
2248
  </xsl:element>
2267
2249
 
2268
2250
  <xsl:if test="$element-name = 'fo:inline' and not(following-sibling::mn:p)">
@@ -2419,29 +2401,6 @@
2419
2401
  </fo:footnote>
2420
2402
  </xsl:template> -->
2421
2403
 
2422
- <xsl:template match="mn:tt" priority="2">
2423
- <xsl:variable name="element-name">
2424
- <xsl:choose>
2425
- <xsl:when test="$isGenerateTableIF = 'true'">fo:inline</xsl:when>
2426
- <xsl:when test="ancestor::mn:dd">fo:inline</xsl:when>
2427
- <xsl:when test="ancestor::mn:fmt-title">fo:inline</xsl:when>
2428
- <xsl:when test="normalize-space(ancestor::mn:p[1]//text()[not(parent::mn:tt)]) != ''">fo:inline</xsl:when>
2429
- <xsl:otherwise>fo:block</xsl:otherwise>
2430
- </xsl:choose>
2431
- </xsl:variable>
2432
- <xsl:element name="{$element-name}">
2433
- <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2434
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2435
- <xsl:if test="not(parent::mn:dt) and not(ancestor::mn:dd) and not(ancestor::mn:fmt-title) and $isGenerateTableIF = 'false'">
2436
- <xsl:attribute name="text-align">center</xsl:attribute>
2437
- </xsl:if>
2438
- <xsl:if test="ancestor::mn:fmt-title">
2439
- <xsl:attribute name="font-size">11pt</xsl:attribute>
2440
- </xsl:if>
2441
- <xsl:apply-templates/>
2442
- </xsl:element>
2443
- </xsl:template>
2444
-
2445
2404
  <xsl:template match="mn:ul | mn:ol | mn:sections/mn:ul | mn:sections/mn:ol" mode="list" priority="2">
2446
2405
  <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
2447
2406
  <xsl:if test="preceding-sibling::*[1][self::mn:fmt-title] and $doctype != 'service-publication'">
@@ -2556,16 +2515,16 @@
2556
2515
  </fo:block>
2557
2516
  </xsl:template>
2558
2517
 
2559
- <xsl:template match="mn:fmt-link" priority="2">
2518
+ <!-- <xsl:template match="mn:fmt-link" priority="2">
2560
2519
  <fo:inline color="blue">
2561
2520
  <xsl:if test="parent::mn:formattedref or ancestor::mn:preface">
2562
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
2521
+ <xsl:attribute name="text-decoration">underline</xsl:attribute> -->
2563
2522
  <!-- <xsl:attribute name="font-family">Arial</xsl:attribute>
2564
2523
  <xsl:attribute name="font-size">8pt</xsl:attribute> -->
2565
- </xsl:if>
2524
+ <!-- </xsl:if>
2566
2525
  <xsl:call-template name="link"/>
2567
2526
  </fo:inline>
2568
- </xsl:template>
2527
+ </xsl:template> -->
2569
2528
 
2570
2529
  <!-- https://github.com/metanorma/metanorma-itu/issues/607 -->
2571
2530
  <xsl:template match="mn:references/mn:bibitem[1]" priority="5">
@@ -4160,7 +4119,7 @@
4160
4119
  <xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
4161
4120
  <xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
4162
4121
 
4163
- <xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or ancestor::mn:sourcecode or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or ancestor::mn:name or ancestor::mn:fmt-name or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
4122
+ <xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or ancestor::mn:sourcecode or (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or ancestor::mn:name or ancestor::mn:fmt-name or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
4164
4123
 
4165
4124
  <xsl:variable name="parent" select="local-name(..)"/>
4166
4125
 
@@ -4747,9 +4706,15 @@
4747
4706
  <!-- ================================= -->
4748
4707
 
4749
4708
  <xsl:attribute-set name="link-style">
4709
+ <xsl:attribute name="color">blue</xsl:attribute>
4710
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4750
4711
  </xsl:attribute-set>
4751
4712
 
4752
4713
  <xsl:template name="refine_link-style">
4714
+ <xsl:if test="@style = 'url'">
4715
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
4716
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
4717
+ </xsl:if>
4753
4718
  </xsl:template> <!-- refine_link-style -->
4754
4719
 
4755
4720
  <xsl:template match="mn:fmt-link" name="link">
@@ -5409,10 +5374,15 @@
5409
5374
  </xsl:template>
5410
5375
 
5411
5376
  <xsl:attribute-set name="tt-style">
5377
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
5412
5378
  </xsl:attribute-set>
5413
5379
 
5414
5380
  <xsl:template name="refine_tt-style">
5415
5381
  <xsl:variable name="_font-size"> <!-- inherit -->
5382
+ <xsl:choose>
5383
+ <xsl:when test="ancestor::mn:fmt-title">11</xsl:when>
5384
+ <xsl:otherwise>10</xsl:otherwise>
5385
+ </xsl:choose>
5416
5386
  </xsl:variable>
5417
5387
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
5418
5388
  <xsl:if test="$font-size != ''">
@@ -13066,15 +13036,16 @@
13066
13036
  <!-- END Admonition -->
13067
13037
  <!-- ================ -->
13068
13038
 
13069
- <xsl:attribute-set name="references-non-normative-title-style">
13039
+ <xsl:attribute-set name="bibliography-title-style">
13070
13040
  <xsl:attribute name="font-size">14pt</xsl:attribute>
13071
13041
  <xsl:attribute name="font-weight">bold</xsl:attribute>
13072
13042
  <xsl:attribute name="text-align">center</xsl:attribute>
13043
+ <xsl:attribute name="space-before">0pt</xsl:attribute>
13073
13044
  <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
13074
13045
  <xsl:attribute name="role">H1</xsl:attribute>
13075
13046
  </xsl:attribute-set>
13076
13047
 
13077
- <xsl:template name="refine_references-non-normative-title-style">
13048
+ <xsl:template name="refine_bibliography-title-style">
13078
13049
  <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
13079
13050
  <xsl:if test="$doctype = 'implementers-guide'">
13080
13051
  <xsl:attribute name="text-align">left</xsl:attribute>
@@ -15196,9 +15167,11 @@
15196
15167
  <!-- ===================================== -->
15197
15168
 
15198
15169
  <xsl:attribute-set name="annex-title-style">
15170
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
15199
15171
  <xsl:attribute name="font-size">14pt</xsl:attribute>
15200
15172
  <xsl:attribute name="font-weight">bold</xsl:attribute>
15201
15173
  <xsl:attribute name="text-align">center</xsl:attribute>
15174
+ <xsl:attribute name="space-before">0pt</xsl:attribute>
15202
15175
  <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
15203
15176
  <xsl:attribute name="role">H1</xsl:attribute>
15204
15177
  </xsl:attribute-set> <!-- annex-title-style -->
@@ -15303,6 +15276,33 @@
15303
15276
  <xsl:attribute name="text-align">start</xsl:attribute>
15304
15277
  </xsl:if>
15305
15278
 
15279
+ <xsl:if test="ancestor::mn:preface">
15280
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
15281
+ <xsl:attribute name="margin-top">18pt</xsl:attribute>
15282
+ <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
15283
+ <xsl:attribute name="space-before">0pt</xsl:attribute>
15284
+ <xsl:attribute name="space-after">0pt</xsl:attribute>
15285
+ <xsl:if test="$doctype = 'service-publication'">
15286
+ <xsl:attribute name="margin-top">24pt</xsl:attribute>
15287
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
15288
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
15289
+ </xsl:if>
15290
+ </xsl:if>
15291
+
15292
+ <xsl:if test="parent::mn:annex"><!-- Annex title -->
15293
+ <xsl:variable name="annex_title_styles">
15294
+ <styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
15295
+ </xsl:variable>
15296
+ <xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
15297
+ </xsl:if>
15298
+
15299
+ <xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
15300
+ <xsl:variable name="bibliography_title_styles">
15301
+ <styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
15302
+ </xsl:variable>
15303
+ <xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
15304
+ </xsl:if>
15305
+
15306
15306
  <xsl:if test="$element-name = 'fo:inline'">
15307
15307
  <xsl:attribute name="padding-right">
15308
15308
  <xsl:choose>
@@ -15317,9 +15317,12 @@
15317
15317
  </xsl:template> <!-- refine_title-style -->
15318
15318
 
15319
15319
  <xsl:template name="processPrefaceSectionsDefault">
15320
+ <xsl:param name="num"/>
15320
15321
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
15321
15322
  <xsl:sort select="@displayorder" data-type="number"/>
15322
- <xsl:apply-templates select="."/>
15323
+ <xsl:apply-templates select=".">
15324
+ <xsl:with-param name="num" select="$num"/>
15325
+ </xsl:apply-templates>
15323
15326
  </xsl:for-each>
15324
15327
  </xsl:template>
15325
15328
 
@@ -15723,7 +15726,6 @@
15723
15726
  </xsl:template> <!-- sections_element_style -->
15724
15727
 
15725
15728
  <xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
15726
- <fo:block break-after="page"/>
15727
15729
  <xsl:call-template name="setNamedDestination"/>
15728
15730
  <fo:block>
15729
15731
  <xsl:call-template name="setId"/>
data/lib/isodoc/itu/itu.service-publication.xsl CHANGED
@@ -382,7 +382,21 @@
382
382
 
383
383
  <fo:flow flow-name="xsl-region-body">
384
384
 
385
- <xsl:if test="/mn:metanorma/mn:preface/*[not(@type = 'toc')] or /mn:metanorma/mn:bibdata/mn:keyword">
385
+ <xsl:variable name="showKeywords_">
386
+ <!-- From: https://github.com/metanorma/metanorma-itu/issues/730#issuecomment-3576320261
387
+ we removed keywords Metadata field from the cover page of Cs and TDs since the start of the precious study period. It no longer figures in the C and TD template file.
388
+ Keywords continue to be mandatory in the text of Recs and Suppls and Tech Papers / Reports. -->
389
+ <xsl:if test="/mn:metanorma/mn:bibdata/mn:keyword">
390
+ <xsl:choose>
391
+ <xsl:when test="$doctype = 'contribution'">false</xsl:when>
392
+ <xsl:when test="$TDnumber != ''">false</xsl:when>
393
+ <xsl:otherwise>true</xsl:otherwise>
394
+ </xsl:choose>
395
+ </xsl:if>
396
+ </xsl:variable>
397
+ <xsl:variable name="showKeywords" select="normalize-space($showKeywords_)"/>
398
+
399
+ <xsl:if test="/mn:metanorma/mn:preface/*[not(@type = 'toc')] or $showKeywords = 'true'">
386
400
 
387
401
  <xsl:if test="position() = 1">
388
402
  <fo:block-container font-size="14pt" font-weight="bold">
@@ -419,16 +433,20 @@
419
433
 
420
434
  <xsl:if test="position() = last()">
421
435
  <!-- Keywords -->
422
- <xsl:if test="/mn:metanorma/mn:bibdata/mn:keyword">
436
+ <xsl:if test="$showKeywords = 'true'">
423
437
  <fo:block font-size="12pt">
438
+ <xsl:if test="*[last()]/mn:table">
439
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
440
+ </xsl:if>
424
441
  <xsl:value-of select="$linebreak"/>
425
442
  <xsl:value-of select="$linebreak"/>
426
- </fo:block>
427
- <fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt">
428
- <xsl:value-of select="$i18n_keywords"/>
429
- </fo:block>
430
- <fo:block>
431
- <xsl:call-template name="insertKeywords"/>
443
+
444
+ <fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt" keep-with-next="always">
445
+ <xsl:value-of select="$i18n_keywords"/>
446
+ </fo:block>
447
+ <fo:block>
448
+ <xsl:call-template name="insertKeywords"/>
449
+ </fo:block>
432
450
  </fo:block>
433
451
  </xsl:if>
434
452
 
@@ -2116,29 +2134,6 @@
2116
2134
  </xsl:if>
2117
2135
  <xsl:apply-templates/>
2118
2136
  </xsl:template>
2119
-
2120
- <xsl:template match="mn:preface//mn:fmt-title" priority="3">
2121
- <!-- <xsl:if test="$doctype = 'service-publication'">
2122
- <fo:block>&#xa0;</fo:block>
2123
- <fo:block>&#xa0;</fo:block>
2124
- </xsl:if> -->
2125
- <xsl:variable name="level">
2126
- <xsl:call-template name="getLevel"/>
2127
- </xsl:variable>
2128
- <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
2129
- <fo:block font-weight="bold" margin-top="18pt" margin-bottom="18pt" keep-with-next="always" role="H{$level}">
2130
- <xsl:if test="$doctype = 'service-publication'">
2131
- <xsl:attribute name="margin-top">24pt</xsl:attribute>
2132
- <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
2133
- <xsl:attribute name="font-size">12pt</xsl:attribute>
2134
- </xsl:if>
2135
- <xsl:apply-templates/>
2136
- <xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
2137
- </fo:block>
2138
- <!-- <xsl:if test="$doctype = 'service-publication'">
2139
- <fo:block keep-with-next="always">&#xa0;</fo:block>
2140
- </xsl:if> -->
2141
- </xsl:template>
2142
2137
  <!-- ============================= -->
2143
2138
  <!-- ============================= -->
2144
2139
 
@@ -2209,42 +2204,11 @@
2209
2204
  <!-- ====== -->
2210
2205
  <!-- title -->
2211
2206
  <!-- ====== -->
2212
- <xsl:template match="mn:annex/mn:fmt-title">
2213
- <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
2214
- <fo:block xsl:use-attribute-sets="annex-title-style">
2215
- <xsl:call-template name="refine_annex-title-style"/>
2216
- <fo:block>
2217
- <xsl:apply-templates/>
2218
- <xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
2219
- </fo:block>
2220
- <xsl:if test="$doctype != 'resolution'">
2221
- <fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
2222
- <!-- <xsl:choose>
2223
- <xsl:when test="parent::*[@obligation = 'informative']">
2224
- <xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
2225
- </xsl:when>
2226
- <xsl:otherwise>
2227
- <xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
2228
- </xsl:otherwise>
2229
- </xsl:choose> -->
2230
- <!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
2231
- <xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
2232
- </fo:block>
2233
- </xsl:if>
2234
- </fo:block>
2235
- </xsl:template>
2236
2207
 
2237
2208
  <!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
2238
2209
  <!-- renders in the annex/title template -->
2239
2210
  <xsl:template match="mn:annex/mn:p[preceding-sibling::*[1][self::mn:fmt-title or self::mn:variant-title]][starts-with(normalize-space(), '(')]" priority="3"/>
2240
2211
 
2241
- <!-- Bibliography -->
2242
- <xsl:template match="mn:references[not(@normative='true')]/mn:fmt-title">
2243
- <fo:block xsl:use-attribute-sets="references-non-normative-title-style">
2244
- <xsl:apply-templates/>
2245
- </fo:block>
2246
- </xsl:template>
2247
-
2248
2212
  <xsl:template match="mn:fmt-title" name="title">
2249
2213
 
2250
2214
  <xsl:variable name="element-name">
@@ -2263,6 +2227,24 @@
2263
2227
 
2264
2228
  <xsl:apply-templates/>
2265
2229
  <xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
2230
+
2231
+ <xsl:if test="parent::mn:annex"><!-- Annex title -->
2232
+ <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
2233
+ <xsl:if test="$doctype != 'resolution'">
2234
+ <fo:block font-size="12pt" font-weight="normal" margin-top="6pt">
2235
+ <!-- <xsl:choose>
2236
+ <xsl:when test="parent::*[@obligation = 'informative']">
2237
+ <xsl:text>(This appendix does not form an integral part of this Recommendation.)</xsl:text>
2238
+ </xsl:when>
2239
+ <xsl:otherwise>
2240
+ <xsl:text>(This annex forms an integral part of this Recommendation.)</xsl:text>
2241
+ </xsl:otherwise>
2242
+ </xsl:choose> -->
2243
+ <!-- Added for https://github.com/metanorma/isodoc/issues/614 -->
2244
+ <xsl:apply-templates select="following-sibling::mn:p[not(preceding-sibling::mn:clause)][starts-with(normalize-space(), '(')]/node()"/>
2245
+ </fo:block>
2246
+ </xsl:if>
2247
+ </xsl:if>
2266
2248
  </xsl:element>
2267
2249
 
2268
2250
  <xsl:if test="$element-name = 'fo:inline' and not(following-sibling::mn:p)">
@@ -2419,29 +2401,6 @@
2419
2401
  </fo:footnote>
2420
2402
  </xsl:template> -->
2421
2403
 
2422
- <xsl:template match="mn:tt" priority="2">
2423
- <xsl:variable name="element-name">
2424
- <xsl:choose>
2425
- <xsl:when test="$isGenerateTableIF = 'true'">fo:inline</xsl:when>
2426
- <xsl:when test="ancestor::mn:dd">fo:inline</xsl:when>
2427
- <xsl:when test="ancestor::mn:fmt-title">fo:inline</xsl:when>
2428
- <xsl:when test="normalize-space(ancestor::mn:p[1]//text()[not(parent::mn:tt)]) != ''">fo:inline</xsl:when>
2429
- <xsl:otherwise>fo:block</xsl:otherwise>
2430
- </xsl:choose>
2431
- </xsl:variable>
2432
- <xsl:element name="{$element-name}">
2433
- <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
2434
- <xsl:attribute name="font-size">10pt</xsl:attribute>
2435
- <xsl:if test="not(parent::mn:dt) and not(ancestor::mn:dd) and not(ancestor::mn:fmt-title) and $isGenerateTableIF = 'false'">
2436
- <xsl:attribute name="text-align">center</xsl:attribute>
2437
- </xsl:if>
2438
- <xsl:if test="ancestor::mn:fmt-title">
2439
- <xsl:attribute name="font-size">11pt</xsl:attribute>
2440
- </xsl:if>
2441
- <xsl:apply-templates/>
2442
- </xsl:element>
2443
- </xsl:template>
2444
-
2445
2404
  <xsl:template match="mn:ul | mn:ol | mn:sections/mn:ul | mn:sections/mn:ol" mode="list" priority="2">
2446
2405
  <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
2447
2406
  <xsl:if test="preceding-sibling::*[1][self::mn:fmt-title] and $doctype != 'service-publication'">
@@ -2556,16 +2515,16 @@
2556
2515
  </fo:block>
2557
2516
  </xsl:template>
2558
2517
 
2559
- <xsl:template match="mn:fmt-link" priority="2">
2518
+ <!-- <xsl:template match="mn:fmt-link" priority="2">
2560
2519
  <fo:inline color="blue">
2561
2520
  <xsl:if test="parent::mn:formattedref or ancestor::mn:preface">
2562
- <xsl:attribute name="text-decoration">underline</xsl:attribute>
2521
+ <xsl:attribute name="text-decoration">underline</xsl:attribute> -->
2563
2522
  <!-- <xsl:attribute name="font-family">Arial</xsl:attribute>
2564
2523
  <xsl:attribute name="font-size">8pt</xsl:attribute> -->
2565
- </xsl:if>
2524
+ <!-- </xsl:if>
2566
2525
  <xsl:call-template name="link"/>
2567
2526
  </fo:inline>
2568
- </xsl:template>
2527
+ </xsl:template> -->
2569
2528
 
2570
2529
  <!-- https://github.com/metanorma/metanorma-itu/issues/607 -->
2571
2530
  <xsl:template match="mn:references/mn:bibitem[1]" priority="5">
@@ -4160,7 +4119,7 @@
4160
4119
  <xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
4161
4120
  <xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
4162
4121
 
4163
- <xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or ancestor::mn:sourcecode or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or ancestor::mn:name or ancestor::mn:fmt-name or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
4122
+ <xsl:template match="text()[not(ancestor::mn:bibdata or ancestor::mn:fmt-link[not(contains(normalize-space(),' '))] or ancestor::mn:sourcecode or (ancestor::mn:tt and ancestor::mn:table and string-length() &gt; 20) or ancestor::*[local-name() = 'math'] or ancestor::*[local-name() = 'svg'] or ancestor::mn:name or ancestor::mn:fmt-name or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') or normalize-space() = '' )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
4164
4123
 
4165
4124
  <xsl:variable name="parent" select="local-name(..)"/>
4166
4125
 
@@ -4747,9 +4706,15 @@
4747
4706
  <!-- ================================= -->
4748
4707
 
4749
4708
  <xsl:attribute-set name="link-style">
4709
+ <xsl:attribute name="color">blue</xsl:attribute>
4710
+ <xsl:attribute name="text-decoration">underline</xsl:attribute>
4750
4711
  </xsl:attribute-set>
4751
4712
 
4752
4713
  <xsl:template name="refine_link-style">
4714
+ <xsl:if test="@style = 'url'">
4715
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
4716
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
4717
+ </xsl:if>
4753
4718
  </xsl:template> <!-- refine_link-style -->
4754
4719
 
4755
4720
  <xsl:template match="mn:fmt-link" name="link">
@@ -5409,10 +5374,15 @@
5409
5374
  </xsl:template>
5410
5375
 
5411
5376
  <xsl:attribute-set name="tt-style">
5377
+ <xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
5412
5378
  </xsl:attribute-set>
5413
5379
 
5414
5380
  <xsl:template name="refine_tt-style">
5415
5381
  <xsl:variable name="_font-size"> <!-- inherit -->
5382
+ <xsl:choose>
5383
+ <xsl:when test="ancestor::mn:fmt-title">11</xsl:when>
5384
+ <xsl:otherwise>10</xsl:otherwise>
5385
+ </xsl:choose>
5416
5386
  </xsl:variable>
5417
5387
  <xsl:variable name="font-size" select="normalize-space($_font-size)"/>
5418
5388
  <xsl:if test="$font-size != ''">
@@ -13066,15 +13036,16 @@
13066
13036
  <!-- END Admonition -->
13067
13037
  <!-- ================ -->
13068
13038
 
13069
- <xsl:attribute-set name="references-non-normative-title-style">
13039
+ <xsl:attribute-set name="bibliography-title-style">
13070
13040
  <xsl:attribute name="font-size">14pt</xsl:attribute>
13071
13041
  <xsl:attribute name="font-weight">bold</xsl:attribute>
13072
13042
  <xsl:attribute name="text-align">center</xsl:attribute>
13043
+ <xsl:attribute name="space-before">0pt</xsl:attribute>
13073
13044
  <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
13074
13045
  <xsl:attribute name="role">H1</xsl:attribute>
13075
13046
  </xsl:attribute-set>
13076
13047
 
13077
- <xsl:template name="refine_references-non-normative-title-style">
13048
+ <xsl:template name="refine_bibliography-title-style">
13078
13049
  <xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
13079
13050
  <xsl:if test="$doctype = 'implementers-guide'">
13080
13051
  <xsl:attribute name="text-align">left</xsl:attribute>
@@ -15196,9 +15167,11 @@
15196
15167
  <!-- ===================================== -->
15197
15168
 
15198
15169
  <xsl:attribute-set name="annex-title-style">
15170
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
15199
15171
  <xsl:attribute name="font-size">14pt</xsl:attribute>
15200
15172
  <xsl:attribute name="font-weight">bold</xsl:attribute>
15201
15173
  <xsl:attribute name="text-align">center</xsl:attribute>
15174
+ <xsl:attribute name="space-before">0pt</xsl:attribute>
15202
15175
  <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
15203
15176
  <xsl:attribute name="role">H1</xsl:attribute>
15204
15177
  </xsl:attribute-set> <!-- annex-title-style -->
@@ -15303,6 +15276,33 @@
15303
15276
  <xsl:attribute name="text-align">start</xsl:attribute>
15304
15277
  </xsl:if>
15305
15278
 
15279
+ <xsl:if test="ancestor::mn:preface">
15280
+ <xsl:attribute name="font-size">inherit</xsl:attribute>
15281
+ <xsl:attribute name="margin-top">18pt</xsl:attribute>
15282
+ <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
15283
+ <xsl:attribute name="space-before">0pt</xsl:attribute>
15284
+ <xsl:attribute name="space-after">0pt</xsl:attribute>
15285
+ <xsl:if test="$doctype = 'service-publication'">
15286
+ <xsl:attribute name="margin-top">24pt</xsl:attribute>
15287
+ <xsl:attribute name="margin-bottom">12pt</xsl:attribute>
15288
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
15289
+ </xsl:if>
15290
+ </xsl:if>
15291
+
15292
+ <xsl:if test="parent::mn:annex"><!-- Annex title -->
15293
+ <xsl:variable name="annex_title_styles">
15294
+ <styles xsl:use-attribute-sets="annex-title-style"><xsl:call-template name="refine_annex-title-style"/></styles>
15295
+ </xsl:variable>
15296
+ <xsl:copy-of select="xalan:nodeset($annex_title_styles)/styles/@*"/>
15297
+ </xsl:if>
15298
+
15299
+ <xsl:if test="parent::mn:references[not(@normative='true')]"><!-- Bibliography section title -->
15300
+ <xsl:variable name="bibliography_title_styles">
15301
+ <styles xsl:use-attribute-sets="bibliography-title-style"><xsl:call-template name="refine_bibliography-title-style"/></styles>
15302
+ </xsl:variable>
15303
+ <xsl:copy-of select="xalan:nodeset($bibliography_title_styles)/styles/@*"/>
15304
+ </xsl:if>
15305
+
15306
15306
  <xsl:if test="$element-name = 'fo:inline'">
15307
15307
  <xsl:attribute name="padding-right">
15308
15308
  <xsl:choose>
@@ -15317,9 +15317,12 @@
15317
15317
  </xsl:template> <!-- refine_title-style -->
15318
15318
 
15319
15319
  <xsl:template name="processPrefaceSectionsDefault">
15320
+ <xsl:param name="num"/>
15320
15321
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
15321
15322
  <xsl:sort select="@displayorder" data-type="number"/>
15322
- <xsl:apply-templates select="."/>
15323
+ <xsl:apply-templates select=".">
15324
+ <xsl:with-param name="num" select="$num"/>
15325
+ </xsl:apply-templates>
15323
15326
  </xsl:for-each>
15324
15327
  </xsl:template>
15325
15328
 
@@ -15723,7 +15726,6 @@
15723
15726
  </xsl:template> <!-- sections_element_style -->
15724
15727
 
15725
15728
  <xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
15726
- <fo:block break-after="page"/>
15727
15729
  <xsl:call-template name="setNamedDestination"/>
15728
15730
  <fo:block>
15729
15731
  <xsl:call-template name="setId"/>