metanorma-iso 3.1.5 → 3.1.7
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/iso/html/style-human.css +1 -1
- data/lib/isodoc/iso/html/style-human.scss +1 -1
- data/lib/isodoc/iso/html/style-iso.css +1 -1
- data/lib/isodoc/iso/html/style-iso.scss +1 -1
- data/lib/isodoc/iso/i18n-de.yaml +6 -2
- data/lib/isodoc/iso/i18n-en.yaml +6 -2
- data/lib/isodoc/iso/i18n-fr.yaml +4 -0
- data/lib/isodoc/iso/i18n-ja.yaml +1 -0
- data/lib/isodoc/iso/i18n-ru.yaml +4 -0
- data/lib/isodoc/iso/i18n-zh-Hans.yaml +1 -0
- data/lib/isodoc/iso/init.rb +2 -2
- data/lib/isodoc/iso/iso.amendment.xsl +132 -117
- data/lib/isodoc/iso/iso.international-standard.xsl +132 -117
- data/lib/isodoc/iso/presentation_section.rb +0 -22
- data/lib/isodoc/iso/presentation_xml_convert.rb +11 -2
- data/lib/isodoc/iso/presentation_xref.rb +80 -9
- data/lib/isodoc/iso/word_convert.rb +3 -3
- data/lib/isodoc/iso/xref.rb +14 -6
- data/lib/isodoc/iso/xref_section.rb +1 -3
- data/lib/metanorma/iso/biblio.rng +1 -1
- data/lib/metanorma/iso/isodoc.rng +35 -10
- data/lib/metanorma/iso/validate_list.rb +2 -2
- data/lib/metanorma/iso/version.rb +1 -1
- data/metanorma-iso.gemspec +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b88715ca34a125fc47d4e293e7134cf602ae3a48953f12bd6c13641129791844
|
4
|
+
data.tar.gz: 37201b90fee7182fd99448a0d3803ad2ce9d0aa16f001eab3bec5b629f3ecacf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8f964265cdce903a92cc728bf280f41c971ffa72696768e7d5694c56d34114d9f466100ed6a856a2466fbcc14582b33d28a9e764b00708a60cfb56f4c237eafa
|
7
|
+
data.tar.gz: f9cff23e2ea300a7651a87a5ab93a6c7a3b59773b5ff64be725a66ba19524544bc3b312d9e83c618b8c253d2df7bb8ae6cd508705f0d59c8e3a6a5da1d78b3d6
|
data/lib/isodoc/iso/i18n-de.yaml
CHANGED
@@ -12,6 +12,7 @@ price: Preis
|
|
12
12
|
date_first_printing: Datum des ersten Drucks
|
13
13
|
date_printing: "Datum des {{ var1 | ordinal_word: '', '' }} Drucks"
|
14
14
|
descriptor: Deskriptor
|
15
|
+
reference: Referenz
|
15
16
|
under_preparation: In Vorbereitung. (Stadium zum Zeitpunkt der Veröffentlichung %).
|
16
17
|
withdrawn: Zurückgezogen.
|
17
18
|
cancelled_and_replaced: Abgebrochen und ersetzt durch %.
|
@@ -25,8 +26,8 @@ voting_begins_on: Die Abstimmung beginnt am
|
|
25
26
|
voting_terminates_on: Die Abstimmung endet am
|
26
27
|
corrected_version: Korrigierte Version
|
27
28
|
fast-track-procedue: Beschleunigtes Verfahren
|
28
|
-
multiple_and: "%1 und %2"
|
29
|
-
multiple_or: "%1 oder %2"
|
29
|
+
multiple_and: "%1 <span class='fmt-conn'>und</span> %2"
|
30
|
+
multiple_or: "%1 <span class='fmt-conn'>oder</span> %2"
|
30
31
|
classification-UDC: UDK
|
31
32
|
edition_ordinal_old: "{{ var1 | ordinal_num: 'edition', '' }} AUSGABE"
|
32
33
|
edition_replacement: "Diese {{ var1 | ordinal_word: 'edition', '' }} Ausgabe ersetzt die {{ var2 | ordinal_word: 'edition', '' }} Ausgabe"
|
@@ -158,3 +159,6 @@ inflection:
|
|
158
159
|
Deskriptor:
|
159
160
|
sg: Deskriptor
|
160
161
|
pl: Deskriptoren
|
162
|
+
Referenz:
|
163
|
+
sg: Referenz
|
164
|
+
pl: Referenzen
|
data/lib/isodoc/iso/i18n-en.yaml
CHANGED
@@ -12,6 +12,7 @@ price: Price
|
|
12
12
|
date_first_printing: Date of the first printing
|
13
13
|
date_printing: "Date of the {{ var1 | ordinal_word: '', '' }} printing"
|
14
14
|
descriptor: Descriptor
|
15
|
+
reference: Reference
|
15
16
|
under_preparation: Under preparation. (Stage at the time of publication %).
|
16
17
|
withdrawn: Withdrawn.
|
17
18
|
cancelled_and_replaced: Cancelled and replaced by %.
|
@@ -27,8 +28,8 @@ voting_begins_on: Voting begins on
|
|
27
28
|
voting_terminates_on: Voting terminates on
|
28
29
|
corrected_version: Corrected version
|
29
30
|
fast-track-procedure: Fast track procedure
|
30
|
-
multiple_and: "%1 and %2"
|
31
|
-
multiple_or: "%1 or %2"
|
31
|
+
multiple_and: "%1 <span class='fmt-conn'>and</span> %2"
|
32
|
+
multiple_or: "%1 <span class='fmt-conn'>or</span> %2"
|
32
33
|
classification-UDC: UDC
|
33
34
|
website: website
|
34
35
|
formerly_id: "(formerly %)"
|
@@ -161,3 +162,6 @@ inflection:
|
|
161
162
|
Descriptor:
|
162
163
|
sg: Descriptor
|
163
164
|
pl: Descriptors
|
165
|
+
Reference:
|
166
|
+
sg: Reference
|
167
|
+
pl: References
|
data/lib/isodoc/iso/i18n-fr.yaml
CHANGED
@@ -13,6 +13,7 @@ price: Prix
|
|
13
13
|
date_first_printing: Date de la première impression
|
14
14
|
date_printing: "Date de la {{ var1 | ordinal_word: '', 'f' }} impression"
|
15
15
|
descriptor: Descripteur
|
16
|
+
reference: Référence
|
16
17
|
under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
|
17
18
|
withdrawn: Retiré.
|
18
19
|
cancelled_and_replaced: Annulé et remplacé par %.
|
@@ -159,3 +160,6 @@ inflection:
|
|
159
160
|
Descripteur:
|
160
161
|
sg: Descripteur
|
161
162
|
pl: Descripteurs
|
163
|
+
Référence:
|
164
|
+
sg: Référence
|
165
|
+
pl: Références
|
data/lib/isodoc/iso/i18n-ja.yaml
CHANGED
data/lib/isodoc/iso/i18n-ru.yaml
CHANGED
@@ -7,6 +7,7 @@ all_rights_reserved: Все права защищены
|
|
7
7
|
reference_number: Ссылочный номер
|
8
8
|
reference_number_abbrev: Исх. №
|
9
9
|
descriptor: Дескриптор
|
10
|
+
reference: Ссылка
|
10
11
|
price_based_on: Цена рассчитана на % стр.
|
11
12
|
price: Цена
|
12
13
|
date_first_printing: Дата первой печати
|
@@ -159,3 +160,6 @@ inflection:
|
|
159
160
|
Дескриптор:
|
160
161
|
sg: Дескриптор
|
161
162
|
pl: Дескрипторы
|
163
|
+
Ссылка:
|
164
|
+
sg: Ссылка
|
165
|
+
pl: Ссылки
|
data/lib/isodoc/iso/init.rb
CHANGED
@@ -36,8 +36,8 @@ module IsoDoc
|
|
36
36
|
end
|
37
37
|
|
38
38
|
def bibrenderer(options = {})
|
39
|
-
::Relaton::Render::Iso::General.new(options
|
40
|
-
|
39
|
+
::Relaton::Render::Iso::General.new(options
|
40
|
+
.merge(language: @lang, script: @script, i18nhash: @i18n.get))
|
41
41
|
end
|
42
42
|
|
43
43
|
def amd?(_docxml)
|
@@ -1082,7 +1082,7 @@
|
|
1082
1082
|
<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num <= 19981231)"><!-- copyright renders in the footer footer-preface-first_1987-1998--></xsl:when>
|
1083
1083
|
<xsl:otherwise>
|
1084
1084
|
|
1085
|
-
<xsl:call-template name="
|
1085
|
+
<xsl:call-template name="inner-cover-page"/>
|
1086
1086
|
|
1087
1087
|
</xsl:otherwise>
|
1088
1088
|
</xsl:choose>
|
@@ -1449,6 +1449,10 @@
|
|
1449
1449
|
<xsl:variable name="fo_cover_page">
|
1450
1450
|
<!-- cover page -->
|
1451
1451
|
<xsl:choose>
|
1452
|
+
<xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image']/mn:value/mn:image and normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:full-coverpage-replacement) = 'true'">
|
1453
|
+
<xsl:call-template name="insertCoverPageFullImage"/>
|
1454
|
+
</xsl:when>
|
1455
|
+
|
1452
1456
|
<xsl:when test="$layoutVersion = '1951'">
|
1453
1457
|
<fo:page-sequence master-reference="cover-page_1951" force-page-count="no-force">
|
1454
1458
|
<fo:static-content flow-name="cover-page-header" font-family="Times New Roman" font-size="8.5pt" font-weight="bold">
|
@@ -2849,7 +2853,8 @@
|
|
2849
2853
|
</xsl:if> <!-- $isGenerateTableIF = 'false' -->
|
2850
2854
|
</xsl:template> <!-- END cover-page -->
|
2851
2855
|
|
2852
|
-
|
2856
|
+
<!-- copyright-statement -->
|
2857
|
+
<xsl:template name="inner-cover-page">
|
2853
2858
|
<xsl:if test="normalize-space(/mn:metanorma/mn:boilerplate/mn:copyright-statement) != ''">
|
2854
2859
|
|
2855
2860
|
<fo:page-sequence format="i" force-page-count="no-force">
|
@@ -4968,19 +4973,27 @@
|
|
4968
4973
|
<xsl:param name="border_around_page">false</xsl:param>
|
4969
4974
|
<xsl:param name="insert_header_first">true</xsl:param>
|
4970
4975
|
<xsl:param name="insert_footer_last">true</xsl:param>
|
4971
|
-
|
4972
|
-
|
4973
|
-
<xsl:with-param name="font-weight" select="$font-weight"/>
|
4974
|
-
</xsl:call-template>
|
4975
|
-
</xsl:if>
|
4976
|
-
<xsl:call-template name="insertHeaderEven">
|
4977
|
-
<xsl:with-param name="border_around_page" select="$border_around_page"/>
|
4976
|
+
|
4977
|
+
<xsl:call-template name="insertHeader">
|
4978
4978
|
<xsl:with-param name="is_header" select="$is_header"/>
|
4979
|
+
<xsl:with-param name="border_around_page" select="$border_around_page"/>
|
4980
|
+
<xsl:with-param name="insert_header_first" select="$insert_header_first"/>
|
4979
4981
|
</xsl:call-template>
|
4980
|
-
<xsl:call-template name="
|
4982
|
+
<xsl:call-template name="insertFooter">
|
4981
4983
|
<xsl:with-param name="font-weight" select="$font-weight"/>
|
4984
|
+
<xsl:with-param name="is_footer" select="$is_footer"/>
|
4982
4985
|
<xsl:with-param name="insert_footer_last" select="$insert_footer_last"/>
|
4983
4986
|
</xsl:call-template>
|
4987
|
+
</xsl:template>
|
4988
|
+
|
4989
|
+
<xsl:template name="insertHeader">
|
4990
|
+
<xsl:param name="is_header">true</xsl:param>
|
4991
|
+
<xsl:param name="border_around_page">false</xsl:param>
|
4992
|
+
<xsl:param name="insert_header_first">true</xsl:param>
|
4993
|
+
<xsl:call-template name="insertHeaderEven">
|
4994
|
+
<xsl:with-param name="border_around_page" select="$border_around_page"/>
|
4995
|
+
<xsl:with-param name="is_header" select="$is_header"/>
|
4996
|
+
</xsl:call-template>
|
4984
4997
|
<xsl:choose>
|
4985
4998
|
<xsl:when test="$layoutVersion = '1951'"/>
|
4986
4999
|
<xsl:when test="not((($layoutVersion = '1987' and $doctype = 'technical-report') or ($layoutVersion = '1979' and $doctype = 'addendum'))) and $insert_header_first = 'true'">
|
@@ -4991,10 +5004,26 @@
|
|
4991
5004
|
<xsl:with-param name="border_around_page" select="$border_around_page"/>
|
4992
5005
|
<xsl:with-param name="is_header" select="$is_header"/>
|
4993
5006
|
</xsl:call-template>
|
5007
|
+
</xsl:template>
|
5008
|
+
|
5009
|
+
<xsl:template name="insertFooter">
|
5010
|
+
<xsl:param name="font-weight" select="'bold'"/>
|
5011
|
+
<xsl:param name="is_footer">false</xsl:param>
|
5012
|
+
<xsl:param name="insert_footer_last">true</xsl:param>
|
5013
|
+
<xsl:if test="($layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num <= 19981231)) and $is_footer = 'true'">
|
5014
|
+
<xsl:call-template name="insertFooterFirst1972_1998">
|
5015
|
+
<xsl:with-param name="font-weight" select="$font-weight"/>
|
5016
|
+
</xsl:call-template>
|
5017
|
+
</xsl:if>
|
5018
|
+
<xsl:call-template name="insertFooterEven">
|
5019
|
+
<xsl:with-param name="font-weight" select="$font-weight"/>
|
5020
|
+
<xsl:with-param name="insert_footer_last" select="$insert_footer_last"/>
|
5021
|
+
</xsl:call-template>
|
4994
5022
|
<xsl:call-template name="insertFooterOdd">
|
4995
5023
|
<xsl:with-param name="font-weight" select="$font-weight"/>
|
4996
5024
|
</xsl:call-template>
|
4997
5025
|
</xsl:template>
|
5026
|
+
|
4998
5027
|
<xsl:variable name="font-size_header">
|
4999
5028
|
<xsl:choose>
|
5000
5029
|
<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">11pt</xsl:when>
|
@@ -7715,7 +7744,6 @@
|
|
7715
7744
|
</xsl:attribute-set> <!-- feedback-statement-title-style -->
|
7716
7745
|
|
7717
7746
|
<xsl:template name="refine_feedback-statement-title-style">
|
7718
|
-
|
7719
7747
|
</xsl:template>
|
7720
7748
|
|
7721
7749
|
<xsl:attribute-set name="feedback-statement-p-style">
|
@@ -9392,86 +9420,80 @@
|
|
9392
9420
|
</xsl:if>
|
9393
9421
|
</xsl:template>
|
9394
9422
|
|
9395
|
-
<xsl:attribute-set name="term-
|
9423
|
+
<xsl:attribute-set name="term-number-style">
|
9396
9424
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
9397
9425
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
9398
9426
|
</xsl:attribute-set> <!-- term-name-style -->
|
9399
9427
|
|
9400
|
-
<xsl:template name="refine_term-
|
9428
|
+
<xsl:template name="refine_term-number-style">
|
9401
9429
|
</xsl:template>
|
9402
9430
|
|
9403
|
-
<xsl:attribute-set name="preferred-style">
|
9404
|
-
</xsl:attribute-set> <!-- preferred-style -->
|
9405
|
-
|
9406
|
-
<xsl:template name="refine_preferred-style">
|
9407
|
-
</xsl:template>
|
9408
|
-
|
9409
|
-
<xsl:attribute-set name="preferred-block-style">
|
9431
|
+
<xsl:attribute-set name="term-preferred-block-style">
|
9410
9432
|
<xsl:attribute name="line-height">1.1</xsl:attribute>
|
9411
9433
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
9412
9434
|
|
9413
|
-
<xsl:template name="
|
9435
|
+
<xsl:template name="refine_term-preferred-block-style">
|
9414
9436
|
</xsl:template>
|
9415
9437
|
|
9416
|
-
<xsl:attribute-set name="preferred-
|
9438
|
+
<xsl:attribute-set name="term-preferred-style">
|
9417
9439
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
9418
9440
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
9419
9441
|
</xsl:attribute-set> <!-- preferred-term-style -->
|
9420
9442
|
|
9421
|
-
<xsl:template name="
|
9443
|
+
<xsl:template name="refine_term-preferred-style">
|
9422
9444
|
<xsl:if test="mn:strong">
|
9423
9445
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
9424
9446
|
</xsl:if>
|
9425
9447
|
</xsl:template>
|
9426
9448
|
|
9427
|
-
<xsl:attribute-set name="domain-style">
|
9428
|
-
</xsl:attribute-set> <!-- domain-style -->
|
9449
|
+
<xsl:attribute-set name="term-domain-style">
|
9450
|
+
</xsl:attribute-set> <!-- term-domain-style -->
|
9429
9451
|
|
9430
|
-
<xsl:template name="
|
9452
|
+
<xsl:template name="refine_term-domain-style">
|
9431
9453
|
</xsl:template>
|
9432
9454
|
|
9433
|
-
<xsl:attribute-set name="admitted-style">
|
9434
|
-
</xsl:attribute-set> <!-- admitted-style -->
|
9455
|
+
<xsl:attribute-set name="term-admitted-style">
|
9456
|
+
</xsl:attribute-set> <!-- term-admitted-style -->
|
9435
9457
|
|
9436
|
-
<xsl:template name="
|
9458
|
+
<xsl:template name="refine_term-admitted-style">
|
9437
9459
|
</xsl:template>
|
9438
9460
|
|
9439
|
-
<xsl:attribute-set name="deprecates-style">
|
9440
|
-
</xsl:attribute-set> <!-- deprecates-style -->
|
9461
|
+
<xsl:attribute-set name="term-deprecates-style">
|
9462
|
+
</xsl:attribute-set> <!-- term-deprecates-style -->
|
9441
9463
|
|
9442
|
-
<xsl:template name="
|
9464
|
+
<xsl:template name="refine_term-deprecates-style">
|
9443
9465
|
</xsl:template>
|
9444
9466
|
|
9445
|
-
<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
|
9467
|
+
<xsl:attribute-set name="term-related-block-style" use-attribute-sets="term-preferred-block-style">
|
9446
9468
|
</xsl:attribute-set>
|
9447
9469
|
|
9448
|
-
<xsl:template name="
|
9470
|
+
<xsl:template name="refine_term-related-block-style">
|
9449
9471
|
</xsl:template>
|
9450
9472
|
|
9451
|
-
<xsl:attribute-set name="definition-style">
|
9473
|
+
<xsl:attribute-set name="term-definition-style">
|
9452
9474
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
9453
|
-
</xsl:attribute-set> <!-- definition-style -->
|
9475
|
+
</xsl:attribute-set> <!-- term-definition-style -->
|
9454
9476
|
|
9455
|
-
<xsl:template name="
|
9477
|
+
<xsl:template name="refine_term-definition-style">
|
9456
9478
|
</xsl:template>
|
9457
9479
|
|
9458
|
-
<xsl:attribute-set name="termsource-style">
|
9480
|
+
<xsl:attribute-set name="term-termsource-style">
|
9459
9481
|
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
9460
|
-
</xsl:attribute-set> <!-- termsource-style -->
|
9482
|
+
</xsl:attribute-set> <!-- term-termsource-style -->
|
9461
9483
|
|
9462
|
-
<xsl:template name="
|
9463
|
-
</xsl:template> <!--
|
9484
|
+
<xsl:template name="refine_term-termsource-style">
|
9485
|
+
</xsl:template> <!-- refine_term-termsource-style -->
|
9464
9486
|
|
9465
|
-
<xsl:attribute-set name="termsource-text-style">
|
9466
|
-
</xsl:attribute-set> <!-- termsource-text-style -->
|
9487
|
+
<xsl:attribute-set name="term-termsource-text-style">
|
9488
|
+
</xsl:attribute-set> <!-- term-termsource-text-style -->
|
9467
9489
|
|
9468
|
-
<xsl:template name="
|
9490
|
+
<xsl:template name="refine_term-termsource-text-style">
|
9469
9491
|
</xsl:template>
|
9470
9492
|
|
9471
|
-
<xsl:attribute-set name="origin-style">
|
9472
|
-
</xsl:attribute-set> <!-- origin-style -->
|
9493
|
+
<xsl:attribute-set name="term-origin-style">
|
9494
|
+
</xsl:attribute-set> <!-- term-origin-style -->
|
9473
9495
|
|
9474
|
-
<xsl:template name="
|
9496
|
+
<xsl:template name="refine_term-origin-style">
|
9475
9497
|
</xsl:template>
|
9476
9498
|
|
9477
9499
|
<!-- ====== -->
|
@@ -9515,9 +9537,9 @@
|
|
9515
9537
|
<!-- modification -->
|
9516
9538
|
<!-- ====== -->
|
9517
9539
|
<xsl:template match="mn:fmt-termsource" name="termsource">
|
9518
|
-
<fo:block xsl:use-attribute-sets="termsource-style">
|
9540
|
+
<fo:block xsl:use-attribute-sets="term-termsource-style">
|
9519
9541
|
|
9520
|
-
<xsl:call-template name="
|
9542
|
+
<xsl:call-template name="refine_term-termsource-style"/>
|
9521
9543
|
|
9522
9544
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
9523
9545
|
<xsl:variable name="termsource_text">
|
@@ -9565,8 +9587,8 @@
|
|
9565
9587
|
|
9566
9588
|
<!-- text SOURCE: -->
|
9567
9589
|
<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
|
9568
|
-
<fo:inline xsl:use-attribute-sets="termsource-text-style">
|
9569
|
-
<xsl:call-template name="
|
9590
|
+
<fo:inline xsl:use-attribute-sets="term-termsource-text-style">
|
9591
|
+
<xsl:call-template name="refine_term-termsource-text-style"/>
|
9570
9592
|
<xsl:value-of select="."/>
|
9571
9593
|
</fo:inline>
|
9572
9594
|
</xsl:template>
|
@@ -9578,8 +9600,8 @@
|
|
9578
9600
|
<xsl:if test="normalize-space(@citeas) = ''">
|
9579
9601
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
|
9580
9602
|
</xsl:if>
|
9581
|
-
<fo:inline xsl:use-attribute-sets="origin-style">
|
9582
|
-
<xsl:call-template name="
|
9603
|
+
<fo:inline xsl:use-attribute-sets="term-origin-style">
|
9604
|
+
<xsl:call-template name="refine_term-origin-style"/>
|
9583
9605
|
<xsl:apply-templates/>
|
9584
9606
|
</fo:inline>
|
9585
9607
|
</fo:basic-link>
|
@@ -9627,14 +9649,14 @@
|
|
9627
9649
|
<xsl:variable name="levelTerm">
|
9628
9650
|
<xsl:call-template name="getLevelTermName"/>
|
9629
9651
|
</xsl:variable>
|
9630
|
-
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
9652
|
+
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="term-preferred-block-style">
|
9631
9653
|
|
9632
|
-
<xsl:call-template name="
|
9654
|
+
<xsl:call-template name="refine_term-preferred-block-style"/>
|
9633
9655
|
|
9634
9656
|
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
|
9635
9657
|
|
9636
|
-
<fo:block xsl:use-attribute-sets="term-
|
9637
|
-
<xsl:call-template name="refine_term-
|
9658
|
+
<fo:block xsl:use-attribute-sets="term-number-style" role="SKIP">
|
9659
|
+
<xsl:call-template name="refine_term-number-style"/>
|
9638
9660
|
|
9639
9661
|
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
|
9640
9662
|
<xsl:call-template name="setIDforNamedDestination"/>
|
@@ -9644,8 +9666,8 @@
|
|
9644
9666
|
</fo:block>
|
9645
9667
|
</xsl:if>
|
9646
9668
|
|
9647
|
-
<fo:block xsl:use-attribute-sets="preferred-
|
9648
|
-
<xsl:call-template name="
|
9669
|
+
<fo:block xsl:use-attribute-sets="term-preferred-style" role="SKIP">
|
9670
|
+
<xsl:call-template name="refine_term-preferred-style"/>
|
9649
9671
|
|
9650
9672
|
<xsl:apply-templates/>
|
9651
9673
|
</fo:block>
|
@@ -9665,15 +9687,15 @@
|
|
9665
9687
|
<xsl:template match="mn:domain"/>
|
9666
9688
|
|
9667
9689
|
<xsl:template match="mn:fmt-admitted">
|
9668
|
-
<fo:block xsl:use-attribute-sets="admitted-style">
|
9669
|
-
<xsl:call-template name="
|
9690
|
+
<fo:block xsl:use-attribute-sets="term-admitted-style">
|
9691
|
+
<xsl:call-template name="refine_term-admitted-style"/>
|
9670
9692
|
<xsl:apply-templates/>
|
9671
9693
|
</fo:block>
|
9672
9694
|
</xsl:template>
|
9673
9695
|
|
9674
9696
|
<xsl:template match="mn:fmt-deprecates">
|
9675
|
-
<fo:block xsl:use-attribute-sets="deprecates-style">
|
9676
|
-
<xsl:call-template name="
|
9697
|
+
<fo:block xsl:use-attribute-sets="term-deprecates-style">
|
9698
|
+
<xsl:call-template name="refine_term-deprecates-style"/>
|
9677
9699
|
<xsl:apply-templates/>
|
9678
9700
|
</fo:block>
|
9679
9701
|
</xsl:template>
|
@@ -9686,8 +9708,8 @@
|
|
9686
9708
|
<!-- End Preferred, admitted, deprecated -->
|
9687
9709
|
|
9688
9710
|
<xsl:template match="mn:fmt-related">
|
9689
|
-
<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
|
9690
|
-
<xsl:call-template name="
|
9711
|
+
<fo:block role="SKIP" xsl:use-attribute-sets="term-related-block-style">
|
9712
|
+
<xsl:call-template name="refine_term-related-block-style"/>
|
9691
9713
|
<xsl:apply-templates/>
|
9692
9714
|
</fo:block>
|
9693
9715
|
</xsl:template>
|
@@ -9701,8 +9723,8 @@
|
|
9701
9723
|
<!-- definition -->
|
9702
9724
|
<!-- ========== -->
|
9703
9725
|
<xsl:template match="mn:fmt-definition">
|
9704
|
-
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
9705
|
-
<xsl:call-template name="
|
9726
|
+
<fo:block xsl:use-attribute-sets="term-definition-style" role="SKIP">
|
9727
|
+
<xsl:call-template name="refine_term-definition-style"/>
|
9706
9728
|
<xsl:apply-templates/>
|
9707
9729
|
</fo:block>
|
9708
9730
|
</xsl:template>
|
@@ -13827,15 +13849,22 @@
|
|
13827
13849
|
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
13828
13850
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
13829
13851
|
</xsl:if>
|
13830
|
-
</xsl:template>
|
13852
|
+
</xsl:template> <!-- refine_quote-style -->
|
13831
13853
|
|
13832
13854
|
<xsl:attribute-set name="quote-source-style">
|
13833
13855
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
13834
|
-
</xsl:attribute-set>
|
13856
|
+
</xsl:attribute-set> <!-- quote-source-style -->
|
13835
13857
|
|
13836
13858
|
<xsl:template name="refine_quote-source-style">
|
13837
13859
|
</xsl:template>
|
13838
13860
|
|
13861
|
+
<xsl:attribute-set name="source-style">
|
13862
|
+
</xsl:attribute-set> <!-- source-style -->
|
13863
|
+
|
13864
|
+
<xsl:template name="refine_source-style">
|
13865
|
+
|
13866
|
+
</xsl:template> <!-- refine_source-style -->
|
13867
|
+
|
13839
13868
|
<!-- ====== -->
|
13840
13869
|
<!-- quote -->
|
13841
13870
|
<!-- source -->
|
@@ -13883,7 +13912,9 @@
|
|
13883
13912
|
</xsl:if>
|
13884
13913
|
<xsl:choose>
|
13885
13914
|
<xsl:when test="not(parent::quote)">
|
13886
|
-
<fo:block>
|
13915
|
+
<fo:block xsl:use-attribute-sets="source-style">
|
13916
|
+
<xsl:call-template name="refine_source-style"/>
|
13917
|
+
|
13887
13918
|
<xsl:call-template name="insert_basic_link">
|
13888
13919
|
<xsl:with-param name="element">
|
13889
13920
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
@@ -16044,7 +16075,7 @@
|
|
16044
16075
|
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
16045
16076
|
</xsl:if>
|
16046
16077
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
16047
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
16078
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
|
16048
16079
|
</xsl:template> <!-- refine_fn-reference-style -->
|
16049
16080
|
|
16050
16081
|
<xsl:attribute-set name="fn-style">
|
@@ -16055,7 +16086,9 @@
|
|
16055
16086
|
</xsl:template>
|
16056
16087
|
|
16057
16088
|
<xsl:attribute-set name="fn-num-style">
|
16089
|
+
<xsl:attribute name="role">Reference</xsl:attribute>
|
16058
16090
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
16091
|
+
<xsl:attribute name="font-size">65%</xsl:attribute>
|
16059
16092
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
16060
16093
|
<!--<xsl:attribute name="vertical-align">super</xsl:attribute> -->
|
16061
16094
|
<xsl:attribute name="baseline-shift">30%</xsl:attribute>
|
@@ -16149,26 +16182,9 @@
|
|
16149
16182
|
<xsl:variable name="ref_id" select="@target"/>
|
16150
16183
|
|
16151
16184
|
<xsl:variable name="footnote_inline">
|
16152
|
-
<fo:inline
|
16185
|
+
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
16153
16186
|
|
16154
|
-
<xsl:
|
16155
|
-
<xsl:choose>
|
16156
|
-
<xsl:when test="ancestor::mn:bibitem">
|
16157
|
-
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
16158
|
-
<xsl:call-template name="refine_bibitem-note-fn-style"/>
|
16159
|
-
</fn_styles>
|
16160
|
-
</xsl:when>
|
16161
|
-
<xsl:otherwise>
|
16162
|
-
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
16163
|
-
<xsl:call-template name="refine_fn-num-style"/>
|
16164
|
-
</fn_styles>
|
16165
|
-
</xsl:otherwise>
|
16166
|
-
</xsl:choose>
|
16167
|
-
</xsl:variable>
|
16168
|
-
|
16169
|
-
<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
|
16170
|
-
<xsl:copy-of select="."/>
|
16171
|
-
</xsl:for-each>
|
16187
|
+
<xsl:call-template name="refine_fn-num-style"/>
|
16172
16188
|
|
16173
16189
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
16174
16190
|
<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
|
@@ -16178,7 +16194,7 @@
|
|
16178
16194
|
<xsl:attribute name="font-size">70%</xsl:attribute>
|
16179
16195
|
</xsl:if>
|
16180
16196
|
|
16181
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
16197
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
|
16182
16198
|
|
16183
16199
|
<xsl:call-template name="insert_basic_link">
|
16184
16200
|
<xsl:with-param name="element">
|
@@ -16483,32 +16499,6 @@
|
|
16483
16499
|
<xsl:template name="refine_bibitem-non-normative-list-body-style">
|
16484
16500
|
</xsl:template>
|
16485
16501
|
|
16486
|
-
<!-- footnote reference number for bibitem, in the text -->
|
16487
|
-
<xsl:attribute-set name="bibitem-note-fn-style">
|
16488
|
-
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
16489
|
-
<xsl:attribute name="font-size">65%</xsl:attribute>
|
16490
|
-
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
16491
|
-
<xsl:attribute name="baseline-shift">30%</xsl:attribute>
|
16492
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-style -->
|
16493
|
-
|
16494
|
-
<xsl:template name="refine_bibitem-note-fn-style">
|
16495
|
-
</xsl:template>
|
16496
|
-
|
16497
|
-
<!-- footnote number on the page bottom -->
|
16498
|
-
<xsl:attribute-set name="bibitem-note-fn-number-style">
|
16499
|
-
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
16500
|
-
<xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
|
16501
|
-
<xsl:attribute name="padding-right">3mm</xsl:attribute>
|
16502
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
|
16503
|
-
|
16504
|
-
<!-- footnote body (text) on the page bottom -->
|
16505
|
-
<xsl:attribute-set name="bibitem-note-fn-body-style">
|
16506
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
16507
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
16508
|
-
<xsl:attribute name="start-indent">0pt</xsl:attribute>
|
16509
|
-
<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
|
16510
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
|
16511
|
-
|
16512
16502
|
<xsl:attribute-set name="references-non-normative-style">
|
16513
16503
|
</xsl:attribute-set> <!-- references-non-normative-style -->
|
16514
16504
|
|
@@ -18887,6 +18877,17 @@
|
|
18887
18877
|
</xsl:attribute-set>
|
18888
18878
|
|
18889
18879
|
<xsl:template name="refine_clause-style">
|
18880
|
+
<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
|
18881
|
+
<!-- <xsl:if test="$namespace = 'rsd'">
|
18882
|
+
<xsl:variable name="level">
|
18883
|
+
<xsl:call-template name="getLevel">
|
18884
|
+
<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
|
18885
|
+
</xsl:call-template>
|
18886
|
+
</xsl:variable>
|
18887
|
+
<xsl:if test="$level >= 4">
|
18888
|
+
<xsl:attribute name="margin-left">13mm</xsl:attribute>
|
18889
|
+
</xsl:if>
|
18890
|
+
</xsl:if> -->
|
18890
18891
|
</xsl:template>
|
18891
18892
|
|
18892
18893
|
<!-- main sections -->
|
@@ -19988,6 +19989,20 @@
|
|
19988
19989
|
</fo:block-container>
|
19989
19990
|
</xsl:template>
|
19990
19991
|
|
19992
|
+
<!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
|
19993
|
+
<xsl:template name="insertCoverPageFullImage">
|
19994
|
+
<xsl:param name="name">coverpage-image</xsl:param>
|
19995
|
+
<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
|
19996
|
+
<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
|
19997
|
+
<fo:flow flow-name="xsl-region-body">
|
19998
|
+
<xsl:call-template name="insertBackgroundPageImage">
|
19999
|
+
<xsl:with-param name="number" select="position()"/>
|
20000
|
+
</xsl:call-template>
|
20001
|
+
</fo:flow>
|
20002
|
+
</fo:page-sequence>
|
20003
|
+
</xsl:for-each>
|
20004
|
+
</xsl:template>
|
20005
|
+
|
19991
20006
|
<xsl:template name="insertPageImage">
|
19992
20007
|
<xsl:param name="svg_content_height" select="$pageHeight"/>
|
19993
20008
|
<xsl:param name="bitmap_width" select="$pageWidth"/>
|