metanorma-itu 2.8.1 → 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.
- checksums.yaml +4 -4
- data/lib/isodoc/itu/html/htmlstyle.css +5 -0
- data/lib/isodoc/itu/html/htmlstyle.scss +5 -0
- data/lib/isodoc/itu/init.rb +2 -1
- data/lib/isodoc/itu/itu.implementers-guide.xsl +46 -38
- data/lib/isodoc/itu/itu.in-force.xsl +46 -38
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +46 -38
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +46 -38
- data/lib/isodoc/itu/itu.recommendation.xsl +46 -38
- data/lib/isodoc/itu/itu.resolution.xsl +46 -38
- data/lib/isodoc/itu/itu.service-publication.xsl +46 -38
- data/lib/isodoc/itu/itu.technical-paper.xsl +46 -38
- data/lib/isodoc/itu/itu.technical-report.xsl +46 -38
- data/lib/isodoc/itu/metadata.rb +4 -1
- data/lib/isodoc/itu/presentation_contribution.rb +2 -2
- data/lib/isodoc/itu/presentation_ref.rb +4 -4
- data/lib/isodoc/itu/presentation_xml_convert.rb +10 -0
- data/lib/isodoc/itu/word_convert.rb +0 -11
- data/lib/metanorma/itu/biblio.rng +14 -4
- data/lib/metanorma/itu/cleanup.rb +4 -4
- data/lib/metanorma/itu/isodoc.rng +1 -1
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 847df72debd79e7f009d4f2fcd9b0d834f37aefd5f6aaa0e6cffba23ebfbf633
|
|
4
|
+
data.tar.gz: eebad6fec73e18eb60cdd814e775d27e3c9f466faf222c7c77451671b6a254c6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1d484cded11c945068d54d57738668bcf27c1fb997693bdd7b902a27547b30fcec746a20217faa3855238260c44634ccd02a92729b5bf3a81a7feac617e27e08
|
|
7
|
+
data.tar.gz: 3f2dfeed60e2fe0912e20d437a4606b3af9e0fdca7cc05f35f7c35f54bb5a7c86d9ae1f7c7165c8b6501cb987ce4d714de53ad51e1d5d1e48f1212ee7a00a518
|
data/lib/isodoc/itu/init.rb
CHANGED
|
@@ -23,7 +23,8 @@ module IsoDoc
|
|
|
23
23
|
|
|
24
24
|
def bibrenderer(options = {})
|
|
25
25
|
::Relaton::Render::Itu::General.new(options
|
|
26
|
-
.merge(language: @lang, script: @script, i18nhash: @i18n.get
|
|
26
|
+
.merge(language: @lang, script: @script, i18nhash: @i18n.get,
|
|
27
|
+
config: @relatonrenderconfig))
|
|
27
28
|
end
|
|
28
29
|
|
|
29
30
|
def fileloc(loc)
|
|
@@ -382,7 +382,21 @@
|
|
|
382
382
|
|
|
383
383
|
<fo:flow flow-name="xsl-region-body">
|
|
384
384
|
|
|
385
|
-
<xsl:
|
|
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="
|
|
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
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
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
|
|
|
@@ -2383,29 +2401,6 @@
|
|
|
2383
2401
|
</fo:footnote>
|
|
2384
2402
|
</xsl:template> -->
|
|
2385
2403
|
|
|
2386
|
-
<xsl:template match="mn:tt" priority="2">
|
|
2387
|
-
<xsl:variable name="element-name">
|
|
2388
|
-
<xsl:choose>
|
|
2389
|
-
<xsl:when test="$isGenerateTableIF = 'true'">fo:inline</xsl:when>
|
|
2390
|
-
<xsl:when test="ancestor::mn:dd">fo:inline</xsl:when>
|
|
2391
|
-
<xsl:when test="ancestor::mn:fmt-title">fo:inline</xsl:when>
|
|
2392
|
-
<xsl:when test="normalize-space(ancestor::mn:p[1]//text()[not(parent::mn:tt)]) != ''">fo:inline</xsl:when>
|
|
2393
|
-
<xsl:otherwise>fo:block</xsl:otherwise>
|
|
2394
|
-
</xsl:choose>
|
|
2395
|
-
</xsl:variable>
|
|
2396
|
-
<xsl:element name="{$element-name}">
|
|
2397
|
-
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
|
2398
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
2399
|
-
<xsl:if test="not(parent::mn:dt) and not(ancestor::mn:dd) and not(ancestor::mn:fmt-title) and $isGenerateTableIF = 'false'">
|
|
2400
|
-
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
2401
|
-
</xsl:if>
|
|
2402
|
-
<xsl:if test="ancestor::mn:fmt-title">
|
|
2403
|
-
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
2404
|
-
</xsl:if>
|
|
2405
|
-
<xsl:apply-templates/>
|
|
2406
|
-
</xsl:element>
|
|
2407
|
-
</xsl:template>
|
|
2408
|
-
|
|
2409
2404
|
<xsl:template match="mn:ul | mn:ol | mn:sections/mn:ul | mn:sections/mn:ol" mode="list" priority="2">
|
|
2410
2405
|
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2411
2406
|
<xsl:if test="preceding-sibling::*[1][self::mn:fmt-title] and $doctype != 'service-publication'">
|
|
@@ -2520,16 +2515,16 @@
|
|
|
2520
2515
|
</fo:block>
|
|
2521
2516
|
</xsl:template>
|
|
2522
2517
|
|
|
2523
|
-
<xsl:template match="mn:fmt-link" priority="2">
|
|
2518
|
+
<!-- <xsl:template match="mn:fmt-link" priority="2">
|
|
2524
2519
|
<fo:inline color="blue">
|
|
2525
2520
|
<xsl:if test="parent::mn:formattedref or ancestor::mn:preface">
|
|
2526
|
-
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
2521
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute> -->
|
|
2527
2522
|
<!-- <xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
2528
2523
|
<xsl:attribute name="font-size">8pt</xsl:attribute> -->
|
|
2529
|
-
</xsl:if>
|
|
2524
|
+
<!-- </xsl:if>
|
|
2530
2525
|
<xsl:call-template name="link"/>
|
|
2531
2526
|
</fo:inline>
|
|
2532
|
-
</xsl:template>
|
|
2527
|
+
</xsl:template> -->
|
|
2533
2528
|
|
|
2534
2529
|
<!-- https://github.com/metanorma/metanorma-itu/issues/607 -->
|
|
2535
2530
|
<xsl:template match="mn:references/mn:bibitem[1]" priority="5">
|
|
@@ -4124,7 +4119,7 @@
|
|
|
4124
4119
|
<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
|
|
4125
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>
|
|
4126
4121
|
|
|
4127
|
-
<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() > 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">
|
|
4128
4123
|
|
|
4129
4124
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
4130
4125
|
|
|
@@ -4711,9 +4706,15 @@
|
|
|
4711
4706
|
<!-- ================================= -->
|
|
4712
4707
|
|
|
4713
4708
|
<xsl:attribute-set name="link-style">
|
|
4709
|
+
<xsl:attribute name="color">blue</xsl:attribute>
|
|
4710
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
4714
4711
|
</xsl:attribute-set>
|
|
4715
4712
|
|
|
4716
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>
|
|
4717
4718
|
</xsl:template> <!-- refine_link-style -->
|
|
4718
4719
|
|
|
4719
4720
|
<xsl:template match="mn:fmt-link" name="link">
|
|
@@ -5373,10 +5374,15 @@
|
|
|
5373
5374
|
</xsl:template>
|
|
5374
5375
|
|
|
5375
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>
|
|
5376
5378
|
</xsl:attribute-set>
|
|
5377
5379
|
|
|
5378
5380
|
<xsl:template name="refine_tt-style">
|
|
5379
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>
|
|
5380
5386
|
</xsl:variable>
|
|
5381
5387
|
<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
|
|
5382
5388
|
<xsl:if test="$font-size != ''">
|
|
@@ -15311,9 +15317,12 @@
|
|
|
15311
15317
|
</xsl:template> <!-- refine_title-style -->
|
|
15312
15318
|
|
|
15313
15319
|
<xsl:template name="processPrefaceSectionsDefault">
|
|
15320
|
+
<xsl:param name="num"/>
|
|
15314
15321
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
|
|
15315
15322
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
15316
|
-
<xsl:apply-templates select="."
|
|
15323
|
+
<xsl:apply-templates select=".">
|
|
15324
|
+
<xsl:with-param name="num" select="$num"/>
|
|
15325
|
+
</xsl:apply-templates>
|
|
15317
15326
|
</xsl:for-each>
|
|
15318
15327
|
</xsl:template>
|
|
15319
15328
|
|
|
@@ -15717,7 +15726,6 @@
|
|
|
15717
15726
|
</xsl:template> <!-- sections_element_style -->
|
|
15718
15727
|
|
|
15719
15728
|
<xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
|
|
15720
|
-
<fo:block break-after="page"/>
|
|
15721
15729
|
<xsl:call-template name="setNamedDestination"/>
|
|
15722
15730
|
<fo:block>
|
|
15723
15731
|
<xsl:call-template name="setId"/>
|
|
@@ -382,7 +382,21 @@
|
|
|
382
382
|
|
|
383
383
|
<fo:flow flow-name="xsl-region-body">
|
|
384
384
|
|
|
385
|
-
<xsl:
|
|
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="
|
|
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
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
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
|
|
|
@@ -2383,29 +2401,6 @@
|
|
|
2383
2401
|
</fo:footnote>
|
|
2384
2402
|
</xsl:template> -->
|
|
2385
2403
|
|
|
2386
|
-
<xsl:template match="mn:tt" priority="2">
|
|
2387
|
-
<xsl:variable name="element-name">
|
|
2388
|
-
<xsl:choose>
|
|
2389
|
-
<xsl:when test="$isGenerateTableIF = 'true'">fo:inline</xsl:when>
|
|
2390
|
-
<xsl:when test="ancestor::mn:dd">fo:inline</xsl:when>
|
|
2391
|
-
<xsl:when test="ancestor::mn:fmt-title">fo:inline</xsl:when>
|
|
2392
|
-
<xsl:when test="normalize-space(ancestor::mn:p[1]//text()[not(parent::mn:tt)]) != ''">fo:inline</xsl:when>
|
|
2393
|
-
<xsl:otherwise>fo:block</xsl:otherwise>
|
|
2394
|
-
</xsl:choose>
|
|
2395
|
-
</xsl:variable>
|
|
2396
|
-
<xsl:element name="{$element-name}">
|
|
2397
|
-
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
|
2398
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
2399
|
-
<xsl:if test="not(parent::mn:dt) and not(ancestor::mn:dd) and not(ancestor::mn:fmt-title) and $isGenerateTableIF = 'false'">
|
|
2400
|
-
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
2401
|
-
</xsl:if>
|
|
2402
|
-
<xsl:if test="ancestor::mn:fmt-title">
|
|
2403
|
-
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
2404
|
-
</xsl:if>
|
|
2405
|
-
<xsl:apply-templates/>
|
|
2406
|
-
</xsl:element>
|
|
2407
|
-
</xsl:template>
|
|
2408
|
-
|
|
2409
2404
|
<xsl:template match="mn:ul | mn:ol | mn:sections/mn:ul | mn:sections/mn:ol" mode="list" priority="2">
|
|
2410
2405
|
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2411
2406
|
<xsl:if test="preceding-sibling::*[1][self::mn:fmt-title] and $doctype != 'service-publication'">
|
|
@@ -2520,16 +2515,16 @@
|
|
|
2520
2515
|
</fo:block>
|
|
2521
2516
|
</xsl:template>
|
|
2522
2517
|
|
|
2523
|
-
<xsl:template match="mn:fmt-link" priority="2">
|
|
2518
|
+
<!-- <xsl:template match="mn:fmt-link" priority="2">
|
|
2524
2519
|
<fo:inline color="blue">
|
|
2525
2520
|
<xsl:if test="parent::mn:formattedref or ancestor::mn:preface">
|
|
2526
|
-
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
2521
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute> -->
|
|
2527
2522
|
<!-- <xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
2528
2523
|
<xsl:attribute name="font-size">8pt</xsl:attribute> -->
|
|
2529
|
-
</xsl:if>
|
|
2524
|
+
<!-- </xsl:if>
|
|
2530
2525
|
<xsl:call-template name="link"/>
|
|
2531
2526
|
</fo:inline>
|
|
2532
|
-
</xsl:template>
|
|
2527
|
+
</xsl:template> -->
|
|
2533
2528
|
|
|
2534
2529
|
<!-- https://github.com/metanorma/metanorma-itu/issues/607 -->
|
|
2535
2530
|
<xsl:template match="mn:references/mn:bibitem[1]" priority="5">
|
|
@@ -4124,7 +4119,7 @@
|
|
|
4124
4119
|
<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
|
|
4125
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>
|
|
4126
4121
|
|
|
4127
|
-
<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() > 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">
|
|
4128
4123
|
|
|
4129
4124
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
4130
4125
|
|
|
@@ -4711,9 +4706,15 @@
|
|
|
4711
4706
|
<!-- ================================= -->
|
|
4712
4707
|
|
|
4713
4708
|
<xsl:attribute-set name="link-style">
|
|
4709
|
+
<xsl:attribute name="color">blue</xsl:attribute>
|
|
4710
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
4714
4711
|
</xsl:attribute-set>
|
|
4715
4712
|
|
|
4716
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>
|
|
4717
4718
|
</xsl:template> <!-- refine_link-style -->
|
|
4718
4719
|
|
|
4719
4720
|
<xsl:template match="mn:fmt-link" name="link">
|
|
@@ -5373,10 +5374,15 @@
|
|
|
5373
5374
|
</xsl:template>
|
|
5374
5375
|
|
|
5375
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>
|
|
5376
5378
|
</xsl:attribute-set>
|
|
5377
5379
|
|
|
5378
5380
|
<xsl:template name="refine_tt-style">
|
|
5379
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>
|
|
5380
5386
|
</xsl:variable>
|
|
5381
5387
|
<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
|
|
5382
5388
|
<xsl:if test="$font-size != ''">
|
|
@@ -15311,9 +15317,12 @@
|
|
|
15311
15317
|
</xsl:template> <!-- refine_title-style -->
|
|
15312
15318
|
|
|
15313
15319
|
<xsl:template name="processPrefaceSectionsDefault">
|
|
15320
|
+
<xsl:param name="num"/>
|
|
15314
15321
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
|
|
15315
15322
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
15316
|
-
<xsl:apply-templates select="."
|
|
15323
|
+
<xsl:apply-templates select=".">
|
|
15324
|
+
<xsl:with-param name="num" select="$num"/>
|
|
15325
|
+
</xsl:apply-templates>
|
|
15317
15326
|
</xsl:for-each>
|
|
15318
15327
|
</xsl:template>
|
|
15319
15328
|
|
|
@@ -15717,7 +15726,6 @@
|
|
|
15717
15726
|
</xsl:template> <!-- sections_element_style -->
|
|
15718
15727
|
|
|
15719
15728
|
<xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
|
|
15720
|
-
<fo:block break-after="page"/>
|
|
15721
15729
|
<xsl:call-template name="setNamedDestination"/>
|
|
15722
15730
|
<fo:block>
|
|
15723
15731
|
<xsl:call-template name="setId"/>
|
|
@@ -382,7 +382,21 @@
|
|
|
382
382
|
|
|
383
383
|
<fo:flow flow-name="xsl-region-body">
|
|
384
384
|
|
|
385
|
-
<xsl:
|
|
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="
|
|
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
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
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
|
|
|
@@ -2383,29 +2401,6 @@
|
|
|
2383
2401
|
</fo:footnote>
|
|
2384
2402
|
</xsl:template> -->
|
|
2385
2403
|
|
|
2386
|
-
<xsl:template match="mn:tt" priority="2">
|
|
2387
|
-
<xsl:variable name="element-name">
|
|
2388
|
-
<xsl:choose>
|
|
2389
|
-
<xsl:when test="$isGenerateTableIF = 'true'">fo:inline</xsl:when>
|
|
2390
|
-
<xsl:when test="ancestor::mn:dd">fo:inline</xsl:when>
|
|
2391
|
-
<xsl:when test="ancestor::mn:fmt-title">fo:inline</xsl:when>
|
|
2392
|
-
<xsl:when test="normalize-space(ancestor::mn:p[1]//text()[not(parent::mn:tt)]) != ''">fo:inline</xsl:when>
|
|
2393
|
-
<xsl:otherwise>fo:block</xsl:otherwise>
|
|
2394
|
-
</xsl:choose>
|
|
2395
|
-
</xsl:variable>
|
|
2396
|
-
<xsl:element name="{$element-name}">
|
|
2397
|
-
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
|
2398
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
2399
|
-
<xsl:if test="not(parent::mn:dt) and not(ancestor::mn:dd) and not(ancestor::mn:fmt-title) and $isGenerateTableIF = 'false'">
|
|
2400
|
-
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
2401
|
-
</xsl:if>
|
|
2402
|
-
<xsl:if test="ancestor::mn:fmt-title">
|
|
2403
|
-
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
2404
|
-
</xsl:if>
|
|
2405
|
-
<xsl:apply-templates/>
|
|
2406
|
-
</xsl:element>
|
|
2407
|
-
</xsl:template>
|
|
2408
|
-
|
|
2409
2404
|
<xsl:template match="mn:ul | mn:ol | mn:sections/mn:ul | mn:sections/mn:ol" mode="list" priority="2">
|
|
2410
2405
|
<xsl:variable name="doctype" select="ancestor::mn:metanorma/mn:bibdata/mn:ext/mn:doctype[not(@language) or @language = '']"/>
|
|
2411
2406
|
<xsl:if test="preceding-sibling::*[1][self::mn:fmt-title] and $doctype != 'service-publication'">
|
|
@@ -2520,16 +2515,16 @@
|
|
|
2520
2515
|
</fo:block>
|
|
2521
2516
|
</xsl:template>
|
|
2522
2517
|
|
|
2523
|
-
<xsl:template match="mn:fmt-link" priority="2">
|
|
2518
|
+
<!-- <xsl:template match="mn:fmt-link" priority="2">
|
|
2524
2519
|
<fo:inline color="blue">
|
|
2525
2520
|
<xsl:if test="parent::mn:formattedref or ancestor::mn:preface">
|
|
2526
|
-
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
2521
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute> -->
|
|
2527
2522
|
<!-- <xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
2528
2523
|
<xsl:attribute name="font-size">8pt</xsl:attribute> -->
|
|
2529
|
-
</xsl:if>
|
|
2524
|
+
<!-- </xsl:if>
|
|
2530
2525
|
<xsl:call-template name="link"/>
|
|
2531
2526
|
</fo:inline>
|
|
2532
|
-
</xsl:template>
|
|
2527
|
+
</xsl:template> -->
|
|
2533
2528
|
|
|
2534
2529
|
<!-- https://github.com/metanorma/metanorma-itu/issues/607 -->
|
|
2535
2530
|
<xsl:template match="mn:references/mn:bibitem[1]" priority="5">
|
|
@@ -4124,7 +4119,7 @@
|
|
|
4124
4119
|
<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
|
|
4125
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>
|
|
4126
4121
|
|
|
4127
|
-
<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() > 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">
|
|
4128
4123
|
|
|
4129
4124
|
<xsl:variable name="parent" select="local-name(..)"/>
|
|
4130
4125
|
|
|
@@ -4711,9 +4706,15 @@
|
|
|
4711
4706
|
<!-- ================================= -->
|
|
4712
4707
|
|
|
4713
4708
|
<xsl:attribute-set name="link-style">
|
|
4709
|
+
<xsl:attribute name="color">blue</xsl:attribute>
|
|
4710
|
+
<xsl:attribute name="text-decoration">underline</xsl:attribute>
|
|
4714
4711
|
</xsl:attribute-set>
|
|
4715
4712
|
|
|
4716
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>
|
|
4717
4718
|
</xsl:template> <!-- refine_link-style -->
|
|
4718
4719
|
|
|
4719
4720
|
<xsl:template match="mn:fmt-link" name="link">
|
|
@@ -5373,10 +5374,15 @@
|
|
|
5373
5374
|
</xsl:template>
|
|
5374
5375
|
|
|
5375
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>
|
|
5376
5378
|
</xsl:attribute-set>
|
|
5377
5379
|
|
|
5378
5380
|
<xsl:template name="refine_tt-style">
|
|
5379
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>
|
|
5380
5386
|
</xsl:variable>
|
|
5381
5387
|
<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
|
|
5382
5388
|
<xsl:if test="$font-size != ''">
|
|
@@ -15311,9 +15317,12 @@
|
|
|
15311
15317
|
</xsl:template> <!-- refine_title-style -->
|
|
15312
15318
|
|
|
15313
15319
|
<xsl:template name="processPrefaceSectionsDefault">
|
|
15320
|
+
<xsl:param name="num"/>
|
|
15314
15321
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
|
|
15315
15322
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
15316
|
-
<xsl:apply-templates select="."
|
|
15323
|
+
<xsl:apply-templates select=".">
|
|
15324
|
+
<xsl:with-param name="num" select="$num"/>
|
|
15325
|
+
</xsl:apply-templates>
|
|
15317
15326
|
</xsl:for-each>
|
|
15318
15327
|
</xsl:template>
|
|
15319
15328
|
|
|
@@ -15717,7 +15726,6 @@
|
|
|
15717
15726
|
</xsl:template> <!-- sections_element_style -->
|
|
15718
15727
|
|
|
15719
15728
|
<xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
|
|
15720
|
-
<fo:block break-after="page"/>
|
|
15721
15729
|
<xsl:call-template name="setNamedDestination"/>
|
|
15722
15730
|
<fo:block>
|
|
15723
15731
|
<xsl:call-template name="setId"/>
|