metanorma-iso 2.7.3 → 2.7.5
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/i18n-en.yaml +2 -0
- data/lib/isodoc/iso/i18n-fr.yaml +2 -0
- data/lib/isodoc/iso/i18n-ru.yaml +2 -0
- data/lib/isodoc/iso/iso.amendment.xsl +981 -219
- data/lib/isodoc/iso/iso.international-standard.xsl +981 -219
- data/lib/isodoc/iso/presentation_xml_convert.rb +4 -0
- data/lib/isodoc/iso/xref.rb +5 -7
- data/lib/isodoc/iso/xref_section.rb +11 -0
- data/lib/metanorma/iso/base.rb +0 -8
- data/lib/metanorma/iso/biblio.rng +24 -8
- data/lib/metanorma/iso/boilerplate-fr.adoc +36 -2
- data/lib/metanorma/iso/boilerplate-ru.adoc +37 -2
- data/lib/metanorma/iso/boilerplate.adoc +35 -2
- data/lib/metanorma/iso/cleanup.rb +8 -112
- data/lib/metanorma/iso/cleanup_biblio.rb +120 -0
- data/lib/metanorma/iso/front_id.rb +5 -5
- data/lib/metanorma/iso/isodoc.rng +67 -55
- data/lib/metanorma/iso/version.rb +1 -1
- metadata +3 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:java="http://xml.apache.org/xalan/java" xmlns:barcode="http://barcode4j.krysalis.org/ns" exclude-result-prefixes="java" version="1.0">
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:java="http://xml.apache.org/xalan/java" xmlns:barcode="http://barcode4j.krysalis.org/ns" xmlns:redirect="http://xml.apache.org/xalan/redirect" exclude-result-prefixes="java" extension-element-prefixes="redirect" version="1.0">
|
|
2
2
|
|
|
3
3
|
<xsl:output method="xml" encoding="UTF-8" indent="no"/>
|
|
4
4
|
|
|
@@ -45,11 +45,6 @@
|
|
|
45
45
|
</xsl:if>
|
|
46
46
|
</xsl:variable>
|
|
47
47
|
|
|
48
|
-
<xsl:variable name="all_rights_reserved">
|
|
49
|
-
<xsl:call-template name="getLocalizedString">
|
|
50
|
-
<xsl:with-param name="key">all_rights_reserved</xsl:with-param>
|
|
51
|
-
</xsl:call-template>
|
|
52
|
-
</xsl:variable>
|
|
53
48
|
<xsl:variable name="copyrightYear" select="/iso:iso-standard/iso:bibdata/iso:copyright/iso:from"/>
|
|
54
49
|
<xsl:variable name="copyrightAbbr__">
|
|
55
50
|
<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:copyright/iso:owner/iso:organization[normalize-space(iso:abbreviation) != 'IEEE']">
|
|
@@ -75,13 +70,23 @@
|
|
|
75
70
|
<xsl:variable name="copyrightAbbr" select="normalize-space($copyrightAbbr_)"/>
|
|
76
71
|
<xsl:variable name="copyrightAbbrIEEE" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:copyright/iso:owner/iso:organization/iso:abbreviation[. = 'IEEE'])"/>
|
|
77
72
|
<xsl:variable name="copyrightText">
|
|
78
|
-
<xsl:value-of select="concat('© ', $copyrightAbbr, ' ', $copyrightYear ,' – ', $
|
|
73
|
+
<xsl:value-of select="concat('© ', $copyrightAbbr, ' ', $copyrightYear ,' – ', $i18n_all_rights_reserved)"/>
|
|
79
74
|
<xsl:if test="$copyrightAbbrIEEE != ''">
|
|
80
75
|
<xsl:value-of select="$linebreak"/>
|
|
81
|
-
<xsl:value-of select="concat('© ', $copyrightAbbrIEEE, ' ', $copyrightYear ,' – ', $
|
|
76
|
+
<xsl:value-of select="concat('© ', $copyrightAbbrIEEE, ' ', $copyrightYear ,' – ', $i18n_all_rights_reserved)"/>
|
|
82
77
|
</xsl:if>
|
|
83
78
|
</xsl:variable>
|
|
84
79
|
|
|
80
|
+
<xsl:variable name="copyrightTextLastPage2024">
|
|
81
|
+
<xsl:value-of select="concat('© ', $copyrightAbbr, ' ', $copyrightYear)"/>
|
|
82
|
+
<xsl:if test="$copyrightAbbrIEEE != ''">
|
|
83
|
+
<xsl:value-of select="$linebreak"/>
|
|
84
|
+
<xsl:value-of select="concat('© ', $copyrightAbbrIEEE, ' ', $copyrightYear)"/>
|
|
85
|
+
</xsl:if>
|
|
86
|
+
<xsl:value-of select="$linebreak"/>
|
|
87
|
+
<xsl:value-of select="$i18n_all_rights_reserved"/>
|
|
88
|
+
</xsl:variable>
|
|
89
|
+
|
|
85
90
|
<xsl:variable name="docidentifier_iso_with_lang" select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-with-lang']"/>
|
|
86
91
|
|
|
87
92
|
<xsl:variable name="lang-1st-letter_tmp" select="substring-before(substring-after($docidentifier_iso_with_lang, '('), ')')"/>
|
|
@@ -105,11 +110,19 @@
|
|
|
105
110
|
<xsl:choose>
|
|
106
111
|
<!-- year separator replace to '-' -->
|
|
107
112
|
<xsl:when test="$layoutVersion = '1951'">
|
|
108
|
-
<xsl:
|
|
113
|
+
<xsl:variable name="iso_reference_tmp_" select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp),':',' - ')"/>
|
|
114
|
+
<!-- insert space before ( -->
|
|
115
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp_),'\(',' \(')"/>
|
|
109
116
|
</xsl:when>
|
|
110
117
|
<xsl:when test="$layoutVersion = '1972'">
|
|
111
118
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp),':','-')"/>
|
|
112
119
|
</xsl:when>
|
|
120
|
+
<xsl:when test="$layoutVersion = '1987'">
|
|
121
|
+
<!-- insert space around : -->
|
|
122
|
+
<xsl:variable name="iso_reference_tmp_" select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp),':',' : ')"/>
|
|
123
|
+
<!-- insert space before ( -->
|
|
124
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($iso_reference_tmp_),'\(',' \(')"/>
|
|
125
|
+
</xsl:when>
|
|
113
126
|
<xsl:otherwise>
|
|
114
127
|
<xsl:value-of select="$iso_reference"/>
|
|
115
128
|
</xsl:otherwise>
|
|
@@ -253,6 +266,30 @@
|
|
|
253
266
|
|
|
254
267
|
<xsl:variable name="proof-text">PROOF/ÉPREUVE</xsl:variable>
|
|
255
268
|
|
|
269
|
+
<xsl:variable name="docnumber_with_prefix">
|
|
270
|
+
<xsl:if test="$doctype = 'recommendation'">R </xsl:if><xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docnumber"/>
|
|
271
|
+
</xsl:variable>
|
|
272
|
+
|
|
273
|
+
<xsl:variable name="ISO_title_en">INTERNATIONAL ORGANIZATION FOR STANDARDIZATION</xsl:variable>
|
|
274
|
+
<xsl:variable name="ISO_title_ru">МЕЖДУНАРОДНАЯ ОРГАНИЗАЦИЯ ПО СТАНДАРТИЗАЦИИ</xsl:variable>
|
|
275
|
+
<xsl:variable name="ISO_title_fr">ORGANISATION INTERNATIONALE DE NORMALISATION</xsl:variable>
|
|
276
|
+
|
|
277
|
+
<xsl:variable name="i18n_reference_number_abbrev"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">reference_number_abbrev</xsl:with-param></xsl:call-template></xsl:variable>
|
|
278
|
+
<xsl:variable name="i18n_reference_number"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">reference_number</xsl:with-param></xsl:call-template></xsl:variable>
|
|
279
|
+
<xsl:variable name="i18n_descriptors"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">Descriptor.pl</xsl:with-param></xsl:call-template></xsl:variable>
|
|
280
|
+
<xsl:variable name="i18n_voting_begins_on"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">voting_begins_on</xsl:with-param></xsl:call-template></xsl:variable>
|
|
281
|
+
<xsl:variable name="i18n_voting_terminates_on"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">voting_terminates_on</xsl:with-param></xsl:call-template></xsl:variable>
|
|
282
|
+
<xsl:variable name="i18n_price_based_on"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">price_based_on</xsl:with-param></xsl:call-template></xsl:variable>
|
|
283
|
+
<xsl:variable name="i18n_price"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">price</xsl:with-param></xsl:call-template></xsl:variable>
|
|
284
|
+
<xsl:variable name="i18n_date_first_printing"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">date_first_printing</xsl:with-param></xsl:call-template></xsl:variable>
|
|
285
|
+
<xsl:variable name="i18n_corrected_version"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">corrected_version</xsl:with-param></xsl:call-template></xsl:variable>
|
|
286
|
+
<xsl:variable name="i18n_fast_track_procedure"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">fast-track-procedure</xsl:with-param></xsl:call-template></xsl:variable>
|
|
287
|
+
<xsl:variable name="i18n_all_rights_reserved"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">all_rights_reserved</xsl:with-param></xsl:call-template></xsl:variable>
|
|
288
|
+
<xsl:variable name="i18n_locality_page"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">locality.page</xsl:with-param></xsl:call-template></xsl:variable>
|
|
289
|
+
<xsl:variable name="i18n_locality_part"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">locality.part</xsl:with-param></xsl:call-template></xsl:variable>
|
|
290
|
+
<xsl:variable name="i18n_secretariat"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">secretariat</xsl:with-param></xsl:call-template></xsl:variable>
|
|
291
|
+
<xsl:variable name="i18n_classification_UDC"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">classification-UDC</xsl:with-param></xsl:call-template></xsl:variable>
|
|
292
|
+
|
|
256
293
|
<!-- Example:
|
|
257
294
|
<item level="1" id="Foreword" display="true">Foreword</item>
|
|
258
295
|
<item id="term-script" display="false">3.2</item>
|
|
@@ -324,10 +361,7 @@
|
|
|
324
361
|
<xsl:variable name="secretariat_">
|
|
325
362
|
<xsl:variable name="value" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:editorialgroup/iso:secretariat)"/>
|
|
326
363
|
<xsl:if test="$value != ''">
|
|
327
|
-
<xsl:
|
|
328
|
-
<xsl:with-param name="key">secretariat</xsl:with-param>
|
|
329
|
-
</xsl:call-template>
|
|
330
|
-
<xsl:text>: </xsl:text>
|
|
364
|
+
<xsl:value-of select="concat($i18n_secretariat, ': ')"/>
|
|
331
365
|
<fo:inline font-weight="bold"><xsl:value-of select="$value"/></fo:inline>
|
|
332
366
|
</xsl:if>
|
|
333
367
|
</xsl:variable>
|
|
@@ -345,10 +379,7 @@
|
|
|
345
379
|
<xsl:variable name="classification_udc" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:classification[@type = 'UDC'])"/>
|
|
346
380
|
<xsl:choose>
|
|
347
381
|
<xsl:when test="$classification_udc != ''">
|
|
348
|
-
<xsl:
|
|
349
|
-
<xsl:with-param name="key">classification-UDC</xsl:with-param>
|
|
350
|
-
</xsl:call-template>
|
|
351
|
-
<xsl:text> </xsl:text>
|
|
382
|
+
<xsl:value-of select="concat($i18n_classification_UDC, ' ')"/>
|
|
352
383
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($classification_udc),'(:)',' $1 ')"/>
|
|
353
384
|
</xsl:when>
|
|
354
385
|
<xsl:otherwise> </xsl:otherwise>
|
|
@@ -380,14 +411,21 @@
|
|
|
380
411
|
|
|
381
412
|
<xsl:variable name="root-style">
|
|
382
413
|
<root-style xsl:use-attribute-sets="root-style">
|
|
414
|
+
|
|
415
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
416
|
+
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
417
|
+
</xsl:if>
|
|
418
|
+
|
|
383
419
|
<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
384
420
|
<xsl:attribute name="font-family">Arial, Times New Roman, Cambria Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
|
|
385
421
|
<xsl:attribute name="font-family-generic">Sans</xsl:attribute>
|
|
386
422
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
387
423
|
</xsl:if>
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
424
|
+
|
|
425
|
+
<xsl:if test="$layoutVersion = '1987' and $doctype = 'technical-report'">
|
|
426
|
+
<xsl:attribute name="font-size">8.5pt</xsl:attribute>
|
|
427
|
+
</xsl:if>
|
|
428
|
+
|
|
391
429
|
<!-- <xsl:if test="$lang = 'zh'">
|
|
392
430
|
<xsl:attribute name="font-family">Source Han Sans, Times New Roman, Cambria Math</xsl:attribute>
|
|
393
431
|
</xsl:if> -->
|
|
@@ -420,8 +458,8 @@
|
|
|
420
458
|
<xsl:variable name="marginRight_cover_page_1987">37</xsl:variable>
|
|
421
459
|
<xsl:variable name="marginTopBottom_cover_page_1987">20</xsl:variable>
|
|
422
460
|
|
|
423
|
-
<xsl:variable name="marginLeftRight_cover_page_2024">
|
|
424
|
-
<xsl:variable name="marginTopBottom_cover_page_2024">
|
|
461
|
+
<xsl:variable name="marginLeftRight_cover_page_2024">9.9</xsl:variable>
|
|
462
|
+
<xsl:variable name="marginTopBottom_cover_page_2024">9.9</xsl:variable>
|
|
425
463
|
|
|
426
464
|
<!-- cover page -->
|
|
427
465
|
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
@@ -582,7 +620,11 @@
|
|
|
582
620
|
<!-- first page -->
|
|
583
621
|
<fo:simple-page-master master-name="first-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
584
622
|
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
|
|
585
|
-
<fo:region-before region-name="header-first" extent="{$marginTop}mm"
|
|
623
|
+
<fo:region-before region-name="header-first" extent="{$marginTop}mm">
|
|
624
|
+
<xsl:if test="$layoutVersion = '1987' and $doctype = 'technical-report'">
|
|
625
|
+
<xsl:attribute name="region-name">header-odd</xsl:attribute>
|
|
626
|
+
</xsl:if>
|
|
627
|
+
</fo:region-before>
|
|
586
628
|
<fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
|
|
587
629
|
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
588
630
|
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
@@ -590,11 +632,16 @@
|
|
|
590
632
|
<!-- odd pages -->
|
|
591
633
|
<fo:simple-page-master master-name="odd-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
592
634
|
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
|
|
593
|
-
<fo:region-before region-name="header-odd" extent="{$marginTop}mm"
|
|
635
|
+
<fo:region-before region-name="header-odd" extent="{$marginTop}mm">
|
|
636
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
637
|
+
<xsl:attribute name="precedence">true</xsl:attribute>
|
|
638
|
+
</xsl:if>
|
|
639
|
+
</fo:region-before>
|
|
594
640
|
<fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
|
|
595
641
|
<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
|
|
596
642
|
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
597
643
|
</fo:simple-page-master>
|
|
644
|
+
|
|
598
645
|
<fo:simple-page-master master-name="odd-publishedISO-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
599
646
|
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
|
|
600
647
|
<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> <!-- display-align="center" -->
|
|
@@ -605,11 +652,25 @@
|
|
|
605
652
|
<!-- even pages -->
|
|
606
653
|
<fo:simple-page-master master-name="even-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
607
654
|
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
|
|
608
|
-
<fo:region-before region-name="header-even" extent="{$marginTop}mm"
|
|
655
|
+
<fo:region-before region-name="header-even" extent="{$marginTop}mm">
|
|
656
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
657
|
+
<xsl:attribute name="precedence">true</xsl:attribute>
|
|
658
|
+
</xsl:if>
|
|
659
|
+
</fo:region-before>
|
|
609
660
|
<fo:region-after region-name="footer-even" extent="{$marginBottom - 2}mm"/>
|
|
610
661
|
<fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
|
|
611
662
|
<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
|
|
612
663
|
</fo:simple-page-master>
|
|
664
|
+
|
|
665
|
+
<!-- for 1951 layout only -->
|
|
666
|
+
<fo:simple-page-master master-name="even-last-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
667
|
+
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
|
|
668
|
+
<fo:region-before region-name="header-even" extent="{$marginTop}mm" precedence="true"/>
|
|
669
|
+
<fo:region-after region-name="footer-even-last" extent="{$marginBottom - 2}mm"/>
|
|
670
|
+
<fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
|
|
671
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
|
|
672
|
+
</fo:simple-page-master>
|
|
673
|
+
|
|
613
674
|
<fo:simple-page-master master-name="even-publishedISO-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
|
|
614
675
|
<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
|
|
615
676
|
<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
|
|
@@ -632,23 +693,48 @@
|
|
|
632
693
|
</fo:repeatable-page-master-alternatives>
|
|
633
694
|
</fo:page-sequence-master>
|
|
634
695
|
|
|
696
|
+
<!-- First pages for Technical Report (layout 1987) -->
|
|
697
|
+
<fo:simple-page-master master-name="first-preface_1987_TR" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
698
|
+
<fo:region-body margin-top="13mm" margin-bottom="30mm" margin-left="19mm" margin-right="{$marginLeftRight2}mm"/>
|
|
699
|
+
<fo:region-before region-name="header-empty" extent="13mm"/>
|
|
700
|
+
<fo:region-after region-name="footer-preface-first_1987_TR" extent="30mm" display-align="after"/>
|
|
701
|
+
<fo:region-start region-name="left-region-first_1987_TR" extent="19mm"/>
|
|
702
|
+
<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
|
|
703
|
+
</fo:simple-page-master>
|
|
704
|
+
<fo:page-sequence-master master-name="preface-1987_TR">
|
|
705
|
+
<fo:repeatable-page-master-alternatives>
|
|
706
|
+
<fo:conditional-page-master-reference master-reference="first-preface_1987_TR" page-position="first"/>
|
|
707
|
+
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
|
|
708
|
+
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
|
|
709
|
+
</fo:repeatable-page-master-alternatives>
|
|
710
|
+
</fo:page-sequence-master>
|
|
711
|
+
|
|
635
712
|
<fo:page-sequence-master master-name="document-publishedISO">
|
|
636
713
|
<fo:repeatable-page-master-alternatives>
|
|
637
|
-
<
|
|
714
|
+
<xsl:if test="not($layoutVersion = '1951')">
|
|
715
|
+
<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
|
|
716
|
+
</xsl:if>
|
|
717
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
718
|
+
<fo:conditional-page-master-reference page-position="last" master-reference="even-last-publishedISO"/> <!-- odd-or-even="even" -->
|
|
719
|
+
</xsl:if>
|
|
638
720
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
|
|
639
721
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
|
|
640
722
|
</fo:repeatable-page-master-alternatives>
|
|
641
723
|
</fo:page-sequence-master>
|
|
642
724
|
<fo:page-sequence-master master-name="document-publishedISO-portrait">
|
|
643
725
|
<fo:repeatable-page-master-alternatives>
|
|
644
|
-
<
|
|
726
|
+
<xsl:if test="not($layoutVersion = '1951')">
|
|
727
|
+
<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
|
|
728
|
+
</xsl:if>
|
|
645
729
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
|
|
646
730
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
|
|
647
731
|
</fo:repeatable-page-master-alternatives>
|
|
648
732
|
</fo:page-sequence-master>
|
|
649
733
|
<fo:page-sequence-master master-name="document-publishedISO-landscape">
|
|
650
734
|
<fo:repeatable-page-master-alternatives>
|
|
651
|
-
<
|
|
735
|
+
<xsl:if test="not($layoutVersion = '1951')">
|
|
736
|
+
<fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
|
|
737
|
+
</xsl:if>
|
|
652
738
|
<fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO-landscape"/>
|
|
653
739
|
<fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO-landscape"/>
|
|
654
740
|
</fo:repeatable-page-master-alternatives>
|
|
@@ -726,10 +812,7 @@
|
|
|
726
812
|
<xsl:value-of select="$udc"/>
|
|
727
813
|
<fo:inline keep-together.within-line="always" role="SKIP">
|
|
728
814
|
<fo:leader leader-pattern="space"/>
|
|
729
|
-
<fo:inline font-weight="normal"
|
|
730
|
-
<xsl:call-template name="getLocalizedString">
|
|
731
|
-
<xsl:with-param name="key">reference_number</xsl:with-param>
|
|
732
|
-
</xsl:call-template><xsl:text>:</xsl:text></fo:inline><xsl:value-of select="$ISOnumber"/>
|
|
815
|
+
<fo:inline font-weight="normal"><xsl:value-of select="concat($i18n_reference_number_abbrev, ': ')"/></fo:inline><xsl:value-of select="$ISOnumber"/>
|
|
733
816
|
</fo:inline>
|
|
734
817
|
</fo:block>
|
|
735
818
|
</fo:block-container>
|
|
@@ -762,8 +845,7 @@
|
|
|
762
845
|
</xsl:call-template>
|
|
763
846
|
</fo:block>
|
|
764
847
|
<fo:block font-size="24pt" margin-top="5mm">
|
|
765
|
-
<xsl:
|
|
766
|
-
<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docnumber"/>
|
|
848
|
+
<xsl:value-of select="$docnumber_with_prefix"/>
|
|
767
849
|
</fo:block>
|
|
768
850
|
|
|
769
851
|
<fo:block font-size="11pt" margin-top="12mm">
|
|
@@ -798,23 +880,14 @@
|
|
|
798
880
|
<xsl:value-of select="$udc"/>
|
|
799
881
|
<fo:leader leader-pattern="space"/>
|
|
800
882
|
<fo:inline role="SKIP">
|
|
801
|
-
<xsl:
|
|
802
|
-
<xsl:with-param name="key">reference_number</xsl:with-param>
|
|
803
|
-
</xsl:call-template>
|
|
804
|
-
<xsl:text> </xsl:text>
|
|
805
|
-
<xsl:value-of select="$ISOnumber"/>
|
|
883
|
+
<xsl:value-of select="concat($i18n_reference_number, ' ', $ISOnumber)"/>
|
|
806
884
|
</fo:inline>
|
|
807
885
|
</fo:inline>
|
|
808
886
|
</fo:block>
|
|
809
887
|
|
|
810
888
|
<xsl:if test="/iso:iso-standard/iso:bibdata/iso:keyword">
|
|
811
889
|
<fo:block margin-top="10pt">
|
|
812
|
-
<
|
|
813
|
-
<xsl:call-template name="getLocalizedString">
|
|
814
|
-
<xsl:with-param name="key">Descriptor.pl</xsl:with-param>
|
|
815
|
-
</xsl:call-template>
|
|
816
|
-
</xsl:variable>
|
|
817
|
-
<fo:inline font-weight="bold"><xsl:value-of select="$title-descriptors"/> : </fo:inline>
|
|
890
|
+
<fo:inline font-weight="bold"><xsl:value-of select="$i18n_descriptors"/> : </fo:inline>
|
|
818
891
|
<xsl:call-template name="insertKeywords">
|
|
819
892
|
<xsl:with-param name="sorting">no</xsl:with-param>
|
|
820
893
|
<xsl:with-param name="charDelim" select="', '"/>
|
|
@@ -883,7 +956,7 @@
|
|
|
883
956
|
</fo:table-row>
|
|
884
957
|
<fo:table-row border-top="2pt solid black" height="4.5mm" display-align="center">
|
|
885
958
|
<fo:table-cell number-columns-spanned="3" font-size="5.6pt" text-align-last="justify">
|
|
886
|
-
<fo:block
|
|
959
|
+
<fo:block><xsl:value-of select="$ISO_title_en"/>●<xsl:value-of select="$ISO_title_ru"/>●<xsl:value-of select="$ISO_title_fr"/></fo:block>
|
|
887
960
|
</fo:table-cell>
|
|
888
961
|
</fo:table-row>
|
|
889
962
|
</fo:table-body>
|
|
@@ -912,7 +985,7 @@
|
|
|
912
985
|
</fo:flow>
|
|
913
986
|
</fo:page-sequence>
|
|
914
987
|
</xsl:when> <!-- END: $layoutVersion = '1972' -->
|
|
915
|
-
|
|
988
|
+
<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"><!-- see preface pages below --></xsl:when>
|
|
916
989
|
<xsl:when test="$layoutVersion = '1987'">
|
|
917
990
|
<fo:page-sequence master-reference="cover-page_1987" force-page-count="no-force">
|
|
918
991
|
<fo:static-content flow-name="right-region">
|
|
@@ -934,9 +1007,7 @@
|
|
|
934
1007
|
<fo:block-container margin-left="3mm">
|
|
935
1008
|
<fo:block-container margin-left="0" font-family="Times New Roman">
|
|
936
1009
|
<fo:block font-size="8pt" font-family="Times New Roman" margin-bottom="-0.5mm">
|
|
937
|
-
<xsl:
|
|
938
|
-
<xsl:with-param name="key">reference_number</xsl:with-param>
|
|
939
|
-
</xsl:call-template>
|
|
1010
|
+
<xsl:value-of select="$i18n_reference_number"/>
|
|
940
1011
|
<xsl:value-of select="$linebreak"/>
|
|
941
1012
|
<xsl:value-of select="$ISOnumber"/>
|
|
942
1013
|
</fo:block>
|
|
@@ -967,9 +1038,9 @@
|
|
|
967
1038
|
</fo:block>
|
|
968
1039
|
</fo:table-cell>
|
|
969
1040
|
<fo:table-cell font-size="7.5pt" border-top="0.5pt solid black" border-bottom="0.5pt solid black" text-align-last="justify" display-align="center" line-height="1.6" padding-left="32mm">
|
|
970
|
-
<fo:block
|
|
971
|
-
<fo:block
|
|
972
|
-
<fo:block
|
|
1041
|
+
<fo:block><xsl:value-of select="$ISO_title_en"/></fo:block>
|
|
1042
|
+
<fo:block><xsl:value-of select="$ISO_title_fr"/></fo:block>
|
|
1043
|
+
<fo:block><xsl:value-of select="$ISO_title_ru"/></fo:block>
|
|
973
1044
|
</fo:table-cell>
|
|
974
1045
|
</fo:table-row>
|
|
975
1046
|
</fo:table-body>
|
|
@@ -1001,10 +1072,10 @@
|
|
|
1001
1072
|
<fo:flow flow-name="xsl-region-body">
|
|
1002
1073
|
<fo:table table-layout="fixed" width="100%">
|
|
1003
1074
|
<xsl:call-template name="insertInterFont"/>
|
|
1004
|
-
<fo:table-column column-width="proportional-column-width(
|
|
1005
|
-
<fo:table-column column-width="proportional-column-width(
|
|
1006
|
-
<fo:table-column column-width="proportional-column-width(
|
|
1007
|
-
<fo:table-column column-width="proportional-column-width(
|
|
1075
|
+
<fo:table-column column-width="proportional-column-width(113.8)"/>
|
|
1076
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
|
1077
|
+
<fo:table-column column-width="proportional-column-width(2)"/>
|
|
1078
|
+
<fo:table-column column-width="proportional-column-width(72.2)"/>
|
|
1008
1079
|
<fo:table-body>
|
|
1009
1080
|
|
|
1010
1081
|
<fo:table-row>
|
|
@@ -1016,8 +1087,8 @@
|
|
|
1016
1087
|
<!-- International
|
|
1017
1088
|
Standard -->
|
|
1018
1089
|
<fo:table-cell number-columns-spanned="2" padding-left="6mm">
|
|
1019
|
-
<fo:block-container height="
|
|
1020
|
-
<fo:block font-size="
|
|
1090
|
+
<fo:block-container height="46mm">
|
|
1091
|
+
<fo:block font-size="20pt" font-weight="bold" line-height="1.25" margin-top="3mm">
|
|
1021
1092
|
|
|
1022
1093
|
<xsl:variable name="updates-document-type" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:updates-document-type"/>
|
|
1023
1094
|
<xsl:variable name="updates-document-type_localized">
|
|
@@ -1078,13 +1149,13 @@
|
|
|
1078
1149
|
</fo:table-cell>
|
|
1079
1150
|
</fo:table-row>
|
|
1080
1151
|
|
|
1081
|
-
<fo:table-row height="
|
|
1152
|
+
<fo:table-row height="46mm">
|
|
1082
1153
|
<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}">
|
|
1083
1154
|
<fo:block>
|
|
1084
1155
|
</fo:block>
|
|
1085
1156
|
</fo:table-cell>
|
|
1086
1157
|
<fo:table-cell number-columns-spanned="2" display-align="after" padding-left="6mm">
|
|
1087
|
-
<fo:block font-size="
|
|
1158
|
+
<fo:block font-size="19pt" font-weight="bold" line-height="1">
|
|
1088
1159
|
<xsl:if test="$stage >=60">
|
|
1089
1160
|
<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
|
|
1090
1161
|
</xsl:if>
|
|
@@ -1098,16 +1169,16 @@
|
|
|
1098
1169
|
<fo:table-cell number-columns-spanned="2"><fo:block> </fo:block></fo:table-cell>
|
|
1099
1170
|
<fo:table-cell border-bottom="{$cover_page_border}"><fo:block> </fo:block></fo:table-cell>
|
|
1100
1171
|
</fo:table-row>
|
|
1101
|
-
<fo:table-row height="
|
|
1172
|
+
<fo:table-row height="1.4mm" font-size="0pt">
|
|
1102
1173
|
<fo:table-cell number-columns-spanned="4"><fo:block> </fo:block></fo:table-cell>
|
|
1103
1174
|
</fo:table-row>
|
|
1104
1175
|
|
|
1105
1176
|
<fo:table-row>
|
|
1106
1177
|
<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}" padding-right="4mm">
|
|
1107
1178
|
|
|
1108
|
-
<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="
|
|
1179
|
+
<fo:block-container font-family="Cambria" line-height="1.1" role="SKIP" height="110mm">
|
|
1109
1180
|
<fo:block margin-right="3.5mm" role="SKIP">
|
|
1110
|
-
<fo:block font-size="18pt" font-weight="bold" margin-top="
|
|
1181
|
+
<fo:block font-size="18pt" font-weight="bold" margin-top="2.5mm" role="H1">
|
|
1111
1182
|
<xsl:call-template name="insertTitlesLangMain"/>
|
|
1112
1183
|
</fo:block>
|
|
1113
1184
|
|
|
@@ -1134,21 +1205,21 @@
|
|
|
1134
1205
|
</fo:block-container>
|
|
1135
1206
|
</fo:table-cell>
|
|
1136
1207
|
<fo:table-cell number-columns-spanned="2" padding-left="6mm">
|
|
1137
|
-
<fo:block margin-top="
|
|
1208
|
+
<fo:block margin-top="2.5mm" line-height="1.1">
|
|
1138
1209
|
|
|
1139
1210
|
<xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM')">
|
|
1140
1211
|
<xsl:variable name="edition_and_date">
|
|
1141
1212
|
<xsl:call-template name="insertEditionAndDate"/>
|
|
1142
1213
|
</xsl:variable>
|
|
1143
1214
|
<xsl:if test="normalize-space($edition_and_date) != ''">
|
|
1144
|
-
<fo:block font-size="
|
|
1215
|
+
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
|
|
1145
1216
|
<xsl:value-of select="$edition_and_date"/>
|
|
1146
1217
|
</fo:block>
|
|
1147
1218
|
</xsl:if>
|
|
1148
1219
|
</xsl:if>
|
|
1149
1220
|
|
|
1150
1221
|
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM')">
|
|
1151
|
-
<fo:block font-size="
|
|
1222
|
+
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
|
|
1152
1223
|
<xsl:value-of select="$doctype_uppercased"/>
|
|
1153
1224
|
<xsl:text> </xsl:text>
|
|
1154
1225
|
<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
|
|
@@ -1160,7 +1231,7 @@
|
|
|
1160
1231
|
|
|
1161
1232
|
<xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM')">
|
|
1162
1233
|
<xsl:if test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']">
|
|
1163
|
-
<fo:block font-size="
|
|
1234
|
+
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
|
|
1164
1235
|
<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']"/>
|
|
1165
1236
|
</fo:block>
|
|
1166
1237
|
</xsl:if>
|
|
@@ -1168,10 +1239,8 @@
|
|
|
1168
1239
|
|
|
1169
1240
|
<xsl:variable name="date_corrected" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:date[@type = 'corrected'])"/>
|
|
1170
1241
|
<xsl:if test="$date_corrected != ''">
|
|
1171
|
-
<fo:block font-size="
|
|
1172
|
-
<xsl:
|
|
1173
|
-
<xsl:with-param name="key">corrected_version</xsl:with-param>
|
|
1174
|
-
</xsl:call-template>
|
|
1242
|
+
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
|
|
1243
|
+
<xsl:value-of select="$i18n_corrected_version"/>
|
|
1175
1244
|
<xsl:value-of select="$linebreak"/>
|
|
1176
1245
|
<xsl:value-of select="$date_corrected"/>
|
|
1177
1246
|
</fo:block>
|
|
@@ -1194,9 +1263,7 @@
|
|
|
1194
1263
|
|
|
1195
1264
|
<fo:block margin-bottom="3mm">
|
|
1196
1265
|
<!-- Voting begins on: -->
|
|
1197
|
-
<xsl:
|
|
1198
|
-
<xsl:with-param name="key">voting_begins_on</xsl:with-param>
|
|
1199
|
-
</xsl:call-template><xsl:text>:</xsl:text>
|
|
1266
|
+
<xsl:value-of select="concat($i18n_voting_begins_on, ':')"/>
|
|
1200
1267
|
<fo:block font-weight="bold">
|
|
1201
1268
|
<xsl:call-template name="insertVoteStarted"/>
|
|
1202
1269
|
</fo:block>
|
|
@@ -1204,10 +1271,7 @@
|
|
|
1204
1271
|
|
|
1205
1272
|
<fo:block margin-bottom="3mm">
|
|
1206
1273
|
<!-- Voting terminates on: -->
|
|
1207
|
-
<xsl:
|
|
1208
|
-
<xsl:with-param name="key">voting_terminates_on</xsl:with-param>
|
|
1209
|
-
</xsl:call-template><xsl:text>:</xsl:text>
|
|
1210
|
-
|
|
1274
|
+
<xsl:value-of select="concat($i18n_voting_terminates_on, ':')"/>
|
|
1211
1275
|
<fo:block font-weight="bold">
|
|
1212
1276
|
<xsl:call-template name="insertVoteEnded"/>
|
|
1213
1277
|
</fo:block>
|
|
@@ -1263,7 +1327,7 @@
|
|
|
1263
1327
|
</fo:block>
|
|
1264
1328
|
</fo:table-cell>
|
|
1265
1329
|
<fo:table-cell padding="4mm">
|
|
1266
|
-
<fo:block color="black" font-size="7.
|
|
1330
|
+
<fo:block color="black" font-size="7.5pt" line-height="1.35">
|
|
1267
1331
|
<xsl:text>Please share your feedback about the standard. Scan the QR code with your phone or click the link</xsl:text>
|
|
1268
1332
|
<fo:block margin-top="2pt">
|
|
1269
1333
|
<fo:basic-link external-destination="{$feedback_link}" fox:alt-text="{$feedback_link}">
|
|
@@ -1288,19 +1352,17 @@
|
|
|
1288
1352
|
</fo:table-cell>
|
|
1289
1353
|
</fo:table-row>
|
|
1290
1354
|
|
|
1291
|
-
<fo:table-row height="
|
|
1292
|
-
<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}" display-align="after" padding-bottom="-1mm"
|
|
1293
|
-
<fo:block font-size="
|
|
1294
|
-
<xsl:
|
|
1295
|
-
<xsl:with-param name="key">reference_number</xsl:with-param>
|
|
1296
|
-
</xsl:call-template>
|
|
1355
|
+
<fo:table-row height="13mm">
|
|
1356
|
+
<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}" display-align="after" padding-bottom="-1mm" line-height="1.1">>
|
|
1357
|
+
<fo:block font-size="10pt">
|
|
1358
|
+
<xsl:value-of select="$i18n_reference_number"/>
|
|
1297
1359
|
</fo:block>
|
|
1298
|
-
<fo:block font-size="
|
|
1360
|
+
<fo:block font-size="10pt">
|
|
1299
1361
|
<xsl:value-of select="$ISOnumber"/>
|
|
1300
1362
|
</fo:block>
|
|
1301
1363
|
</fo:table-cell>
|
|
1302
1364
|
<fo:table-cell number-columns-spanned="2" padding-left="6mm" display-align="after" padding-bottom="-1mm">
|
|
1303
|
-
<fo:block font-size="
|
|
1365
|
+
<fo:block font-size="10pt" line-height="1.1">
|
|
1304
1366
|
<xsl:value-of select="concat('© ', $copyrightAbbr, ' ', $copyrightYear)"/>
|
|
1305
1367
|
<xsl:if test="$copyrightAbbrIEEE != ''">
|
|
1306
1368
|
<xsl:value-of select="$linebreak"/>
|
|
@@ -1423,9 +1485,7 @@
|
|
|
1423
1485
|
<fo:block text-align="right" role="SKIP">
|
|
1424
1486
|
<!-- Reference number -->
|
|
1425
1487
|
<fo:block>
|
|
1426
|
-
<xsl:
|
|
1427
|
-
<xsl:with-param name="key">reference_number</xsl:with-param>
|
|
1428
|
-
</xsl:call-template>
|
|
1488
|
+
<xsl:value-of select="$i18n_reference_number"/>
|
|
1429
1489
|
</fo:block>
|
|
1430
1490
|
<fo:block>
|
|
1431
1491
|
<xsl:value-of select="$ISOnumber"/>
|
|
@@ -1492,17 +1552,13 @@
|
|
|
1492
1552
|
<fo:table-cell>
|
|
1493
1553
|
<fo:block>
|
|
1494
1554
|
<!-- Voting begins on: -->
|
|
1495
|
-
<xsl:
|
|
1496
|
-
<xsl:with-param name="key">voting_begins_on</xsl:with-param>
|
|
1497
|
-
</xsl:call-template><xsl:text>:</xsl:text>
|
|
1555
|
+
<xsl:value-of select="concat($i18n_voting_begins_on, ':')"/>
|
|
1498
1556
|
</fo:block>
|
|
1499
1557
|
</fo:table-cell>
|
|
1500
1558
|
<fo:table-cell>
|
|
1501
1559
|
<fo:block>
|
|
1502
1560
|
<!-- Voting terminates on: -->
|
|
1503
|
-
<xsl:
|
|
1504
|
-
<xsl:with-param name="key">voting_terminates_on</xsl:with-param>
|
|
1505
|
-
</xsl:call-template><xsl:text>:</xsl:text>
|
|
1561
|
+
<xsl:value-of select="concat($i18n_voting_terminates_on, ':')"/>
|
|
1506
1562
|
</fo:block>
|
|
1507
1563
|
</fo:table-cell>
|
|
1508
1564
|
</fo:table-row>
|
|
@@ -1659,9 +1715,7 @@
|
|
|
1659
1715
|
<fo:block text-align="right" font-size="9.5pt">
|
|
1660
1716
|
<xsl:value-of select="$linebreak"/>
|
|
1661
1717
|
<xsl:value-of select="$linebreak"/>
|
|
1662
|
-
<xsl:
|
|
1663
|
-
<xsl:with-param name="key">corrected_version</xsl:with-param>
|
|
1664
|
-
</xsl:call-template>
|
|
1718
|
+
<xsl:value-of select="$i18n_corrected_version"/>
|
|
1665
1719
|
<xsl:value-of select="$linebreak"/>
|
|
1666
1720
|
<xsl:value-of select="$date_corrected"/>
|
|
1667
1721
|
</fo:block>
|
|
@@ -1714,9 +1768,7 @@
|
|
|
1714
1768
|
<fo:block margin-bottom="6pt"><xsl:copy-of select="$secretariat"/></fo:block>
|
|
1715
1769
|
<fo:block margin-bottom="6pt">
|
|
1716
1770
|
<!-- Voting begins on: -->
|
|
1717
|
-
<xsl:
|
|
1718
|
-
<xsl:with-param name="key">voting_begins_on</xsl:with-param>
|
|
1719
|
-
</xsl:call-template><xsl:text>:</xsl:text>
|
|
1771
|
+
<xsl:value-of select="concat($i18n_voting_begins_on, ':')"/>
|
|
1720
1772
|
<xsl:value-of select="$linebreak"/>
|
|
1721
1773
|
<fo:inline font-weight="bold">
|
|
1722
1774
|
<xsl:call-template name="insertVoteStarted"/>
|
|
@@ -1724,9 +1776,7 @@
|
|
|
1724
1776
|
</fo:block>
|
|
1725
1777
|
<fo:block>
|
|
1726
1778
|
<!-- Voting terminates on: -->
|
|
1727
|
-
<xsl:
|
|
1728
|
-
<xsl:with-param name="key">voting_terminates_on</xsl:with-param>
|
|
1729
|
-
</xsl:call-template><xsl:text>:</xsl:text>
|
|
1779
|
+
<xsl:value-of select="concat($i18n_voting_terminates_on, ':')"/>
|
|
1730
1780
|
<xsl:value-of select="$linebreak"/>
|
|
1731
1781
|
<fo:inline font-weight="bold">
|
|
1732
1782
|
<xsl:call-template name="insertVoteEnded"/>
|
|
@@ -1817,9 +1867,7 @@
|
|
|
1817
1867
|
<fo:table-cell display-align="center" role="SKIP">
|
|
1818
1868
|
<fo:block text-align="right" role="SKIP">
|
|
1819
1869
|
<fo:block>
|
|
1820
|
-
<xsl:
|
|
1821
|
-
<xsl:with-param name="key">reference_number</xsl:with-param>
|
|
1822
|
-
</xsl:call-template>
|
|
1870
|
+
<xsl:value-of select="$i18n_reference_number"/>
|
|
1823
1871
|
</fo:block>
|
|
1824
1872
|
<fo:block><xsl:value-of select="$ISOnumber"/></fo:block>
|
|
1825
1873
|
<fo:block role="SKIP"> </fo:block>
|
|
@@ -1997,33 +2045,210 @@
|
|
|
1997
2045
|
</xsl:otherwise>
|
|
1998
2046
|
</xsl:choose>
|
|
1999
2047
|
|
|
2048
|
+
<xsl:if test="$debug = 'true'"><xsl:message>START updated_xml_step1</xsl:message></xsl:if>
|
|
2049
|
+
<xsl:variable name="startTime1" select="java:getTime(java:java.util.Date.new())"/>
|
|
2050
|
+
|
|
2000
2051
|
<!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
|
|
2001
2052
|
<xsl:variable name="updated_xml_step1">
|
|
2002
2053
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
2003
2054
|
</xsl:variable>
|
|
2004
|
-
|
|
2055
|
+
|
|
2056
|
+
<!-- DEBUG -->
|
|
2057
|
+
<!-- <redirect:write file="updated_xml_step1_{java:getTime(java:java.util.Date.new())}.xml">
|
|
2058
|
+
<xsl:copy-of select="$updated_xml_step1"/>
|
|
2059
|
+
</redirect:write> -->
|
|
2060
|
+
|
|
2061
|
+
<xsl:variable name="endTime1" select="java:getTime(java:java.util.Date.new())"/>
|
|
2062
|
+
<xsl:if test="$debug = 'true'">
|
|
2063
|
+
<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime1 - $startTime1"/> msec.</xsl:message>
|
|
2064
|
+
<xsl:message>END updated_xml_step1</xsl:message>
|
|
2065
|
+
</xsl:if>
|
|
2066
|
+
|
|
2067
|
+
<xsl:if test="$debug = 'true'"><xsl:message>START updated_xml_step2</xsl:message></xsl:if>
|
|
2068
|
+
<xsl:variable name="startTime2" select="java:getTime(java:java.util.Date.new())"/>
|
|
2005
2069
|
|
|
2006
2070
|
<!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...' -->
|
|
2007
2071
|
<xsl:variable name="updated_xml_step2">
|
|
2008
2072
|
<xsl:apply-templates select="xalan:nodeset($updated_xml_step1)" mode="update_xml_step2"/>
|
|
2009
2073
|
</xsl:variable>
|
|
2074
|
+
|
|
2075
|
+
<xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
|
|
2076
|
+
<xsl:if test="$debug = 'true'">
|
|
2077
|
+
<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime2 - $startTime2"/> msec.</xsl:message>
|
|
2078
|
+
<xsl:message>END updated_xml_step2</xsl:message>
|
|
2079
|
+
</xsl:if>
|
|
2010
2080
|
<!-- DEBUG: updated_xml_step2=<xsl:copy-of select="$updated_xml_step2"/> -->
|
|
2011
2081
|
|
|
2082
|
+
<xsl:if test="$debug = 'true'"><xsl:message>START updated_xml_step3</xsl:message></xsl:if>
|
|
2083
|
+
<xsl:variable name="startTime3" select="java:getTime(java:java.util.Date.new())"/>
|
|
2084
|
+
|
|
2012
2085
|
<xsl:variable name="updated_xml_step3">
|
|
2013
2086
|
<xsl:apply-templates select="xalan:nodeset($updated_xml_step2)" mode="update_xml_enclose_keep-together_within-line"/>
|
|
2014
2087
|
</xsl:variable>
|
|
2088
|
+
|
|
2089
|
+
<xsl:variable name="endTime3" select="java:getTime(java:java.util.Date.new())"/>
|
|
2090
|
+
<xsl:if test="$debug = 'true'">
|
|
2091
|
+
<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime3 - $startTime3"/> msec.</xsl:message>
|
|
2092
|
+
<xsl:message>END updated_xml_step3</xsl:message>
|
|
2093
|
+
</xsl:if>
|
|
2015
2094
|
<!-- DEBUG: updated_xml_step3=<xsl:copy-of select="$updated_xml_step3"/> -->
|
|
2016
2095
|
|
|
2017
2096
|
<xsl:for-each select="xalan:nodeset($updated_xml_step3)">
|
|
2018
2097
|
|
|
2019
2098
|
<xsl:choose>
|
|
2020
|
-
<xsl:when test="$layoutVersion = '1951'"
|
|
2099
|
+
<xsl:when test="$layoutVersion = '1951'">
|
|
2100
|
+
<fo:page-sequence master-reference="document{$document-master-reference}" initial-page-number="auto" force-page-count="no-force">
|
|
2101
|
+
<fo:static-content flow-name="xsl-footnote-separator">
|
|
2102
|
+
<fo:block>
|
|
2103
|
+
<fo:leader leader-pattern="rule" leader-length="30%"/>
|
|
2104
|
+
</fo:block>
|
|
2105
|
+
</fo:static-content>
|
|
2106
|
+
<xsl:call-template name="insertHeaderFooter">
|
|
2107
|
+
<xsl:with-param name="is_header">false</xsl:with-param>
|
|
2108
|
+
<xsl:with-param name="insert_footer_last">false</xsl:with-param>
|
|
2109
|
+
</xsl:call-template>
|
|
2110
|
+
<fo:flow flow-name="xsl-region-body">
|
|
2111
|
+
<fo:block>
|
|
2112
|
+
<!-- <xsl:call-template name="processPrefaceSectionsDefault"/> -->
|
|
2113
|
+
<!-- Introduction will be showed in the main section -->
|
|
2114
|
+
<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or local-name() = 'introduction')]">
|
|
2115
|
+
<xsl:sort select="@displayorder" data-type="number"/>
|
|
2116
|
+
<xsl:apply-templates select="."/>
|
|
2117
|
+
</xsl:for-each>
|
|
2118
|
+
|
|
2119
|
+
<fo:block span="all" text-align="center" margin-top="15mm" keep-with-next="always" role="SKIP">
|
|
2120
|
+
<fo:leader leader-pattern="rule" leader-length="22mm"/>
|
|
2121
|
+
</fo:block>
|
|
2122
|
+
|
|
2123
|
+
</fo:block>
|
|
2124
|
+
</fo:flow>
|
|
2125
|
+
</fo:page-sequence>
|
|
2126
|
+
</xsl:when><!-- END: preface sections (Foreword, Brief history for layout 1951 ($layoutVersion = '1951') -->
|
|
2127
|
+
|
|
2128
|
+
<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'">
|
|
2129
|
+
<fo:page-sequence master-reference="preface-1987_TR" format="i" force-page-count="no-force">
|
|
2130
|
+
|
|
2131
|
+
<xsl:call-template name="insertHeaderFooter">
|
|
2132
|
+
<xsl:with-param name="font-weight">normal</xsl:with-param>
|
|
2133
|
+
<xsl:with-param name="is_footer">false</xsl:with-param>
|
|
2134
|
+
</xsl:call-template>
|
|
2135
|
+
|
|
2136
|
+
<fo:static-content flow-name="left-region-first_1987_TR" role="artifact">
|
|
2137
|
+
<fo:block-container reference-orientation="90">
|
|
2138
|
+
<fo:block font-size="8pt" margin-left="5mm" margin-top="8mm">
|
|
2139
|
+
<xsl:value-of select="$ISOnumber"/>
|
|
2140
|
+
</fo:block>
|
|
2141
|
+
</fo:block-container>
|
|
2142
|
+
</fo:static-content>
|
|
2143
|
+
|
|
2144
|
+
<fo:static-content flow-name="footer-preface-first_1987_TR" role="artifact">
|
|
2145
|
+
<fo:block-container font-size="8pt" margin-bottom="3mm">
|
|
2146
|
+
<xsl:call-template name="insertSingleLine"/>
|
|
2147
|
+
<fo:block font-size="11pt" font-weight="bold" text-align-last="justify" margin-top="0.5mm" margin-right="1mm">
|
|
2148
|
+
<fo:inline keep-together.within-line="always" role="SKIP">
|
|
2149
|
+
<xsl:value-of select="$udc"/>
|
|
2150
|
+
<fo:leader leader-pattern="space"/>
|
|
2151
|
+
<fo:inline role="SKIP">
|
|
2152
|
+
<xsl:value-of select="concat($i18n_reference_number_abbrev, ' ', $ISOnumber)"/>
|
|
2153
|
+
</fo:inline>
|
|
2154
|
+
</fo:inline>
|
|
2155
|
+
</fo:block>
|
|
2156
|
+
|
|
2157
|
+
<xsl:if test="/iso:iso-standard/iso:bibdata/iso:keyword">
|
|
2158
|
+
<fo:block margin-top="6pt">
|
|
2159
|
+
<fo:inline font-weight="bold"><xsl:value-of select="$i18n_descriptors"/> : </fo:inline>
|
|
2160
|
+
<xsl:call-template name="insertKeywords">
|
|
2161
|
+
<xsl:with-param name="sorting">no</xsl:with-param>
|
|
2162
|
+
<xsl:with-param name="charDelim" select="', '"/>
|
|
2163
|
+
</xsl:call-template>
|
|
2164
|
+
</fo:block>
|
|
2165
|
+
</xsl:if>
|
|
2166
|
+
|
|
2167
|
+
<fo:table table-layout="fixed" width="100%" margin-top="14pt" font-size="7.5pt">
|
|
2168
|
+
<fo:table-body>
|
|
2169
|
+
<fo:table-row>
|
|
2170
|
+
<fo:table-cell>
|
|
2171
|
+
<fo:block>
|
|
2172
|
+
<xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:copyright-statement"/>
|
|
2173
|
+
</fo:block>
|
|
2174
|
+
</fo:table-cell>
|
|
2175
|
+
<fo:table-cell display-align="after" text-align="right">
|
|
2176
|
+
<fo:block>
|
|
2177
|
+
<xsl:for-each select="xalan:nodeset($price_based_on_items)/item">
|
|
2178
|
+
<xsl:value-of select="."/>
|
|
2179
|
+
<xsl:if test="position() != last()">
|
|
2180
|
+
<fo:page-number-citation ref-id="lastBlock"/>
|
|
2181
|
+
</xsl:if>
|
|
2182
|
+
</xsl:for-each>
|
|
2183
|
+
</fo:block>
|
|
2184
|
+
</fo:table-cell>
|
|
2185
|
+
</fo:table-row>
|
|
2186
|
+
</fo:table-body>
|
|
2187
|
+
</fo:table>
|
|
2188
|
+
</fo:block-container>
|
|
2189
|
+
</fo:static-content> <!-- footer-preface-first_1987_TR -->
|
|
2190
|
+
|
|
2191
|
+
<fo:flow flow-name="xsl-region-body">
|
|
2192
|
+
<fo:table table-layout="fixed" width="100%">
|
|
2193
|
+
<fo:table-column column-width="proportional-column-width(68)"/>
|
|
2194
|
+
<fo:table-column column-width="proportional-column-width(112)"/>
|
|
2195
|
+
<fo:table-body>
|
|
2196
|
+
<fo:table-row>
|
|
2197
|
+
<fo:table-cell number-rows-spanned="2">
|
|
2198
|
+
<fo:block font-size="0">
|
|
2199
|
+
<xsl:variable name="content-height">25</xsl:variable>
|
|
2200
|
+
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo-1987))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
|
|
2201
|
+
</fo:block>
|
|
2202
|
+
</fo:table-cell>
|
|
2203
|
+
<fo:table-cell font-size="11pt" font-weight="bold">
|
|
2204
|
+
<fo:block><xsl:value-of select="$doctype_uppercased"/> <xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docnumber"/></fo:block>
|
|
2205
|
+
</fo:table-cell>
|
|
2206
|
+
</fo:table-row>
|
|
2207
|
+
<fo:table-row display-align="after">
|
|
2208
|
+
<fo:table-cell>
|
|
2209
|
+
<fo:block margin-bottom="-1mm">Published <xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'published']"/></fo:block>
|
|
2210
|
+
</fo:table-cell>
|
|
2211
|
+
</fo:table-row>
|
|
2212
|
+
</fo:table-body>
|
|
2213
|
+
</fo:table>
|
|
2214
|
+
|
|
2215
|
+
<fo:block font-size="6pt" margin-top="8mm" margin-bottom="18mm" text-align-last="justify"><xsl:value-of select="$ISO_title_en"/>●<xsl:value-of select="$ISO_title_ru"/>●<xsl:value-of select="$ISO_title_fr"/></fo:block>
|
|
2216
|
+
|
|
2217
|
+
<fo:block-container margin-bottom="22mm" role="SKIP">
|
|
2218
|
+
<fo:block font-size="18pt" font-weight="bold" role="H1" line-height="1.05">
|
|
2219
|
+
<xsl:call-template name="insertTitlesLangMain"/>
|
|
2220
|
+
</fo:block>
|
|
2221
|
+
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
|
|
2222
|
+
<xsl:variable name="lang_other" select="."/>
|
|
2223
|
+
<fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
|
|
2224
|
+
<fo:block role="H1" font-style="italic" line-height="1.2">
|
|
2225
|
+
<!-- Example: title-intro fr -->
|
|
2226
|
+
<xsl:call-template name="insertTitlesLangOther">
|
|
2227
|
+
<xsl:with-param name="lang_other" select="$lang_other"/>
|
|
2228
|
+
</xsl:call-template>
|
|
2229
|
+
</fo:block>
|
|
2230
|
+
</xsl:for-each>
|
|
2231
|
+
</fo:block-container>
|
|
2232
|
+
|
|
2233
|
+
<!-- ToC, Foreword, Introduction -->
|
|
2234
|
+
<xsl:call-template name="processPrefaceSectionsDefault"/>
|
|
2235
|
+
|
|
2236
|
+
</fo:flow>
|
|
2237
|
+
</fo:page-sequence>
|
|
2238
|
+
</xsl:when>
|
|
2021
2239
|
<xsl:otherwise>
|
|
2022
2240
|
|
|
2023
2241
|
<fo:page-sequence master-reference="preface{$document-master-reference}" format="i" force-page-count="{$force-page-count-preface}">
|
|
2024
2242
|
<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num <= 19981231)">
|
|
2025
2243
|
<xsl:attribute name="master-reference">preface-1972-1998</xsl:attribute>
|
|
2026
2244
|
</xsl:if>
|
|
2245
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
2246
|
+
<fo:static-content flow-name="xsl-footnote-separator">
|
|
2247
|
+
<fo:block margin-bottom="6pt">
|
|
2248
|
+
<fo:leader leader-pattern="rule" leader-length="51mm" rule-thickness="0.5pt"/>
|
|
2249
|
+
</fo:block>
|
|
2250
|
+
</fo:static-content>
|
|
2251
|
+
</xsl:if>
|
|
2027
2252
|
<xsl:call-template name="insertHeaderFooter">
|
|
2028
2253
|
<xsl:with-param name="font-weight">normal</xsl:with-param>
|
|
2029
2254
|
<xsl:with-param name="is_footer">true</xsl:with-param>
|
|
@@ -2085,9 +2310,12 @@
|
|
|
2085
2310
|
<xsl:if test="/iso:iso-standard/iso:boilerplate/iso:copyright-statement">
|
|
2086
2311
|
|
|
2087
2312
|
<fo:block-container height="252mm" display-align="after" role="SKIP">
|
|
2088
|
-
<xsl:if test="$layoutVersion = '1989'
|
|
2313
|
+
<xsl:if test="$layoutVersion = '1989'">
|
|
2089
2314
|
<xsl:attribute name="height">241.5mm</xsl:attribute>
|
|
2090
2315
|
</xsl:if>
|
|
2316
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
2317
|
+
<xsl:attribute name="width">172mm</xsl:attribute>
|
|
2318
|
+
</xsl:if>
|
|
2091
2319
|
<!-- <fo:block margin-bottom="3mm">
|
|
2092
2320
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
|
|
2093
2321
|
<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold"></fo:inline>
|
|
@@ -2097,9 +2325,9 @@
|
|
|
2097
2325
|
<xsl:if test="$layoutVersion = '1989'">
|
|
2098
2326
|
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
2099
2327
|
</xsl:if>
|
|
2100
|
-
<xsl:if test="$layoutVersion = '2024'">
|
|
2328
|
+
<!-- <xsl:if test="$layoutVersion = '2024'">
|
|
2101
2329
|
<xsl:attribute name="font-size">8.6pt</xsl:attribute>
|
|
2102
|
-
</xsl:if>
|
|
2330
|
+
</xsl:if> -->
|
|
2103
2331
|
<xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:copyright-statement"/>
|
|
2104
2332
|
</fo:block>
|
|
2105
2333
|
</fo:block>
|
|
@@ -2122,12 +2350,28 @@
|
|
|
2122
2350
|
|
|
2123
2351
|
<!-- BODY -->
|
|
2124
2352
|
<fo:page-sequence master-reference="document{$document-master-reference}" initial-page-number="1" force-page-count="no-force">
|
|
2353
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
2354
|
+
<xsl:attribute name="initial-page-number">auto</xsl:attribute>
|
|
2355
|
+
<xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
|
|
2356
|
+
</xsl:if>
|
|
2125
2357
|
<fo:static-content flow-name="xsl-footnote-separator">
|
|
2126
2358
|
<fo:block>
|
|
2127
|
-
<
|
|
2359
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
2360
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
2361
|
+
</xsl:if>
|
|
2362
|
+
<fo:leader leader-pattern="rule" leader-length="30%">
|
|
2363
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
2364
|
+
<xsl:attribute name="leader-length">51mm</xsl:attribute>
|
|
2365
|
+
<xsl:attribute name="rule-thickness">0.5pt</xsl:attribute>
|
|
2366
|
+
</xsl:if>
|
|
2367
|
+
</fo:leader>
|
|
2128
2368
|
</fo:block>
|
|
2129
2369
|
</fo:static-content>
|
|
2130
|
-
|
|
2370
|
+
|
|
2371
|
+
<xsl:variable name="border_around_page"><xsl:if test="$layoutVersion = '1951'">true</xsl:if></xsl:variable>
|
|
2372
|
+
<xsl:call-template name="insertHeaderFooter">
|
|
2373
|
+
<xsl:with-param name="border_around_page" select="$border_around_page"/>
|
|
2374
|
+
</xsl:call-template>
|
|
2131
2375
|
<fo:flow flow-name="xsl-region-body">
|
|
2132
2376
|
|
|
2133
2377
|
<!-- Information and documentation — Codes for transcription systems -->
|
|
@@ -2162,8 +2406,42 @@
|
|
|
2162
2406
|
<!-- Clause(s) -->
|
|
2163
2407
|
<!-- <fo:block> -->
|
|
2164
2408
|
|
|
2409
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
2410
|
+
<!-- first page header -->
|
|
2411
|
+
<!-- Example: ISO Recommendation R 453 November 1965 -->
|
|
2412
|
+
<fo:block-container margin-top="-13mm" margin-left="-12mm" margin-right="-12mm">
|
|
2413
|
+
<fo:block-container margin-left="0" margin-right="0" border-bottom="1.25pt solid black">
|
|
2414
|
+
<fo:table table-layout="fixed" width="100%" font-family="Arial" font-size="13pt">
|
|
2415
|
+
<fo:table-column column-width="proportional-column-width(9.5)"/>
|
|
2416
|
+
<fo:table-column column-width="proportional-column-width(65)"/>
|
|
2417
|
+
<fo:table-column column-width="proportional-column-width(34)"/>
|
|
2418
|
+
<fo:table-column column-width="proportional-column-width(50)"/>
|
|
2419
|
+
<fo:table-column column-width="proportional-column-width(9.5)"/>
|
|
2420
|
+
<fo:table-body>
|
|
2421
|
+
<fo:table-row height="10mm">
|
|
2422
|
+
<fo:table-cell><fo:block> </fo:block></fo:table-cell>
|
|
2423
|
+
<fo:table-cell><fo:block><xsl:value-of select="$doctype_localized"/></fo:block></fo:table-cell>
|
|
2424
|
+
<fo:table-cell text-align="center"><fo:block><xsl:value-of select="$docnumber_with_prefix"/></fo:block></fo:table-cell>
|
|
2425
|
+
<fo:table-cell text-align="right">
|
|
2426
|
+
<fo:block>
|
|
2427
|
+
<xsl:call-template name="convertDate">
|
|
2428
|
+
<xsl:with-param name="date" select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/>
|
|
2429
|
+
</xsl:call-template>
|
|
2430
|
+
</fo:block>
|
|
2431
|
+
</fo:table-cell>
|
|
2432
|
+
<fo:table-cell><fo:block> </fo:block></fo:table-cell>
|
|
2433
|
+
</fo:table-row>
|
|
2434
|
+
</fo:table-body>
|
|
2435
|
+
</fo:table>
|
|
2436
|
+
</fo:block-container>
|
|
2437
|
+
</fo:block-container>
|
|
2438
|
+
|
|
2439
|
+
<!-- Show Introduction in the main section -->
|
|
2440
|
+
<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() = 'introduction']"/>
|
|
2441
|
+
</xsl:if> <!-- $layoutVersion = '1951' -->
|
|
2442
|
+
|
|
2165
2443
|
<xsl:choose>
|
|
2166
|
-
<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
|
|
2444
|
+
<xsl:when test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
|
|
2167
2445
|
<xsl:choose>
|
|
2168
2446
|
<xsl:when test="$doctype = 'amendment'">
|
|
2169
2447
|
<xsl:variable name="flatxml">
|
|
@@ -2189,17 +2467,23 @@
|
|
|
2189
2467
|
</xsl:choose>
|
|
2190
2468
|
|
|
2191
2469
|
<xsl:if test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989')">
|
|
2192
|
-
<fo:block
|
|
2470
|
+
<fo:block text-align="center" margin-top="12mm" keep-with-previous="always" role="SKIP">
|
|
2471
|
+
<xsl:if test="$layout_columns != 1">
|
|
2472
|
+
<xsl:attribute name="span">all</xsl:attribute>
|
|
2473
|
+
</xsl:if>
|
|
2193
2474
|
<fo:leader leader-pattern="rule" leader-length="20%"/>
|
|
2194
2475
|
</fo:block>
|
|
2195
2476
|
</xsl:if>
|
|
2196
2477
|
|
|
2197
|
-
<fo:block id="lastBlock" font-size="1pt" role="SKIP"> </fo:block>
|
|
2478
|
+
<fo:block id="lastBlock" font-size="1pt" keep-with-previous="always" role="SKIP"> </fo:block>
|
|
2198
2479
|
<!-- </fo:block> -->
|
|
2199
2480
|
|
|
2200
2481
|
</fo:flow>
|
|
2201
2482
|
</fo:page-sequence>
|
|
2202
2483
|
|
|
2484
|
+
<!-- Index -->
|
|
2485
|
+
<!-- <xsl:message>START current_document_index_id</xsl:message> -->
|
|
2486
|
+
|
|
2203
2487
|
<xsl:variable name="docid">
|
|
2204
2488
|
<xsl:call-template name="getDocumentId"/>
|
|
2205
2489
|
</xsl:variable>
|
|
@@ -2209,15 +2493,29 @@
|
|
|
2209
2493
|
<xsl:with-param name="docid" select="$docid"/>
|
|
2210
2494
|
</xsl:apply-templates>
|
|
2211
2495
|
</xsl:variable>
|
|
2496
|
+
<!-- <xsl:message>END current_document_index_id</xsl:message> -->
|
|
2212
2497
|
|
|
2498
|
+
<!-- <xsl:message>START current_document_index</xsl:message> -->
|
|
2499
|
+
<xsl:variable name="startTime1" select="java:getTime(java:java.util.Date.new())"/>
|
|
2213
2500
|
<xsl:variable name="current_document_index">
|
|
2214
2501
|
<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
|
|
2215
2502
|
</xsl:variable>
|
|
2503
|
+
<!-- <xsl:variable name="endTime1" select="java:getTime(java:java.util.Date.new())"/>
|
|
2504
|
+
<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime1 - $startTime1"/> msec.</xsl:message>
|
|
2505
|
+
<xsl:message>END current_document_index</xsl:message> -->
|
|
2216
2506
|
|
|
2507
|
+
<!-- <xsl:variable name="startTime2" select="java:getTime(java:java.util.Date.new())"/>
|
|
2508
|
+
<xsl:message>START xalan:nodeset</xsl:message> -->
|
|
2509
|
+
<!-- <xsl:apply-templates select="//iso:indexsect" mode="index"/> -->
|
|
2217
2510
|
<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="index"/>
|
|
2511
|
+
<!-- <xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
|
|
2512
|
+
<xsl:message>DEBUG: processing time <xsl:value-of select="$endTime2 - $startTime2"/> msec.</xsl:message>
|
|
2513
|
+
<xsl:message>END xalan:nodeset</xsl:message> -->
|
|
2218
2514
|
|
|
2219
2515
|
<xsl:choose>
|
|
2516
|
+
<xsl:when test="$layoutVersion = '1951'"/>
|
|
2220
2517
|
<xsl:when test="$layoutVersion = '1972'"/>
|
|
2518
|
+
<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"><!-- UDC, Keywords and Price renders on the first page for technical-report --></xsl:when>
|
|
2221
2519
|
<xsl:when test="$layoutVersion = '2024'">
|
|
2222
2520
|
<xsl:call-template name="insertLastPage_2024"/>
|
|
2223
2521
|
</xsl:when>
|
|
@@ -2236,8 +2534,41 @@
|
|
|
2236
2534
|
|
|
2237
2535
|
</xsl:template>
|
|
2238
2536
|
|
|
2537
|
+
<xsl:template match="iso:preface/iso:introduction" mode="update_xml_step1" priority="3">
|
|
2538
|
+
<xsl:param name="process">false</xsl:param>
|
|
2539
|
+
<xsl:choose>
|
|
2540
|
+
<xsl:when test="$layoutVersion = '1951'">
|
|
2541
|
+
<xsl:if test="$process = 'true'">
|
|
2542
|
+
<xsl:copy>
|
|
2543
|
+
<xsl:apply-templates select="@*" mode="update_xml_step1"/>
|
|
2544
|
+
<xsl:attribute name="displayorder">
|
|
2545
|
+
<xsl:value-of select="concat(../../iso:sections/iso:p[@class = 'zzSTDTitle1']/@displayorder, '.1')"/>
|
|
2546
|
+
</xsl:attribute>
|
|
2547
|
+
<xsl:apply-templates select="node()" mode="update_xml_step1"/>
|
|
2548
|
+
</xsl:copy>
|
|
2549
|
+
</xsl:if>
|
|
2550
|
+
</xsl:when>
|
|
2551
|
+
<xsl:otherwise>
|
|
2552
|
+
<xsl:copy>
|
|
2553
|
+
<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
|
|
2554
|
+
</xsl:copy>
|
|
2555
|
+
</xsl:otherwise>
|
|
2556
|
+
</xsl:choose>
|
|
2557
|
+
</xsl:template>
|
|
2558
|
+
|
|
2559
|
+
<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']" mode="update_xml_step1" priority="3">
|
|
2560
|
+
<xsl:copy>
|
|
2561
|
+
<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
|
|
2562
|
+
</xsl:copy>
|
|
2563
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
2564
|
+
<xsl:apply-templates select="../../iso:preface/iso:introduction" mode="update_xml_step1">
|
|
2565
|
+
<xsl:with-param name="process">true</xsl:with-param>
|
|
2566
|
+
</xsl:apply-templates>
|
|
2567
|
+
</xsl:if>
|
|
2568
|
+
</xsl:template>
|
|
2569
|
+
|
|
2239
2570
|
<xsl:template name="insertLogoImages2024">
|
|
2240
|
-
<xsl:variable name="content-height">
|
|
2571
|
+
<xsl:variable name="content-height">20</xsl:variable>
|
|
2241
2572
|
<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:copyright/iso:owner/iso:organization">
|
|
2242
2573
|
<xsl:choose>
|
|
2243
2574
|
<xsl:when test="iso:abbreviation = 'ISO'">
|
|
@@ -2395,7 +2726,7 @@
|
|
|
2395
2726
|
<fo:block-container margin-left="1mm" role="SKIP"> <!-- margin-bottom="7mm" margin-top="-15mm" -->
|
|
2396
2727
|
<fo:block font-size="9pt" border="0.5pt solid black" fox:border-radius="5pt" padding-left="2mm" padding-top="2mm" padding-bottom="2mm">
|
|
2397
2728
|
<xsl:if test="$layoutVersion = '2024'">
|
|
2398
|
-
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
2729
|
+
<!-- <xsl:attribute name="font-size">9pt</xsl:attribute> -->
|
|
2399
2730
|
<xsl:attribute name="fox:border-radius">0pt</xsl:attribute>
|
|
2400
2731
|
<xsl:attribute name="border">1pt solid black</xsl:attribute>
|
|
2401
2732
|
</xsl:if>
|
|
@@ -2420,12 +2751,7 @@
|
|
|
2420
2751
|
</xsl:if>
|
|
2421
2752
|
<fo:block>
|
|
2422
2753
|
<!-- <xsl:text>FAST TRACK PROCEDURE</xsl:text> -->
|
|
2423
|
-
<xsl:
|
|
2424
|
-
<xsl:call-template name="getLocalizedString">
|
|
2425
|
-
<xsl:with-param name="key">fast-track-procedure</xsl:with-param>
|
|
2426
|
-
</xsl:call-template>
|
|
2427
|
-
</xsl:variable>
|
|
2428
|
-
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($fast_track_procedure_text))"/>
|
|
2754
|
+
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($i18n_fast_track_procedure))"/>
|
|
2429
2755
|
</fo:block>
|
|
2430
2756
|
</fo:block-container>
|
|
2431
2757
|
</fo:block>
|
|
@@ -2437,6 +2763,7 @@
|
|
|
2437
2763
|
<xsl:template match="iso:preface/iso:clause[@type = 'toc']" priority="3">
|
|
2438
2764
|
<xsl:choose>
|
|
2439
2765
|
<xsl:when test="$doctype = 'amendment'"/><!-- ToC shouldn't be generated in amendments. -->
|
|
2766
|
+
<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"/>
|
|
2440
2767
|
<xsl:otherwise>
|
|
2441
2768
|
|
|
2442
2769
|
<fo:block-container font-weight="bold">
|
|
@@ -2479,14 +2806,29 @@
|
|
|
2479
2806
|
<xsl:if test="@level >= 2 or @type = 'annex'">
|
|
2480
2807
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
2481
2808
|
</xsl:if>
|
|
2482
|
-
<xsl:
|
|
2809
|
+
<xsl:variable name="provisional_distance_between_starts">
|
|
2483
2810
|
<xsl:choose>
|
|
2484
2811
|
<!-- skip 0 section without subsections -->
|
|
2485
|
-
<xsl:when test="@level >= 3"><xsl:value-of select="$margin-left * 1.2"
|
|
2486
|
-
<xsl:when test="@section != ''"><xsl:value-of select="$margin-left"
|
|
2487
|
-
<xsl:otherwise>
|
|
2812
|
+
<xsl:when test="@level >= 3"><xsl:value-of select="$margin-left * 1.2"/></xsl:when>
|
|
2813
|
+
<xsl:when test="@section != ''"><xsl:value-of select="$margin-left"/></xsl:when>
|
|
2814
|
+
<xsl:otherwise>0</xsl:otherwise>
|
|
2815
|
+
</xsl:choose>
|
|
2816
|
+
</xsl:variable>
|
|
2817
|
+
<xsl:variable name="section_length_str" select="string-length(normalize-space(@section))"/>
|
|
2818
|
+
<xsl:variable name="section_length_mm" select="$section_length_str * 2"/>
|
|
2819
|
+
|
|
2820
|
+
<!-- refine the distance depends on the section string length -->
|
|
2821
|
+
<xsl:attribute name="provisional-distance-between-starts">
|
|
2822
|
+
<xsl:choose>
|
|
2823
|
+
<xsl:when test="$section_length_mm > $provisional_distance_between_starts">
|
|
2824
|
+
<xsl:value-of select="concat($section_length_mm, 'mm')"/>
|
|
2825
|
+
</xsl:when>
|
|
2826
|
+
<xsl:otherwise>
|
|
2827
|
+
<xsl:value-of select="concat($provisional_distance_between_starts, 'mm')"/>
|
|
2828
|
+
</xsl:otherwise>
|
|
2488
2829
|
</xsl:choose>
|
|
2489
2830
|
</xsl:attribute>
|
|
2831
|
+
|
|
2490
2832
|
<fo:list-item role="SKIP">
|
|
2491
2833
|
<fo:list-item-label end-indent="label-end()" role="SKIP">
|
|
2492
2834
|
<fo:block role="SKIP">
|
|
@@ -2550,12 +2892,12 @@
|
|
|
2550
2892
|
<xsl:template match="iso:preface/iso:clause[@type = 'toc']/iso:title" priority="3">
|
|
2551
2893
|
<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
|
|
2552
2894
|
<xsl:if test="$layoutVersion = '2024'">
|
|
2553
|
-
<xsl:attribute name="
|
|
2895
|
+
<xsl:attribute name="margin-top">0</xsl:attribute>
|
|
2554
2896
|
</xsl:if>
|
|
2555
2897
|
<fo:inline font-size="16pt" font-weight="bold" role="SKIP">
|
|
2556
|
-
<xsl:if test="$layoutVersion = '2024'">
|
|
2898
|
+
<!-- <xsl:if test="$layoutVersion = '2024'">
|
|
2557
2899
|
<xsl:attribute name="font-size">15.3pt</xsl:attribute>
|
|
2558
|
-
</xsl:if>
|
|
2900
|
+
</xsl:if> -->
|
|
2559
2901
|
<!-- Contents -->
|
|
2560
2902
|
<!-- <xsl:call-template name="getLocalizedString">
|
|
2561
2903
|
<xsl:with-param name="key">table_of_contents</xsl:with-param>
|
|
@@ -2565,13 +2907,11 @@
|
|
|
2565
2907
|
<fo:inline keep-together.within-line="always" role="SKIP">
|
|
2566
2908
|
<fo:leader leader-pattern="space"/>
|
|
2567
2909
|
<fo:inline font-weight="normal" font-size="10pt" role="SKIP">
|
|
2568
|
-
<xsl:if test="$layoutVersion = '2024'">
|
|
2910
|
+
<!-- <xsl:if test="$layoutVersion = '2024'">
|
|
2569
2911
|
<xsl:attribute name="font-size">9.6pt</xsl:attribute>
|
|
2570
|
-
</xsl:if>
|
|
2912
|
+
</xsl:if> -->
|
|
2571
2913
|
<!-- Page -->
|
|
2572
|
-
<xsl:
|
|
2573
|
-
<xsl:with-param name="key">locality.page</xsl:with-param>
|
|
2574
|
-
</xsl:call-template>
|
|
2914
|
+
<xsl:value-of select="$i18n_locality_page"/>
|
|
2575
2915
|
</fo:inline>
|
|
2576
2916
|
</fo:inline>
|
|
2577
2917
|
</fo:block>
|
|
@@ -2641,12 +2981,7 @@
|
|
|
2641
2981
|
<xsl:variable name="part-word">
|
|
2642
2982
|
<xsl:choose>
|
|
2643
2983
|
<xsl:when test="$isMainLang = 'true'">
|
|
2644
|
-
<xsl:
|
|
2645
|
-
<xsl:with-param name="key">locality.part</xsl:with-param>
|
|
2646
|
-
</xsl:call-template>
|
|
2647
|
-
<xsl:text> </xsl:text>
|
|
2648
|
-
<xsl:value-of select="$part"/>
|
|
2649
|
-
<xsl:text>:</xsl:text>
|
|
2984
|
+
<xsl:value-of select="concat($i18n_locality_part, ' ', $part, ':')"/>
|
|
2650
2985
|
</xsl:when>
|
|
2651
2986
|
<xsl:otherwise>
|
|
2652
2987
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$curr_lang]),'#',$part)"/>
|
|
@@ -2741,20 +3076,28 @@
|
|
|
2741
3076
|
</xsl:template>
|
|
2742
3077
|
|
|
2743
3078
|
<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']" priority="4">
|
|
3079
|
+
<xsl:if test="not($layoutVersion = '1987' and $doctype = 'technical-report')">
|
|
2744
3080
|
<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
|
|
3081
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
3082
|
+
<xsl:attribute name="font-size">13pt</xsl:attribute>
|
|
3083
|
+
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
3084
|
+
<xsl:attribute name="margin-top">49mm</xsl:attribute>
|
|
3085
|
+
<xsl:attribute name="text-transform">uppercase</xsl:attribute>
|
|
3086
|
+
</xsl:if>
|
|
2745
3087
|
<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
2746
3088
|
<xsl:attribute name="font-size">16pt</xsl:attribute>
|
|
2747
3089
|
<xsl:attribute name="span">all</xsl:attribute>
|
|
2748
3090
|
<xsl:attribute name="margin-bottom">40pt</xsl:attribute>
|
|
2749
3091
|
</xsl:if>
|
|
2750
3092
|
<xsl:if test="$layoutVersion = '2024'">
|
|
2751
|
-
<xsl:attribute name="
|
|
3093
|
+
<xsl:attribute name="margin-top">50pt</xsl:attribute>
|
|
2752
3094
|
</xsl:if>
|
|
2753
3095
|
<xsl:if test="following-sibling::*[1][self::iso:p][starts-with(@class, 'zzSTDTitle')]">
|
|
2754
3096
|
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
2755
3097
|
</xsl:if>
|
|
2756
3098
|
<xsl:apply-templates/>
|
|
2757
3099
|
</fo:block>
|
|
3100
|
+
</xsl:if>
|
|
2758
3101
|
</xsl:template>
|
|
2759
3102
|
|
|
2760
3103
|
<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']/iso:span[@class = 'nonboldtitle']" priority="3">
|
|
@@ -2780,9 +3123,9 @@
|
|
|
2780
3123
|
<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
2781
3124
|
<xsl:attribute name="font-size">16pt</xsl:attribute>
|
|
2782
3125
|
</xsl:if>
|
|
2783
|
-
<xsl:if test="$layoutVersion = '2024'">
|
|
3126
|
+
<!-- <xsl:if test="$layoutVersion = '2024'">
|
|
2784
3127
|
<xsl:attribute name="font-size">17.2pt</xsl:attribute>
|
|
2785
|
-
</xsl:if>
|
|
3128
|
+
</xsl:if> -->
|
|
2786
3129
|
<xsl:apply-templates/>
|
|
2787
3130
|
</fo:block>
|
|
2788
3131
|
</xsl:if>
|
|
@@ -2887,12 +3230,15 @@
|
|
|
2887
3230
|
</xsl:when>
|
|
2888
3231
|
<xsl:otherwise>
|
|
2889
3232
|
<fo:block margin-left="0.5mm" margin-bottom="3mm" role="H1">
|
|
3233
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
3234
|
+
<xsl:attribute name="margin-bottom">3.5mm</xsl:attribute>
|
|
3235
|
+
</xsl:if>
|
|
2890
3236
|
<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}">
|
|
2891
|
-
<xsl:if test="$layoutVersion = '2024'">
|
|
3237
|
+
<!-- <xsl:if test="$layoutVersion = '2024'">
|
|
2892
3238
|
<xsl:attribute name="width">13mm</xsl:attribute>
|
|
2893
3239
|
<xsl:attribute name="content-height">11.5mm</xsl:attribute>
|
|
2894
3240
|
<xsl:attribute name="margin-bottom">-1mm</xsl:attribute>
|
|
2895
|
-
</xsl:if>
|
|
3241
|
+
</xsl:if> -->
|
|
2896
3242
|
</fo:external-graphic>
|
|
2897
3243
|
<!-- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline> -->
|
|
2898
3244
|
<fo:inline padding-left="6mm" font-size="12pt" font-weight="bold" role="SKIP">
|
|
@@ -2900,7 +3246,7 @@
|
|
|
2900
3246
|
<xsl:attribute name="font-size">11pt</xsl:attribute>
|
|
2901
3247
|
</xsl:if>
|
|
2902
3248
|
<xsl:if test="$layoutVersion = '2024'">
|
|
2903
|
-
<xsl:attribute name="
|
|
3249
|
+
<xsl:attribute name="baseline-shift">5%</xsl:attribute>
|
|
2904
3250
|
</xsl:if>
|
|
2905
3251
|
<xsl:apply-templates/></fo:inline>
|
|
2906
3252
|
</fo:block>
|
|
@@ -2943,7 +3289,7 @@
|
|
|
2943
3289
|
</xsl:when>
|
|
2944
3290
|
<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1987'">
|
|
2945
3291
|
<xsl:if test="@id = 'boilerplate-place'">
|
|
2946
|
-
<fo:block margin-top="6pt"> </fo:block>
|
|
3292
|
+
<fo:block margin-top="6pt"><xsl:if test="$layoutVersion = '1987' and $doctype = 'technical-report'"><xsl:attribute name="margin-top">0</xsl:attribute></xsl:if> </fo:block>
|
|
2947
3293
|
</xsl:if>
|
|
2948
3294
|
<fo:block><xsl:apply-templates/></fo:block>
|
|
2949
3295
|
</xsl:when>
|
|
@@ -2975,7 +3321,8 @@
|
|
|
2975
3321
|
<xsl:otherwise>
|
|
2976
3322
|
<fo:block font-size="16pt" text-align="center" margin-bottom="48pt" keep-with-next="always" role="H1">
|
|
2977
3323
|
<xsl:if test="$layoutVersion = '2024'">
|
|
2978
|
-
<xsl:attribute name="
|
|
3324
|
+
<xsl:attribute name="line-height">1.1</xsl:attribute>
|
|
3325
|
+
<!-- <xsl:attribute name="margin-bottom">52pt</xsl:attribute> -->
|
|
2979
3326
|
</xsl:if>
|
|
2980
3327
|
<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
2981
3328
|
<xsl:attribute name="span">all</xsl:attribute>
|
|
@@ -3000,7 +3347,8 @@
|
|
|
3000
3347
|
<xsl:attribute name="span">all</xsl:attribute>
|
|
3001
3348
|
</xsl:if>
|
|
3002
3349
|
<xsl:if test="$layoutVersion = '2024'">
|
|
3003
|
-
<xsl:attribute name="
|
|
3350
|
+
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
3351
|
+
<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
|
|
3004
3352
|
</xsl:if>
|
|
3005
3353
|
<xsl:apply-templates/>
|
|
3006
3354
|
</fo:block>
|
|
@@ -3016,6 +3364,22 @@
|
|
|
3016
3364
|
|
|
3017
3365
|
<xsl:variable name="font-size">
|
|
3018
3366
|
<xsl:choose>
|
|
3367
|
+
<xsl:when test="$layoutVersion = '1951'">
|
|
3368
|
+
<xsl:choose>
|
|
3369
|
+
<xsl:when test="$level = 1 and ancestor::iso:preface">13pt</xsl:when>
|
|
3370
|
+
<xsl:when test="$level = 1">9pt</xsl:when>
|
|
3371
|
+
<xsl:otherwise>inherit</xsl:otherwise>
|
|
3372
|
+
<!-- <xsl:when test="$level = 2">10pt</xsl:when>
|
|
3373
|
+
<xsl:when test="$level >= 3">9pt</xsl:when> -->
|
|
3374
|
+
</xsl:choose>
|
|
3375
|
+
</xsl:when>
|
|
3376
|
+
<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'">
|
|
3377
|
+
<xsl:choose>
|
|
3378
|
+
<xsl:when test="$level = 1">11pt</xsl:when>
|
|
3379
|
+
<xsl:when test="$level = 2">10pt</xsl:when>
|
|
3380
|
+
<xsl:when test="$level >= 3">9pt</xsl:when>
|
|
3381
|
+
</xsl:choose>
|
|
3382
|
+
</xsl:when>
|
|
3019
3383
|
<xsl:when test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
3020
3384
|
<xsl:choose>
|
|
3021
3385
|
<xsl:when test="ancestor::iso:annex and $level = 2">12pt</xsl:when>
|
|
@@ -3027,7 +3391,7 @@
|
|
|
3027
3391
|
<xsl:otherwise>12pt</xsl:otherwise>
|
|
3028
3392
|
</xsl:choose>
|
|
3029
3393
|
</xsl:when>
|
|
3030
|
-
<xsl:when test="$layoutVersion = '2024'">
|
|
3394
|
+
<!-- <xsl:when test="$layoutVersion = '2024'">
|
|
3031
3395
|
<xsl:choose>
|
|
3032
3396
|
<xsl:when test="ancestor::iso:annex and $level = 2">12.5pt</xsl:when>
|
|
3033
3397
|
<xsl:when test="ancestor::iso:annex and $level = 3">11.5pt</xsl:when>
|
|
@@ -3037,7 +3401,7 @@
|
|
|
3037
3401
|
<xsl:when test="$level >= 3">10.5pt</xsl:when>
|
|
3038
3402
|
<xsl:otherwise>12.5pt</xsl:otherwise>
|
|
3039
3403
|
</xsl:choose>
|
|
3040
|
-
</xsl:when>
|
|
3404
|
+
</xsl:when> -->
|
|
3041
3405
|
<xsl:otherwise>
|
|
3042
3406
|
<xsl:choose>
|
|
3043
3407
|
<xsl:when test="ancestor::iso:annex and $level = 2">13pt</xsl:when>
|
|
@@ -3061,17 +3425,25 @@
|
|
|
3061
3425
|
</xsl:variable>
|
|
3062
3426
|
|
|
3063
3427
|
<xsl:choose>
|
|
3428
|
+
<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report' and parent::iso:foreword"><!-- skip Foreword title --></xsl:when>
|
|
3064
3429
|
<xsl:when test="$doctype = 'amendment' and not(ancestor::iso:preface)">
|
|
3065
3430
|
<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always" role="H{$level}">
|
|
3066
|
-
<xsl:if test="$layoutVersion = '2024'">
|
|
3431
|
+
<!-- <xsl:if test="$layoutVersion = '2024'">
|
|
3067
3432
|
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
3068
|
-
</xsl:if>
|
|
3433
|
+
</xsl:if> -->
|
|
3069
3434
|
<xsl:apply-templates/>
|
|
3070
3435
|
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
|
|
3071
3436
|
</fo:block>
|
|
3072
3437
|
</xsl:when>
|
|
3073
3438
|
|
|
3074
3439
|
<xsl:otherwise>
|
|
3440
|
+
|
|
3441
|
+
<xsl:if test="$layoutVersion = '1987' and $doctype = 'technical-report' and parent::iso:introduction">
|
|
3442
|
+
<fo:block span="all" text-align="center" margin-top="15mm" keep-with-previous="always" role="SKIP">
|
|
3443
|
+
<fo:leader leader-pattern="rule" leader-length="12%"/>
|
|
3444
|
+
</fo:block>
|
|
3445
|
+
</xsl:if>
|
|
3446
|
+
|
|
3075
3447
|
<xsl:element name="{$element-name}">
|
|
3076
3448
|
|
|
3077
3449
|
<xsl:if test="$layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
@@ -3089,12 +3461,16 @@
|
|
|
3089
3461
|
</xsl:variable>
|
|
3090
3462
|
<xsl:attribute name="{$attribute-name-before}"> <!-- space-before or margin-top -->
|
|
3091
3463
|
<xsl:choose>
|
|
3464
|
+
<xsl:when test="$layoutVersion = '1951' and ancestor::iso:preface and $level = 1">20mm</xsl:when>
|
|
3092
3465
|
<xsl:when test="ancestor::iso:introduction and $level >= 2 and ../preceding-sibling::iso:clause">30pt</xsl:when>
|
|
3466
|
+
<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report' and ancestor::iso:preface and $level = 1">10mm</xsl:when>
|
|
3093
3467
|
<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num <= 19981231)) and ancestor::iso:preface and $level = 1">62mm</xsl:when>
|
|
3094
3468
|
<xsl:when test="$layoutVersion = '1989' and ancestor::iso:preface and $level = 1">56pt</xsl:when>
|
|
3469
|
+
<xsl:when test="$layoutVersion = '2024' and ancestor::iso:preface and $level = 1">0pt</xsl:when>
|
|
3095
3470
|
<xsl:when test="ancestor::iso:preface">8pt</xsl:when>
|
|
3096
3471
|
<xsl:when test="$level = 2 and ancestor::iso:annex">18pt</xsl:when>
|
|
3097
3472
|
<xsl:when test="$level = 1">18pt</xsl:when>
|
|
3473
|
+
<xsl:when test="($level = 2 or $level = 3) and not(../preceding-sibling::iso:clause) and $layoutVersion = '2024'">12pt</xsl:when> <!-- first title in 3rd level clause -->
|
|
3098
3474
|
<xsl:when test="($level = 2 or $level = 3) and not(../preceding-sibling::iso:clause)">14pt</xsl:when> <!-- first title in 3rd level clause -->
|
|
3099
3475
|
<xsl:when test="$level = 3">14pt</xsl:when>
|
|
3100
3476
|
<xsl:when test="$level > 3">3pt</xsl:when>
|
|
@@ -3104,15 +3480,30 @@
|
|
|
3104
3480
|
</xsl:attribute>
|
|
3105
3481
|
<xsl:attribute name="space-after"> <!-- margin-bottom -->
|
|
3106
3482
|
<xsl:choose>
|
|
3483
|
+
<xsl:when test="$layoutVersion = '1951' and $level = 1 and ancestor::iso:preface">14.7mm</xsl:when>
|
|
3484
|
+
<xsl:when test="$layoutVersion = '1951' and $level = 1">12pt</xsl:when>
|
|
3107
3485
|
<xsl:when test="ancestor::iso:introduction and $level >= 2">8pt</xsl:when>
|
|
3108
3486
|
<xsl:when test="ancestor::iso:preface">18pt</xsl:when>
|
|
3109
3487
|
<xsl:when test="$level = 3">9pt</xsl:when>
|
|
3488
|
+
<!-- <xsl:when test="$level = 2 and ancestor::iso:annex and $layoutVersion = '2024'">2pt</xsl:when> -->
|
|
3110
3489
|
<!-- <xsl:otherwise>12pt</xsl:otherwise> -->
|
|
3111
3490
|
<xsl:otherwise>8pt</xsl:otherwise>
|
|
3112
3491
|
</xsl:choose>
|
|
3113
3492
|
</xsl:attribute>
|
|
3114
3493
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
3115
3494
|
<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
|
|
3495
|
+
<xsl:if test="@type = 'floating-title' or @type = 'section-title'">
|
|
3496
|
+
<xsl:copy-of select="@id"/>
|
|
3497
|
+
</xsl:if>
|
|
3498
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
3499
|
+
<xsl:if test="$element-name = 'fo:block' and ($level = 1 or parent::iso:introduction)">
|
|
3500
|
+
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
3501
|
+
<xsl:attribute name="text-transform">uppercase</xsl:attribute>
|
|
3502
|
+
<xsl:if test="ancestor::iso:preface or ancestor::iso:introduction">
|
|
3503
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
3504
|
+
</xsl:if>
|
|
3505
|
+
</xsl:if>
|
|
3506
|
+
</xsl:if>
|
|
3116
3507
|
<xsl:if test="$element-name = 'fo:inline'">
|
|
3117
3508
|
<xsl:choose>
|
|
3118
3509
|
<xsl:when test="$lang = 'zh'">
|
|
@@ -3123,7 +3514,17 @@
|
|
|
3123
3514
|
</xsl:otherwise>
|
|
3124
3515
|
</xsl:choose>
|
|
3125
3516
|
</xsl:if>
|
|
3126
|
-
<xsl:
|
|
3517
|
+
<xsl:choose>
|
|
3518
|
+
<xsl:when test="$layoutVersion = '1951' and ((ancestor::iso:preface and $level = 1) or parent::iso:introduction)">
|
|
3519
|
+
<xsl:call-template name="add-letter-spacing">
|
|
3520
|
+
<xsl:with-param name="text" select="."/>
|
|
3521
|
+
<xsl:with-param name="letter-spacing" select="0.65"/>
|
|
3522
|
+
</xsl:call-template>
|
|
3523
|
+
</xsl:when>
|
|
3524
|
+
<xsl:otherwise>
|
|
3525
|
+
<xsl:apply-templates/>
|
|
3526
|
+
</xsl:otherwise>
|
|
3527
|
+
</xsl:choose>
|
|
3127
3528
|
<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
|
|
3128
3529
|
</xsl:element>
|
|
3129
3530
|
|
|
@@ -3139,7 +3540,7 @@
|
|
|
3139
3540
|
|
|
3140
3541
|
<xsl:template match="iso:title[@inline-header = 'true'][following-sibling::*[1][local-name() = 'p']]" priority="3">
|
|
3141
3542
|
<xsl:choose>
|
|
3142
|
-
<xsl:when test="($layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1"/> <!-- don't show 'title' with inline-header='true' if next element is 'p' -->
|
|
3543
|
+
<xsl:when test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1"/> <!-- don't show 'title' with inline-header='true' if next element is 'p' -->
|
|
3143
3544
|
<xsl:otherwise>
|
|
3144
3545
|
<xsl:call-template name="title"/>
|
|
3145
3546
|
</xsl:otherwise>
|
|
@@ -3151,9 +3552,9 @@
|
|
|
3151
3552
|
<xsl:call-template name="getId"/>
|
|
3152
3553
|
</xsl:variable> id="{$id}" -->
|
|
3153
3554
|
<fo:block font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
|
|
3154
|
-
<xsl:if test="$layoutVersion = '2024'">
|
|
3555
|
+
<!-- <xsl:if test="$layoutVersion = '2024'">
|
|
3155
3556
|
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
3156
|
-
</xsl:if>
|
|
3557
|
+
</xsl:if> -->
|
|
3157
3558
|
<xsl:apply-templates/>
|
|
3158
3559
|
</fo:block>
|
|
3159
3560
|
</xsl:template>
|
|
@@ -3249,8 +3650,25 @@
|
|
|
3249
3650
|
</xsl:apply-templates> -->
|
|
3250
3651
|
<!-- <xsl:apply-templates select="node()[not(self::iso:note[not(following-sibling::*) or count(following-sibling::*) = count(../iso:note) - 1])]"> -->
|
|
3251
3652
|
|
|
3653
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
3654
|
+
<xsl:if test="not(ancestor::*[local-name() = 'li' or local-name() = 'td' or local-name() = 'th' or local-name() = 'dd'])">
|
|
3655
|
+
<!-- for paragraphs in the main text -->
|
|
3656
|
+
<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
|
|
3657
|
+
</xsl:if>
|
|
3658
|
+
<xsl:if test="ancestor::iso:preface and parent::iso:clause">
|
|
3659
|
+
<xsl:attribute name="text-indent">7.1mm</xsl:attribute>
|
|
3660
|
+
</xsl:if>
|
|
3661
|
+
</xsl:if>
|
|
3662
|
+
|
|
3663
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
3664
|
+
<xsl:attribute name="line-height">1.13</xsl:attribute>
|
|
3665
|
+
<xsl:if test="parent::iso:li/following-sibling::* or parent::iso:dd">
|
|
3666
|
+
<xsl:attribute name="margin-bottom">9pt</xsl:attribute>
|
|
3667
|
+
</xsl:if>
|
|
3668
|
+
</xsl:if>
|
|
3669
|
+
|
|
3252
3670
|
<!-- put inline title in the first paragraph -->
|
|
3253
|
-
<xsl:if test="($layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
|
|
3671
|
+
<xsl:if test="($layoutVersion = '1951' or $layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989') and $layout_columns != 1">
|
|
3254
3672
|
<xsl:if test="preceding-sibling::*[1]/@inline-header = 'true' and preceding-sibling::*[1][self::iso:title]">
|
|
3255
3673
|
<xsl:attribute name="space-before">0pt</xsl:attribute>
|
|
3256
3674
|
<xsl:for-each select="preceding-sibling::*[1]">
|
|
@@ -3372,6 +3790,10 @@
|
|
|
3372
3790
|
<xsl:call-template name="insert_basic_link">
|
|
3373
3791
|
<xsl:with-param name="element">
|
|
3374
3792
|
<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
|
|
3793
|
+
<xsl:if test="$layoutVersion = '2024' and (ancestor::iso:termsource or $bibitems/*[local-name() ='bibitem'][@id = current()/@target and @type = 'standard'])">
|
|
3794
|
+
<xsl:attribute name="color">inherit</xsl:attribute>
|
|
3795
|
+
<xsl:attribute name="text-decoration">none</xsl:attribute>
|
|
3796
|
+
</xsl:if>
|
|
3375
3797
|
<xsl:choose>
|
|
3376
3798
|
<xsl:when test="@pagenumber='true'">
|
|
3377
3799
|
<fo:inline>
|
|
@@ -3381,6 +3803,20 @@
|
|
|
3381
3803
|
<fo:page-number-citation ref-id="{@target}"/>
|
|
3382
3804
|
</fo:inline>
|
|
3383
3805
|
</xsl:when>
|
|
3806
|
+
<xsl:when test="$layoutVersion = '2024' and $bibitems/*[local-name() ='bibitem'][@id = current()/@target and not(@type = 'standard')]"> <!-- if reference to bibitem -->
|
|
3807
|
+
<!-- <fo:inline baseline-shift="30%" font-size="80%"> -->
|
|
3808
|
+
<xsl:choose>
|
|
3809
|
+
<xsl:when test="contains(., '[') and contains(., ']')">
|
|
3810
|
+
<fo:inline color="black" text-decoration="none">[</fo:inline>
|
|
3811
|
+
<xsl:value-of select="translate(.,'[]','')"/>
|
|
3812
|
+
<fo:inline color="black" text-decoration="none">]</fo:inline>
|
|
3813
|
+
</xsl:when>
|
|
3814
|
+
<xsl:otherwise>
|
|
3815
|
+
<xsl:apply-templates/>
|
|
3816
|
+
</xsl:otherwise>
|
|
3817
|
+
</xsl:choose>
|
|
3818
|
+
<!-- </fo:inline> -->
|
|
3819
|
+
</xsl:when>
|
|
3384
3820
|
<xsl:otherwise>
|
|
3385
3821
|
<xsl:apply-templates/>
|
|
3386
3822
|
</xsl:otherwise>
|
|
@@ -3390,6 +3826,20 @@
|
|
|
3390
3826
|
</xsl:call-template>
|
|
3391
3827
|
</xsl:template>
|
|
3392
3828
|
|
|
3829
|
+
<xsl:template match="*[local-name()='sup'][*[local-name()='xref'][@type = 'footnote']]" priority="2">
|
|
3830
|
+
<fo:inline font-size="80%">
|
|
3831
|
+
<xsl:choose>
|
|
3832
|
+
<xsl:when test="$layoutVersion = '2024'">
|
|
3833
|
+
<xsl:attribute name="baseline-shift">20%</xsl:attribute>
|
|
3834
|
+
</xsl:when>
|
|
3835
|
+
<xsl:otherwise>
|
|
3836
|
+
<xsl:attribute name="vertical-align">super</xsl:attribute>
|
|
3837
|
+
</xsl:otherwise>
|
|
3838
|
+
</xsl:choose>
|
|
3839
|
+
<xsl:apply-templates/>
|
|
3840
|
+
</fo:inline>
|
|
3841
|
+
</xsl:template>
|
|
3842
|
+
|
|
3393
3843
|
<!-- =================== -->
|
|
3394
3844
|
<!-- End of Index processing -->
|
|
3395
3845
|
<!-- =================== -->
|
|
@@ -3512,17 +3962,32 @@
|
|
|
3512
3962
|
<xsl:template name="insertHeaderFooter">
|
|
3513
3963
|
<xsl:param name="font-weight" select="'bold'"/>
|
|
3514
3964
|
<xsl:param name="is_footer">false</xsl:param>
|
|
3965
|
+
<xsl:param name="is_header">true</xsl:param>
|
|
3966
|
+
<xsl:param name="border_around_page">false</xsl:param>
|
|
3967
|
+
<xsl:param name="insert_footer_last">true</xsl:param>
|
|
3515
3968
|
<xsl:if test="($layoutVersion = '1972' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num <= 19981231)) and $is_footer = 'true'">
|
|
3516
3969
|
<xsl:call-template name="insertFooterFirst1972_1998">
|
|
3517
3970
|
<xsl:with-param name="font-weight" select="$font-weight"/>
|
|
3518
3971
|
</xsl:call-template>
|
|
3519
3972
|
</xsl:if>
|
|
3520
|
-
<xsl:call-template name="insertHeaderEven"
|
|
3973
|
+
<xsl:call-template name="insertHeaderEven">
|
|
3974
|
+
<xsl:with-param name="border_around_page" select="$border_around_page"/>
|
|
3975
|
+
<xsl:with-param name="is_header" select="$is_header"/>
|
|
3976
|
+
</xsl:call-template>
|
|
3521
3977
|
<xsl:call-template name="insertFooterEven">
|
|
3522
3978
|
<xsl:with-param name="font-weight" select="$font-weight"/>
|
|
3979
|
+
<xsl:with-param name="insert_footer_last" select="$insert_footer_last"/>
|
|
3980
|
+
</xsl:call-template>
|
|
3981
|
+
<xsl:choose>
|
|
3982
|
+
<xsl:when test="$layoutVersion = '1951'"/>
|
|
3983
|
+
<xsl:when test="not($layoutVersion = '1987' and $doctype = 'technical-report')">
|
|
3984
|
+
<xsl:call-template name="insertHeaderFirst"/>
|
|
3985
|
+
</xsl:when>
|
|
3986
|
+
</xsl:choose>
|
|
3987
|
+
<xsl:call-template name="insertHeaderOdd">
|
|
3988
|
+
<xsl:with-param name="border_around_page" select="$border_around_page"/>
|
|
3989
|
+
<xsl:with-param name="is_header" select="$is_header"/>
|
|
3523
3990
|
</xsl:call-template>
|
|
3524
|
-
<xsl:call-template name="insertHeaderFirst"/>
|
|
3525
|
-
<xsl:call-template name="insertHeaderOdd"/>
|
|
3526
3991
|
<xsl:call-template name="insertFooterOdd">
|
|
3527
3992
|
<xsl:with-param name="font-weight" select="$font-weight"/>
|
|
3528
3993
|
</xsl:call-template>
|
|
@@ -3534,11 +3999,26 @@
|
|
|
3534
3999
|
</xsl:choose>
|
|
3535
4000
|
</xsl:variable>
|
|
3536
4001
|
<xsl:template name="insertHeaderEven">
|
|
4002
|
+
<xsl:param name="is_header">true</xsl:param>
|
|
4003
|
+
<xsl:param name="border_around_page">false</xsl:param>
|
|
3537
4004
|
<fo:static-content flow-name="header-even" role="artifact">
|
|
4005
|
+
<xsl:if test="$layoutVersion = '1951' and $border_around_page = 'true'">
|
|
4006
|
+
<!-- box around page -->
|
|
4007
|
+
<fo:block-container position="absolute" left="16.5mm" top="10mm" height="271.5mm" width="170mm" border="1.25pt solid black" role="SKIP">
|
|
4008
|
+
<fo:block> </fo:block>
|
|
4009
|
+
</fo:block-container>
|
|
4010
|
+
</xsl:if>
|
|
3538
4011
|
<fo:block-container height="24mm" display-align="before">
|
|
4012
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
4013
|
+
<xsl:attribute name="height">23mm</xsl:attribute>
|
|
4014
|
+
</xsl:if>
|
|
3539
4015
|
<fo:block font-size="{$font-size_header}" font-weight="bold" padding-top="12.5mm" line-height="1.1">
|
|
3540
|
-
<xsl:call-template name="
|
|
3541
|
-
|
|
4016
|
+
<xsl:call-template name="insertLayoutVersionAttributesTop">
|
|
4017
|
+
<xsl:with-param name="odd_or_even">even</xsl:with-param>
|
|
4018
|
+
</xsl:call-template>
|
|
4019
|
+
<xsl:if test="$is_header = 'true'">
|
|
4020
|
+
<xsl:value-of select="$ISOnumber"/>
|
|
4021
|
+
</xsl:if>
|
|
3542
4022
|
</fo:block>
|
|
3543
4023
|
</fo:block-container>
|
|
3544
4024
|
</fo:static-content>
|
|
@@ -3549,7 +4029,7 @@
|
|
|
3549
4029
|
<xsl:when test="$stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'DAmd' or $stage-abbreviation = 'DAM'">
|
|
3550
4030
|
<fo:block-container height="24mm" display-align="before">
|
|
3551
4031
|
<fo:block font-size="{$font-size_header}" font-weight="bold" text-align="right" padding-top="12.5mm" line-height="1.1">
|
|
3552
|
-
<xsl:call-template name="
|
|
4032
|
+
<xsl:call-template name="insertLayoutVersionAttributesTop"/>
|
|
3553
4033
|
<xsl:value-of select="$ISOnumber"/>
|
|
3554
4034
|
</fo:block>
|
|
3555
4035
|
</fo:block-container>
|
|
@@ -3561,6 +4041,7 @@
|
|
|
3561
4041
|
<xsl:attribute name="border-bottom">0.5mm solid black</xsl:attribute>
|
|
3562
4042
|
</xsl:if>
|
|
3563
4043
|
<xsl:if test=" $layoutVersion = '2024'">
|
|
4044
|
+
<xsl:attribute name="width">180mm</xsl:attribute>
|
|
3564
4045
|
<xsl:attribute name="border-top">0.8mm solid black</xsl:attribute>
|
|
3565
4046
|
<xsl:attribute name="border-bottom">0.8mm solid black</xsl:attribute>
|
|
3566
4047
|
</xsl:if>
|
|
@@ -3586,6 +4067,9 @@
|
|
|
3586
4067
|
<fo:table-column column-width="50%"/>
|
|
3587
4068
|
<fo:table-body>
|
|
3588
4069
|
<fo:table-row display-align="center" height="9mm">
|
|
4070
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
4071
|
+
<xsl:attribute name="height">8.5mm</xsl:attribute>
|
|
4072
|
+
</xsl:if>
|
|
3589
4073
|
<fo:table-cell>
|
|
3590
4074
|
<fo:block>
|
|
3591
4075
|
<xsl:choose>
|
|
@@ -3617,11 +4101,26 @@
|
|
|
3617
4101
|
</fo:static-content>
|
|
3618
4102
|
</xsl:template>
|
|
3619
4103
|
<xsl:template name="insertHeaderOdd">
|
|
4104
|
+
<xsl:param name="is_header">true</xsl:param>
|
|
4105
|
+
<xsl:param name="border_around_page">false</xsl:param>
|
|
3620
4106
|
<fo:static-content flow-name="header-odd" role="artifact">
|
|
4107
|
+
<xsl:if test="$layoutVersion = '1951' and $border_around_page = 'true'">
|
|
4108
|
+
<!-- box around page -->
|
|
4109
|
+
<fo:block-container position="absolute" left="23.5mm" top="10mm" height="271.5mm" width="170mm" border="1.25pt solid black" role="SKIP">
|
|
4110
|
+
<fo:block> </fo:block>
|
|
4111
|
+
</fo:block-container>
|
|
4112
|
+
</xsl:if>
|
|
3621
4113
|
<fo:block-container height="24mm" display-align="before">
|
|
4114
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
4115
|
+
<xsl:attribute name="height">23mm</xsl:attribute>
|
|
4116
|
+
</xsl:if>
|
|
3622
4117
|
<fo:block font-size="{$font-size_header}" font-weight="bold" text-align="right" padding-top="12.5mm" line-height="1.1">
|
|
3623
|
-
<xsl:call-template name="
|
|
3624
|
-
|
|
4118
|
+
<xsl:call-template name="insertLayoutVersionAttributesTop">
|
|
4119
|
+
<xsl:with-param name="odd_or_even">odd</xsl:with-param>
|
|
4120
|
+
</xsl:call-template>
|
|
4121
|
+
<xsl:if test="$is_header = 'true'">
|
|
4122
|
+
<xsl:value-of select="$ISOnumber"/>
|
|
4123
|
+
</xsl:if>
|
|
3625
4124
|
</fo:block>
|
|
3626
4125
|
</fo:block-container>
|
|
3627
4126
|
</fo:static-content>
|
|
@@ -3677,9 +4176,13 @@
|
|
|
3677
4176
|
</xsl:template>
|
|
3678
4177
|
<xsl:template name="insertFooterEven">
|
|
3679
4178
|
<xsl:param name="font-weight" select="'bold'"/>
|
|
4179
|
+
<xsl:param name="insert_footer_last">true</xsl:param>
|
|
3680
4180
|
<fo:static-content flow-name="footer-even" role="artifact">
|
|
3681
4181
|
<fo:block-container>
|
|
3682
4182
|
<xsl:choose>
|
|
4183
|
+
<xsl:when test="$layoutVersion = '1951'">
|
|
4184
|
+
<xsl:call-template name="insertFooter1951"/>
|
|
4185
|
+
</xsl:when>
|
|
3683
4186
|
<xsl:when test="$layoutVersion = '2024'">
|
|
3684
4187
|
<xsl:call-template name="insertFooter2024">
|
|
3685
4188
|
<xsl:with-param name="font-weight" select="$font-weight"/>
|
|
@@ -3720,12 +4223,25 @@
|
|
|
3720
4223
|
</xsl:choose>
|
|
3721
4224
|
</fo:block-container>
|
|
3722
4225
|
</fo:static-content>
|
|
4226
|
+
<!-- for layout 1951 only -->
|
|
4227
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
4228
|
+
<fo:static-content flow-name="footer-even-last" role="artifact">
|
|
4229
|
+
<fo:block-container>
|
|
4230
|
+
<xsl:call-template name="insertFooter1951">
|
|
4231
|
+
<xsl:with-param name="insert_footer_last" select="$insert_footer_last"/>
|
|
4232
|
+
</xsl:call-template>
|
|
4233
|
+
</fo:block-container>
|
|
4234
|
+
</fo:static-content>
|
|
4235
|
+
</xsl:if>
|
|
3723
4236
|
</xsl:template>
|
|
3724
4237
|
<xsl:template name="insertFooterOdd">
|
|
3725
4238
|
<xsl:param name="font-weight" select="'bold'"/>
|
|
3726
4239
|
<fo:static-content flow-name="footer-odd" role="artifact">
|
|
3727
4240
|
<fo:block-container>
|
|
3728
4241
|
<xsl:choose>
|
|
4242
|
+
<xsl:when test="$layoutVersion = '1951'">
|
|
4243
|
+
<xsl:call-template name="insertFooter1951"/>
|
|
4244
|
+
</xsl:when>
|
|
3729
4245
|
<xsl:when test="$layoutVersion = '2024'">
|
|
3730
4246
|
<xsl:call-template name="insertFooter2024">
|
|
3731
4247
|
<xsl:with-param name="font-weight" select="$font-weight"/>
|
|
@@ -3767,32 +4283,87 @@
|
|
|
3767
4283
|
</fo:block-container>
|
|
3768
4284
|
</fo:static-content>
|
|
3769
4285
|
</xsl:template>
|
|
4286
|
+
<xsl:template name="insertFooter1951">
|
|
4287
|
+
<xsl:param name="insert_footer_last">false</xsl:param>
|
|
4288
|
+
<xsl:attribute name="height"><xsl:value-of select="$marginBottom - 2"/>mm</xsl:attribute>
|
|
4289
|
+
<xsl:attribute name="display-align">after</xsl:attribute>
|
|
4290
|
+
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
4291
|
+
<fo:block-container margin-left="-13mm" margin-right="-13mm">
|
|
4292
|
+
<fo:block-container margin-left="0mm" margin-right="0mm">
|
|
4293
|
+
<fo:table table-layout="fixed" width="100%" margin-bottom="8mm">
|
|
4294
|
+
<fo:table-column column-width="proportional-column-width(35)"/>
|
|
4295
|
+
<fo:table-column column-width="proportional-column-width(100)"/>
|
|
4296
|
+
<fo:table-column column-width="proportional-column-width(35)"/>
|
|
4297
|
+
<fo:table-body>
|
|
4298
|
+
<fo:table-row>
|
|
4299
|
+
<fo:table-cell font-size="8pt">
|
|
4300
|
+
<fo:block line-height="1" margin-top="2mm">
|
|
4301
|
+
<xsl:variable name="date_first_printing" select="normalize-space(/iso:iso-standard/iso:metanorma-extension/iso:presentation-metadata/iso:first-printing-date)"/>
|
|
4302
|
+
<xsl:if test="$insert_footer_last = 'true' and $date_first_printing != ''">
|
|
4303
|
+
<fo:block><xsl:value-of select="$i18n_date_first_printing"/>:</fo:block>
|
|
4304
|
+
<fo:block>
|
|
4305
|
+
<!-- Example: December 1965 -->
|
|
4306
|
+
<xsl:call-template name="convertDate">
|
|
4307
|
+
<xsl:with-param name="date" select="$date_first_printing"/>
|
|
4308
|
+
</xsl:call-template>
|
|
4309
|
+
</fo:block>
|
|
4310
|
+
</xsl:if>
|
|
4311
|
+
</fo:block>
|
|
4312
|
+
</fo:table-cell>
|
|
4313
|
+
<fo:table-cell>
|
|
4314
|
+
<fo:block font-size="9.5pt" font-weight="bold"><xsl:value-of select="$em_dash"/> <fo:page-number/> <xsl:value-of select="$em_dash"/></fo:block>
|
|
4315
|
+
</fo:table-cell>
|
|
4316
|
+
<fo:table-cell>
|
|
4317
|
+
<fo:block font-size="8.5pt" text-align="right" font-weight="bold">
|
|
4318
|
+
<xsl:variable name="price_" select="normalize-space(/iso:iso-standard/iso:metanorma-extension/iso:presentation-metadata/iso:price)"/>
|
|
4319
|
+
<xsl:variable name="price" select="java:replaceAll(java:java.lang.String.new($price_), '-{2}', $em_dash)"/>
|
|
4320
|
+
<xsl:if test="$insert_footer_last = 'true' and $price != ''">
|
|
4321
|
+
<!-- Example: Price: Sw. fr. 3.- -->
|
|
4322
|
+
<xsl:value-of select="concat($i18n_price, ': ', $price)"/>
|
|
4323
|
+
</xsl:if>
|
|
4324
|
+
</fo:block>
|
|
4325
|
+
</fo:table-cell>
|
|
4326
|
+
</fo:table-row>
|
|
4327
|
+
</fo:table-body>
|
|
4328
|
+
</fo:table>
|
|
4329
|
+
</fo:block-container>
|
|
4330
|
+
</fo:block-container>
|
|
4331
|
+
</xsl:template>
|
|
3770
4332
|
<xsl:template name="insertFooter2024">
|
|
3771
4333
|
<xsl:param name="font-weight" select="'bold'"/>
|
|
3772
4334
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
3773
|
-
<
|
|
3774
|
-
|
|
4335
|
+
<xsl:attribute name="line-height">1.1</xsl:attribute>
|
|
4336
|
+
<fo:block font-size="9pt">
|
|
4337
|
+
<!-- <xsl:call-template name="insertInterFont"/> -->
|
|
3775
4338
|
<xsl:value-of select="$copyrightText"/>
|
|
3776
4339
|
</fo:block>
|
|
3777
4340
|
<xsl:if test="$copyrightAbbrIEEE = ''"><fo:block> </fo:block></xsl:if>
|
|
3778
4341
|
<fo:block font-size="11pt" font-weight="{$font-weight}"><fo:page-number/></fo:block>
|
|
3779
4342
|
</xsl:template>
|
|
3780
|
-
<xsl:template name="
|
|
4343
|
+
<xsl:template name="insertLayoutVersionAttributesTop">
|
|
4344
|
+
<xsl:param name="odd_or_even"/>
|
|
4345
|
+
<xsl:if test="$layoutVersion = '1951'">
|
|
4346
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
|
4347
|
+
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
|
4348
|
+
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
4349
|
+
<xsl:attribute name="padding-top">5mm</xsl:attribute>
|
|
4350
|
+
<xsl:if test="$odd_or_even = 'odd'">
|
|
4351
|
+
<xsl:attribute name="margin-right">16.5mm</xsl:attribute>
|
|
4352
|
+
</xsl:if>
|
|
4353
|
+
<xsl:if test="$odd_or_even = 'even'">
|
|
4354
|
+
<xsl:attribute name="margin-right">23.5mm</xsl:attribute>
|
|
4355
|
+
</xsl:if>
|
|
4356
|
+
</xsl:if>
|
|
3781
4357
|
<xsl:if test="$layoutVersion = '2024'">
|
|
3782
|
-
<xsl:attribute name="font-size">11.5pt</xsl:attribute>
|
|
3783
|
-
<xsl:attribute name="padding-top">
|
|
4358
|
+
<!-- <xsl:attribute name="font-size">11.5pt</xsl:attribute> -->
|
|
4359
|
+
<xsl:attribute name="padding-top">12.2mm</xsl:attribute>
|
|
3784
4360
|
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
3785
4361
|
</xsl:if>
|
|
3786
4362
|
</xsl:template>
|
|
3787
4363
|
|
|
3788
|
-
<xsl:variable name="price_based_on">
|
|
3789
|
-
<xsl:call-template name="getLocalizedString">
|
|
3790
|
-
<xsl:with-param name="key">price_based_on</xsl:with-param>
|
|
3791
|
-
</xsl:call-template>
|
|
3792
|
-
</xsl:variable>
|
|
3793
4364
|
<xsl:variable name="price_based_on_items">
|
|
3794
4365
|
<xsl:call-template name="split">
|
|
3795
|
-
<xsl:with-param name="pText" select="$
|
|
4366
|
+
<xsl:with-param name="pText" select="$i18n_price_based_on"/>
|
|
3796
4367
|
<xsl:with-param name="sep" select="'%'"/>
|
|
3797
4368
|
<xsl:with-param name="normalize-space">false</xsl:with-param>
|
|
3798
4369
|
</xsl:call-template>
|
|
@@ -3880,12 +4451,7 @@
|
|
|
3880
4451
|
</fo:block>
|
|
3881
4452
|
<xsl:if test="/iso:iso-standard/iso:bibdata/iso:keyword">
|
|
3882
4453
|
<fo:block font-size="{$font-size_footer_copyright}" margin-bottom="6pt">
|
|
3883
|
-
<
|
|
3884
|
-
<xsl:call-template name="getLocalizedString">
|
|
3885
|
-
<xsl:with-param name="key">Descriptor.pl</xsl:with-param>
|
|
3886
|
-
</xsl:call-template>
|
|
3887
|
-
</xsl:variable>
|
|
3888
|
-
<fo:inline font-weight="bold"><xsl:value-of select="$title-descriptors"/>: </fo:inline>
|
|
4454
|
+
<fo:inline font-weight="bold"><xsl:value-of select="$i18n_descriptors"/>: </fo:inline>
|
|
3889
4455
|
<xsl:call-template name="insertKeywords">
|
|
3890
4456
|
<xsl:with-param name="sorting">no</xsl:with-param>
|
|
3891
4457
|
</xsl:call-template>
|
|
@@ -3920,14 +4486,14 @@
|
|
|
3920
4486
|
<xsl:template name="insertLastPage_2024">
|
|
3921
4487
|
<fo:page-sequence master-reference="last-page_2024" force-page-count="no-force">
|
|
3922
4488
|
<fo:flow flow-name="xsl-region-body">
|
|
3923
|
-
<fo:table table-layout="fixed" width="100%">
|
|
4489
|
+
<fo:table table-layout="fixed" width="100%" margin-bottom="-1mm">
|
|
3924
4490
|
<xsl:call-template name="insertInterFont"/>
|
|
3925
|
-
<fo:table-column column-width="proportional-column-width(
|
|
3926
|
-
<fo:table-column column-width="proportional-column-width(1.
|
|
3927
|
-
<fo:table-column column-width="proportional-column-width(1.
|
|
3928
|
-
<fo:table-column column-width="proportional-column-width(
|
|
4491
|
+
<fo:table-column column-width="proportional-column-width(73)"/>
|
|
4492
|
+
<fo:table-column column-width="proportional-column-width(1.45)"/>
|
|
4493
|
+
<fo:table-column column-width="proportional-column-width(1.45)"/>
|
|
4494
|
+
<fo:table-column column-width="proportional-column-width(114.3)"/>
|
|
3929
4495
|
<fo:table-body>
|
|
3930
|
-
<fo:table-row height="
|
|
4496
|
+
<fo:table-row height="91.8mm">
|
|
3931
4497
|
<fo:table-cell number-columns-spanned="2" border-right="{$cover_page_border}">
|
|
3932
4498
|
<fo:block>
|
|
3933
4499
|
<xsl:call-template name="insertLogoImages2024"/>
|
|
@@ -3943,9 +4509,9 @@
|
|
|
3943
4509
|
<fo:table-row height="2mm" font-size="0pt">
|
|
3944
4510
|
<fo:table-cell number-columns-spanned="4"><fo:block> </fo:block></fo:table-cell>
|
|
3945
4511
|
</fo:table-row>
|
|
3946
|
-
<fo:table-row height="
|
|
4512
|
+
<fo:table-row height="182mm"> <!-- 174 -->
|
|
3947
4513
|
<fo:table-cell number-columns-spanned="2" display-align="after" border-right="{$cover_page_border}">
|
|
3948
|
-
<fo:block font-size="
|
|
4514
|
+
<fo:block font-size="12pt" font-weight="bold">
|
|
3949
4515
|
<xsl:for-each select="/iso:iso-standard/iso:bibdata/iso:ext/iso:ics/iso:code">
|
|
3950
4516
|
<xsl:if test="position() = 1"><fo:inline>ICS </fo:inline></xsl:if>
|
|
3951
4517
|
<xsl:value-of select="."/>
|
|
@@ -3954,7 +4520,7 @@
|
|
|
3954
4520
|
</fo:block>
|
|
3955
4521
|
|
|
3956
4522
|
<!-- Price based on ... pages -->
|
|
3957
|
-
<fo:block font-size="
|
|
4523
|
+
<fo:block font-size="9pt" space-before="2pt">
|
|
3958
4524
|
<fo:block>
|
|
3959
4525
|
<xsl:for-each select="xalan:nodeset($price_based_on_items)/item">
|
|
3960
4526
|
<xsl:value-of select="."/>
|
|
@@ -3963,11 +4529,11 @@
|
|
|
3963
4529
|
</xsl:if>
|
|
3964
4530
|
</xsl:for-each>
|
|
3965
4531
|
</fo:block>
|
|
3966
|
-
<fo:block margin-top="
|
|
4532
|
+
<fo:block margin-top="18pt" margin-bottom="-1mm" line-height="1.1"><xsl:value-of select="$copyrightTextLastPage2024"/></fo:block>
|
|
3967
4533
|
</fo:block>
|
|
3968
4534
|
</fo:table-cell>
|
|
3969
4535
|
<fo:table-cell number-columns-spanned="2" text-align="right" display-align="after">
|
|
3970
|
-
<fo:block font-size="
|
|
4536
|
+
<fo:block font-size="16pt" font-weight="bold" margin-bottom="1mm" margin-right="1.5mm">
|
|
3971
4537
|
<xsl:if test="$stage >=60">
|
|
3972
4538
|
<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
|
|
3973
4539
|
</xsl:if>
|
|
@@ -4277,7 +4843,8 @@
|
|
|
4277
4843
|
<xsl:variable name="marginLeftRight1_">
|
|
4278
4844
|
|
|
4279
4845
|
<xsl:choose>
|
|
4280
|
-
<xsl:when test="$layoutVersion = '
|
|
4846
|
+
<xsl:when test="$layoutVersion = '1951'">36</xsl:when>
|
|
4847
|
+
<xsl:when test="$layoutVersion = '2024'">15.2</xsl:when>
|
|
4281
4848
|
<xsl:otherwise>25</xsl:otherwise>
|
|
4282
4849
|
</xsl:choose>
|
|
4283
4850
|
|
|
@@ -4287,7 +4854,8 @@
|
|
|
4287
4854
|
<xsl:variable name="marginLeftRight2_">
|
|
4288
4855
|
|
|
4289
4856
|
<xsl:choose>
|
|
4290
|
-
<xsl:when test="$layoutVersion = '
|
|
4857
|
+
<xsl:when test="$layoutVersion = '1951'">29</xsl:when>
|
|
4858
|
+
<xsl:when test="$layoutVersion = '2024'">15.2</xsl:when>
|
|
4291
4859
|
<xsl:otherwise>12.5</xsl:otherwise>
|
|
4292
4860
|
</xsl:choose>
|
|
4293
4861
|
|
|
@@ -4295,14 +4863,20 @@
|
|
|
4295
4863
|
<xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
|
|
4296
4864
|
|
|
4297
4865
|
<xsl:variable name="marginTop_">
|
|
4298
|
-
|
|
4866
|
+
|
|
4867
|
+
<xsl:choose>
|
|
4868
|
+
<xsl:when test="$layoutVersion = '2024'">23.5</xsl:when>
|
|
4869
|
+
<xsl:otherwise>27.4</xsl:otherwise>
|
|
4870
|
+
</xsl:choose>
|
|
4871
|
+
|
|
4299
4872
|
</xsl:variable>
|
|
4300
4873
|
<xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
|
|
4301
4874
|
|
|
4302
4875
|
<xsl:variable name="marginBottom_">
|
|
4303
4876
|
|
|
4304
4877
|
<xsl:choose>
|
|
4305
|
-
<xsl:when test="$layoutVersion = '
|
|
4878
|
+
<xsl:when test="$layoutVersion = '1951'">25.5</xsl:when>
|
|
4879
|
+
<xsl:when test="$layoutVersion = '2024'">19.5</xsl:when>
|
|
4306
4880
|
<xsl:otherwise>15</xsl:otherwise>
|
|
4307
4881
|
</xsl:choose>
|
|
4308
4882
|
|
|
@@ -4410,6 +4984,7 @@
|
|
|
4410
4984
|
<xsl:variable name="zero_width_space"></xsl:variable>
|
|
4411
4985
|
<xsl:variable name="hair_space"> </xsl:variable>
|
|
4412
4986
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
4987
|
+
<xsl:variable name="em_dash">—</xsl:variable>
|
|
4413
4988
|
|
|
4414
4989
|
<xsl:template name="getTitle">
|
|
4415
4990
|
<xsl:param name="name"/>
|
|
@@ -4606,6 +5181,11 @@
|
|
|
4606
5181
|
|
|
4607
5182
|
<xsl:template name="refine_link-style">
|
|
4608
5183
|
|
|
5184
|
+
<xsl:if test="(ancestor::*[local-name() = 'copyright-statement'] and contains(@target, 'mailto:')) or ($layoutVersion = '2024' and ancestor::iso:termsource)">
|
|
5185
|
+
<xsl:attribute name="color">inherit</xsl:attribute>
|
|
5186
|
+
<xsl:attribute name="text-decoration">none</xsl:attribute>
|
|
5187
|
+
</xsl:if>
|
|
5188
|
+
|
|
4609
5189
|
</xsl:template> <!-- refine_link-style -->
|
|
4610
5190
|
|
|
4611
5191
|
<xsl:attribute-set name="sourcecode-container-style">
|
|
@@ -4750,6 +5330,14 @@
|
|
|
4750
5330
|
|
|
4751
5331
|
</xsl:attribute-set> <!-- example-name-style -->
|
|
4752
5332
|
|
|
5333
|
+
<xsl:template name="refine_example-name-style">
|
|
5334
|
+
|
|
5335
|
+
<xsl:if test="$layoutVersion = '2024' and translate(.,'0123456789','') = ."> <!-- EXAMPLE without number -->
|
|
5336
|
+
<xsl:attribute name="padding-right">8mm</xsl:attribute>
|
|
5337
|
+
</xsl:if>
|
|
5338
|
+
|
|
5339
|
+
</xsl:template>
|
|
5340
|
+
|
|
4753
5341
|
<xsl:attribute-set name="example-p-style">
|
|
4754
5342
|
|
|
4755
5343
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
@@ -4770,6 +5358,14 @@
|
|
|
4770
5358
|
|
|
4771
5359
|
</xsl:attribute-set> <!-- termexample-name-style -->
|
|
4772
5360
|
|
|
5361
|
+
<xsl:template name="refine_termexample-name-style">
|
|
5362
|
+
|
|
5363
|
+
<xsl:if test="$layoutVersion = '2024' and translate(.,'0123456789','') = ."> <!-- EXAMPLE without number -->
|
|
5364
|
+
<xsl:attribute name="padding-right">8mm</xsl:attribute>
|
|
5365
|
+
</xsl:if>
|
|
5366
|
+
|
|
5367
|
+
</xsl:template>
|
|
5368
|
+
|
|
4773
5369
|
<!-- ========================== -->
|
|
4774
5370
|
<!-- Table styles -->
|
|
4775
5371
|
<!-- ========================== -->
|
|
@@ -4808,8 +5404,6 @@
|
|
|
4808
5404
|
<xsl:if test="normalize-space(@width) != 'text-width'">
|
|
4809
5405
|
<xsl:attribute name="span">all</xsl:attribute>
|
|
4810
5406
|
</xsl:if>
|
|
4811
|
-
</xsl:if>
|
|
4812
|
-
<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
4813
5407
|
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
4814
5408
|
</xsl:if>
|
|
4815
5409
|
|
|
@@ -4861,9 +5455,6 @@
|
|
|
4861
5455
|
<xsl:attribute name="span">all</xsl:attribute>
|
|
4862
5456
|
</xsl:if>
|
|
4863
5457
|
</xsl:if>
|
|
4864
|
-
<xsl:if test="$layoutVersion = '2024'">
|
|
4865
|
-
<xsl:attribute name="font-size">10.5pt</xsl:attribute>
|
|
4866
|
-
</xsl:if>
|
|
4867
5458
|
|
|
4868
5459
|
</xsl:template> <!-- refine_table-name-style -->
|
|
4869
5460
|
|
|
@@ -4942,6 +5533,10 @@
|
|
|
4942
5533
|
<xsl:attribute name="border-top"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
|
|
4943
5534
|
<xsl:attribute name="border-bottom"><xsl:value-of select="$table-cell-border"/></xsl:attribute>
|
|
4944
5535
|
</xsl:if>
|
|
5536
|
+
<!-- vertical table header -->
|
|
5537
|
+
<xsl:if test="ancestor::*[local-name() = 'tbody'] and not(following-sibling::*[local-name() = 'th'])">
|
|
5538
|
+
<xsl:attribute name="border-right"><xsl:value-of select="$table-border"/></xsl:attribute>
|
|
5539
|
+
</xsl:if>
|
|
4945
5540
|
|
|
4946
5541
|
<xsl:call-template name="setBordersTableArray"/>
|
|
4947
5542
|
|
|
@@ -4999,6 +5594,10 @@
|
|
|
4999
5594
|
|
|
5000
5595
|
<xsl:template name="refine_table-footer-cell-style">
|
|
5001
5596
|
|
|
5597
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
5598
|
+
<xsl:attribute name="border-top"><xsl:value-of select="$table-border"/></xsl:attribute>
|
|
5599
|
+
</xsl:if>
|
|
5600
|
+
|
|
5002
5601
|
</xsl:template> <!-- refine_table-footer-cell-style -->
|
|
5003
5602
|
|
|
5004
5603
|
<xsl:attribute-set name="table-note-style">
|
|
@@ -5022,6 +5621,17 @@
|
|
|
5022
5621
|
|
|
5023
5622
|
</xsl:attribute-set> <!-- table-fn-style -->
|
|
5024
5623
|
|
|
5624
|
+
<xsl:template name="refine_table-fn-style">
|
|
5625
|
+
|
|
5626
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
5627
|
+
<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
|
|
5628
|
+
<xsl:if test="position() = last()">
|
|
5629
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
5630
|
+
</xsl:if>
|
|
5631
|
+
</xsl:if>
|
|
5632
|
+
|
|
5633
|
+
</xsl:template>
|
|
5634
|
+
|
|
5025
5635
|
<xsl:attribute-set name="table-fn-number-style">
|
|
5026
5636
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
|
5027
5637
|
<xsl:attribute name="padding-right">5mm</xsl:attribute>
|
|
@@ -5030,6 +5640,15 @@
|
|
|
5030
5640
|
|
|
5031
5641
|
</xsl:attribute-set> <!-- table-fn-number-style -->
|
|
5032
5642
|
|
|
5643
|
+
<xsl:template name="refine_table-fn-number-style">
|
|
5644
|
+
|
|
5645
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
5646
|
+
<xsl:attribute name="alignment-baseline">auto</xsl:attribute>
|
|
5647
|
+
<xsl:attribute name="baseline-shift">15%</xsl:attribute>
|
|
5648
|
+
</xsl:if>
|
|
5649
|
+
|
|
5650
|
+
</xsl:template>
|
|
5651
|
+
|
|
5033
5652
|
<xsl:attribute-set name="fn-container-body-style">
|
|
5034
5653
|
<xsl:attribute name="text-indent">0</xsl:attribute>
|
|
5035
5654
|
<xsl:attribute name="start-indent">0</xsl:attribute>
|
|
@@ -5085,6 +5704,10 @@
|
|
|
5085
5704
|
|
|
5086
5705
|
<xsl:template name="refine_dt-block-style">
|
|
5087
5706
|
|
|
5707
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
5708
|
+
<xsl:attribute name="margin-bottom">9pt</xsl:attribute>
|
|
5709
|
+
</xsl:if>
|
|
5710
|
+
|
|
5088
5711
|
</xsl:template> <!-- refine_dt-block-style -->
|
|
5089
5712
|
|
|
5090
5713
|
<xsl:attribute-set name="dl-name-style">
|
|
@@ -5156,6 +5779,14 @@
|
|
|
5156
5779
|
<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
5157
5780
|
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
5158
5781
|
</xsl:if>
|
|
5782
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
5783
|
+
<xsl:if test="ancestor::*[local-name() = 'li'] and not(following-sibling::*)">
|
|
5784
|
+
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
|
5785
|
+
</xsl:if>
|
|
5786
|
+
<xsl:if test="preceding-sibling::*[1][local-name() = 'table']">
|
|
5787
|
+
<xsl:attribute name="margin-top">0pt</xsl:attribute>
|
|
5788
|
+
</xsl:if>
|
|
5789
|
+
</xsl:if>
|
|
5159
5790
|
<xsl:if test="$doctype = 'amendment' and parent::*[local-name() = 'quote']">
|
|
5160
5791
|
<xsl:attribute name="font-size">inherit</xsl:attribute>
|
|
5161
5792
|
</xsl:if>
|
|
@@ -5173,6 +5804,11 @@
|
|
|
5173
5804
|
|
|
5174
5805
|
<xsl:template name="refine_note-name-style">
|
|
5175
5806
|
|
|
5807
|
+
<xsl:variable name="note_name" select="*[local-name() = 'name']"/>
|
|
5808
|
+
<xsl:if test="$layoutVersion = '2024' and translate($note_name,'0123456789','') = $note_name"> <!-- NOTE without number -->
|
|
5809
|
+
<xsl:attribute name="padding-right">8mm</xsl:attribute>
|
|
5810
|
+
</xsl:if>
|
|
5811
|
+
|
|
5176
5812
|
</xsl:template> <!-- refine_note-name-style -->
|
|
5177
5813
|
|
|
5178
5814
|
<xsl:attribute-set name="table-note-name-style">
|
|
@@ -5291,6 +5927,9 @@
|
|
|
5291
5927
|
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
5292
5928
|
</xsl:if>
|
|
5293
5929
|
</xsl:if>
|
|
5930
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
5931
|
+
<xsl:attribute name="space-after">18pt</xsl:attribute>
|
|
5932
|
+
</xsl:if>
|
|
5294
5933
|
|
|
5295
5934
|
</xsl:template>
|
|
5296
5935
|
|
|
@@ -5495,6 +6134,8 @@
|
|
|
5495
6134
|
|
|
5496
6135
|
<xsl:attribute-set name="list-item-body-style">
|
|
5497
6136
|
|
|
6137
|
+
<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
|
|
6138
|
+
|
|
5498
6139
|
</xsl:attribute-set>
|
|
5499
6140
|
|
|
5500
6141
|
<xsl:template name="refine_list-item-body-style">
|
|
@@ -5528,7 +6169,8 @@
|
|
|
5528
6169
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
5529
6170
|
|
|
5530
6171
|
<xsl:attribute name="font-size">80%</xsl:attribute>
|
|
5531
|
-
|
|
6172
|
+
<!--<xsl:attribute name="vertical-align">super</xsl:attribute> -->
|
|
6173
|
+
<xsl:attribute name="baseline-shift">30%</xsl:attribute>
|
|
5532
6174
|
|
|
5533
6175
|
</xsl:attribute-set>
|
|
5534
6176
|
|
|
@@ -5548,6 +6190,9 @@
|
|
|
5548
6190
|
<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1987' or $layoutVersion = '1989'">
|
|
5549
6191
|
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
5550
6192
|
</xsl:if>
|
|
6193
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
6194
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
6195
|
+
</xsl:if>
|
|
5551
6196
|
|
|
5552
6197
|
</xsl:template> <!-- refine_fn-body-style -->
|
|
5553
6198
|
|
|
@@ -6381,6 +7026,12 @@
|
|
|
6381
7026
|
<!-- centered table when table name is centered (see table-name-style) -->
|
|
6382
7027
|
|
|
6383
7028
|
<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
|
|
7029
|
+
|
|
7030
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
7031
|
+
<xsl:attribute name="margin-top">12pt</xsl:attribute>
|
|
7032
|
+
<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
|
|
7033
|
+
</xsl:if>
|
|
7034
|
+
|
|
6384
7035
|
<fo:table-column column-width="proportional-column-width(1)"/>
|
|
6385
7036
|
<fo:table-column column-width="{@width}"/>
|
|
6386
7037
|
<fo:table-column column-width="proportional-column-width(1)"/>
|
|
@@ -7379,6 +8030,10 @@
|
|
|
7379
8030
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
7380
8031
|
</xsl:if>
|
|
7381
8032
|
|
|
8033
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
8034
|
+
<xsl:attribute name="font-size">70%</xsl:attribute>
|
|
8035
|
+
</xsl:if>
|
|
8036
|
+
|
|
7382
8037
|
<xsl:call-template name="insert_basic_link">
|
|
7383
8038
|
<xsl:with-param name="element">
|
|
7384
8039
|
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
|
|
@@ -7497,8 +8152,9 @@
|
|
|
7497
8152
|
<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
|
|
7498
8153
|
|
|
7499
8154
|
<fo:block xsl:use-attribute-sets="table-fn-style">
|
|
7500
|
-
|
|
8155
|
+
<xsl:call-template name="refine_table-fn-style"/>
|
|
7501
8156
|
<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
|
|
8157
|
+
<xsl:call-template name="refine_table-fn-number-style"/>
|
|
7502
8158
|
|
|
7503
8159
|
<xsl:value-of select="@reference"/>
|
|
7504
8160
|
|
|
@@ -8660,12 +9316,23 @@
|
|
|
8660
9316
|
</xsl:template>
|
|
8661
9317
|
|
|
8662
9318
|
<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
|
|
8663
|
-
<xsl:variable name="text" select="normalize-space(.)"/>
|
|
8664
|
-
<
|
|
9319
|
+
<!-- <xsl:variable name="text" select="normalize-space(.)"/> --> <!-- https://github.com/metanorma/metanorma-iso/issues/1115 -->
|
|
9320
|
+
<xsl:variable name="text" select="."/>
|
|
9321
|
+
<xsl:variable name="ratio_">
|
|
9322
|
+
|
|
9323
|
+
<xsl:choose>
|
|
9324
|
+
<xsl:when test="$layoutVersion = '2024'">0.8</xsl:when>
|
|
9325
|
+
<xsl:otherwise>0.75</xsl:otherwise>
|
|
9326
|
+
</xsl:choose>
|
|
9327
|
+
|
|
9328
|
+
</xsl:variable>
|
|
9329
|
+
<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
|
|
9330
|
+
<fo:inline font-size="{$ratio * 100}%" role="SKIP">
|
|
8665
9331
|
<xsl:if test="string-length($text) > 0">
|
|
8666
9332
|
<xsl:variable name="smallCapsText">
|
|
8667
9333
|
<xsl:call-template name="recursiveSmallCaps">
|
|
8668
9334
|
<xsl:with-param name="text" select="$text"/>
|
|
9335
|
+
<xsl:with-param name="ratio" select="$ratio"/>
|
|
8669
9336
|
</xsl:call-template>
|
|
8670
9337
|
</xsl:variable>
|
|
8671
9338
|
<!-- merge neighboring fo:inline -->
|
|
@@ -8702,12 +9369,13 @@
|
|
|
8702
9369
|
|
|
8703
9370
|
<xsl:template name="recursiveSmallCaps">
|
|
8704
9371
|
<xsl:param name="text"/>
|
|
9372
|
+
<xsl:param name="ratio"/>
|
|
8705
9373
|
<xsl:variable name="char" select="substring($text,1,1)"/>
|
|
8706
9374
|
<!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
|
|
8707
9375
|
<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
|
|
8708
9376
|
<xsl:choose>
|
|
8709
9377
|
<xsl:when test="$char=$upperCase">
|
|
8710
|
-
<fo:inline font-size="{100 div
|
|
9378
|
+
<fo:inline font-size="{100 div $ratio}%" role="SKIP">
|
|
8711
9379
|
<xsl:value-of select="$upperCase"/>
|
|
8712
9380
|
</fo:inline>
|
|
8713
9381
|
</xsl:when>
|
|
@@ -8718,6 +9386,7 @@
|
|
|
8718
9386
|
<xsl:if test="string-length($text) > 1">
|
|
8719
9387
|
<xsl:call-template name="recursiveSmallCaps">
|
|
8720
9388
|
<xsl:with-param name="text" select="substring($text,2)"/>
|
|
9389
|
+
<xsl:with-param name="ratio" select="$ratio"/>
|
|
8721
9390
|
</xsl:call-template>
|
|
8722
9391
|
</xsl:if>
|
|
8723
9392
|
</xsl:template>
|
|
@@ -8825,6 +9494,9 @@
|
|
|
8825
9494
|
<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
|
|
8826
9495
|
<style name="{$key}"><xsl:value-of select="$value"/></style>
|
|
8827
9496
|
</xsl:if>
|
|
9497
|
+
<xsl:if test="$key = 'text-indent'">
|
|
9498
|
+
<style name="padding-left"><xsl:value-of select="$value"/></style>
|
|
9499
|
+
</xsl:if>
|
|
8828
9500
|
</xsl:for-each>
|
|
8829
9501
|
</xsl:variable>
|
|
8830
9502
|
<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
|
|
@@ -10234,6 +10906,13 @@
|
|
|
10234
10906
|
</xsl:call-template>
|
|
10235
10907
|
</xsl:template>
|
|
10236
10908
|
|
|
10909
|
+
<!-- command between two xref points to non-standard bibitem -->
|
|
10910
|
+
<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
|
|
10911
|
+
|
|
10912
|
+
<fo:inline baseline-shift="20%" font-size="80%"><xsl:value-of select="."/></fo:inline>
|
|
10913
|
+
|
|
10914
|
+
</xsl:template>
|
|
10915
|
+
|
|
10237
10916
|
<!-- ====== -->
|
|
10238
10917
|
<!-- formula -->
|
|
10239
10918
|
<!-- ====== -->
|
|
@@ -10877,16 +11556,44 @@
|
|
|
10877
11556
|
</xsl:choose>
|
|
10878
11557
|
|
|
10879
11558
|
<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
|
|
10880
|
-
<xsl:variable name="
|
|
10881
|
-
<xsl:variable name="
|
|
11559
|
+
<xsl:variable name="svg_width_" select="xalan:nodeset($svg_content)/*/@width"/>
|
|
11560
|
+
<xsl:variable name="svg_width" select="number(translate($svg_width_, 'px', ''))"/>
|
|
11561
|
+
<xsl:variable name="svg_height_" select="xalan:nodeset($svg_content)/*/@height"/>
|
|
11562
|
+
<xsl:variable name="svg_height" select="number(translate($svg_height_, 'px', ''))"/>
|
|
11563
|
+
|
|
11564
|
+
<!-- Example: -->
|
|
10882
11565
|
<!-- effective height 297 - 27.4 - 13 = 256.6 -->
|
|
10883
11566
|
<!-- effective width 210 - 12.5 - 25 = 172.5 -->
|
|
10884
11567
|
<!-- effective height / width = 1.48, 1.4 - with title -->
|
|
10885
|
-
|
|
11568
|
+
|
|
11569
|
+
<xsl:variable name="scale_x">
|
|
11570
|
+
<xsl:choose>
|
|
11571
|
+
<xsl:when test="$svg_width > $width_effective_px">
|
|
11572
|
+
<xsl:value-of select="$width_effective_px div $svg_width"/>
|
|
11573
|
+
</xsl:when>
|
|
11574
|
+
<xsl:otherwise>1</xsl:otherwise>
|
|
11575
|
+
</xsl:choose>
|
|
11576
|
+
</xsl:variable>
|
|
11577
|
+
<xsl:variable name="scale_y">
|
|
11578
|
+
<xsl:choose>
|
|
11579
|
+
<xsl:when test="$svg_height * $scale_x > $height_effective_px">
|
|
11580
|
+
<xsl:value-of select="$height_effective_px div ($svg_height * $scale_x)"/>
|
|
11581
|
+
</xsl:when>
|
|
11582
|
+
<xsl:otherwise>1</xsl:otherwise>
|
|
11583
|
+
</xsl:choose>
|
|
11584
|
+
</xsl:variable>
|
|
11585
|
+
|
|
11586
|
+
<!-- for images with big height -->
|
|
11587
|
+
<!-- <xsl:if test="$svg_height > ($svg_width * 1.4)">
|
|
10886
11588
|
<xsl:variable name="width" select="(($svg_width * 1.4) div $svg_height) * 100"/>
|
|
10887
11589
|
<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
|
|
10888
|
-
</xsl:if>
|
|
11590
|
+
</xsl:if> -->
|
|
10889
11591
|
<xsl:attribute name="scaling">uniform</xsl:attribute>
|
|
11592
|
+
|
|
11593
|
+
<xsl:if test="$scale_y != 1">
|
|
11594
|
+
<xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
|
|
11595
|
+
</xsl:if>
|
|
11596
|
+
|
|
10890
11597
|
<xsl:copy-of select="$svg_content"/>
|
|
10891
11598
|
</fo:instream-foreign-object>
|
|
10892
11599
|
<!-- </fo:block> -->
|
|
@@ -10911,6 +11618,8 @@
|
|
|
10911
11618
|
</xsl:attribute>
|
|
10912
11619
|
</xsl:template>
|
|
10913
11620
|
|
|
11621
|
+
<xsl:variable name="regex_starts_with_digit">^[0-9].*</xsl:variable>
|
|
11622
|
+
|
|
10914
11623
|
<xsl:template match="*[local-name() = 'svg'][not(@width and @height)]" mode="svg_update">
|
|
10915
11624
|
<xsl:copy>
|
|
10916
11625
|
<xsl:apply-templates select="@*" mode="svg_update"/>
|
|
@@ -10924,8 +11633,13 @@
|
|
|
10924
11633
|
<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
|
|
10925
11634
|
<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
|
|
10926
11635
|
|
|
11636
|
+
<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
|
|
11637
|
+
<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
|
|
11638
|
+
|
|
10927
11639
|
<xsl:attribute name="width">
|
|
10928
11640
|
<xsl:choose>
|
|
11641
|
+
<!-- width is non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
|
|
11642
|
+
<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
|
|
10929
11643
|
<xsl:when test="$width != ''">
|
|
10930
11644
|
<xsl:value-of select="round($width)"/>
|
|
10931
11645
|
</xsl:when>
|
|
@@ -10934,6 +11648,8 @@
|
|
|
10934
11648
|
</xsl:attribute>
|
|
10935
11649
|
<xsl:attribute name="height">
|
|
10936
11650
|
<xsl:choose>
|
|
11651
|
+
<!-- height non 'auto', 'text-width', 'full-page-width' or 'narrow' -->
|
|
11652
|
+
<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
|
|
10937
11653
|
<xsl:when test="$height != ''">
|
|
10938
11654
|
<xsl:value-of select="round($height)"/>
|
|
10939
11655
|
</xsl:when>
|
|
@@ -10945,6 +11661,28 @@
|
|
|
10945
11661
|
</xsl:copy>
|
|
10946
11662
|
</xsl:template>
|
|
10947
11663
|
|
|
11664
|
+
<xsl:template match="*[local-name() = 'svg']/@width" mode="svg_update">
|
|
11665
|
+
<!-- image[@width]/svg -->
|
|
11666
|
+
<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[2][local-name() = 'image']/@width)"/>
|
|
11667
|
+
<xsl:attribute name="width">
|
|
11668
|
+
<xsl:choose>
|
|
11669
|
+
<xsl:when test="$parent_image_width != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_width), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_width"/></xsl:when>
|
|
11670
|
+
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
|
11671
|
+
</xsl:choose>
|
|
11672
|
+
</xsl:attribute>
|
|
11673
|
+
</xsl:template>
|
|
11674
|
+
|
|
11675
|
+
<xsl:template match="*[local-name() = 'svg']/@height" mode="svg_update">
|
|
11676
|
+
<!-- image[@height]/svg -->
|
|
11677
|
+
<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[2][local-name() = 'image']/@height)"/>
|
|
11678
|
+
<xsl:attribute name="height">
|
|
11679
|
+
<xsl:choose>
|
|
11680
|
+
<xsl:when test="$parent_image_height != '' and normalize-space(java:matches(java:java.lang.String.new($parent_image_height), $regex_starts_with_digit)) = 'true'"><xsl:value-of select="$parent_image_height"/></xsl:when>
|
|
11681
|
+
<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
|
|
11682
|
+
</xsl:choose>
|
|
11683
|
+
</xsl:attribute>
|
|
11684
|
+
</xsl:template>
|
|
11685
|
+
|
|
10948
11686
|
<!-- regex for 'display: inline-block;' -->
|
|
10949
11687
|
<xsl:variable name="regex_svg_style_notsupported">display(\s|\h)*:(\s|\h)*inline-block(\s|\h)*;</xsl:variable>
|
|
10950
11688
|
<xsl:template match="*[local-name() = 'svg']//*[local-name() = 'style']/text()" mode="svg_update">
|
|
@@ -12402,6 +13140,7 @@
|
|
|
12402
13140
|
<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
|
|
12403
13141
|
<xsl:if test="normalize-space() != ''">
|
|
12404
13142
|
<fo:inline xsl:use-attribute-sets="termexample-name-style">
|
|
13143
|
+
<xsl:call-template name="refine_termexample-name-style"/>
|
|
12405
13144
|
<xsl:apply-templates/>
|
|
12406
13145
|
</fo:inline>
|
|
12407
13146
|
</xsl:if>
|
|
@@ -12552,6 +13291,7 @@
|
|
|
12552
13291
|
</xsl:when>
|
|
12553
13292
|
<xsl:otherwise>
|
|
12554
13293
|
<fo:inline xsl:use-attribute-sets="example-name-style">
|
|
13294
|
+
<xsl:call-template name="refine_example-name-style"/>
|
|
12555
13295
|
<xsl:apply-templates/>
|
|
12556
13296
|
</fo:inline>
|
|
12557
13297
|
</xsl:otherwise>
|
|
@@ -12890,6 +13630,8 @@
|
|
|
12890
13630
|
</xsl:choose>
|
|
12891
13631
|
</xsl:variable>
|
|
12892
13632
|
|
|
13633
|
+
<xsl:if test="$layoutVersion = '1951' and $depth = 1">.</xsl:if>
|
|
13634
|
+
|
|
12893
13635
|
<xsl:choose>
|
|
12894
13636
|
<xsl:when test="$lang = 'zh'">
|
|
12895
13637
|
<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
|
|
@@ -13018,7 +13760,15 @@
|
|
|
13018
13760
|
</xsl:template> <!-- sections_element_style -->
|
|
13019
13761
|
|
|
13020
13762
|
<xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
|
|
13021
|
-
|
|
13763
|
+
|
|
13764
|
+
<xsl:choose>
|
|
13765
|
+
<xsl:when test="$layoutVersion = '1951' and (local-name() = 'clause' or local-name() = 'introduction')"/>
|
|
13766
|
+
<xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"/>
|
|
13767
|
+
<xsl:otherwise>
|
|
13768
|
+
<fo:block break-after="page"/>
|
|
13769
|
+
</xsl:otherwise>
|
|
13770
|
+
</xsl:choose>
|
|
13771
|
+
|
|
13022
13772
|
<fo:block>
|
|
13023
13773
|
<xsl:call-template name="setId"/>
|
|
13024
13774
|
<xsl:apply-templates/>
|
|
@@ -13085,7 +13835,7 @@
|
|
|
13085
13835
|
<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
|
|
13086
13836
|
<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
|
|
13087
13837
|
</xsl:when>
|
|
13088
|
-
<xsl:when test="not(
|
|
13838
|
+
<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
|
|
13089
13839
|
<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
|
|
13090
13840
|
</xsl:when>
|
|
13091
13841
|
</xsl:choose>
|
|
@@ -13763,6 +14513,11 @@
|
|
|
13763
14513
|
<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
|
|
13764
14514
|
|
|
13765
14515
|
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
|
|
14516
|
+
|
|
14517
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
14518
|
+
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
|
14519
|
+
</xsl:if>
|
|
14520
|
+
|
|
13766
14521
|
<xsl:call-template name="processBibitem"/>
|
|
13767
14522
|
</fo:block>
|
|
13768
14523
|
|
|
@@ -13798,6 +14553,11 @@
|
|
|
13798
14553
|
<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
|
|
13799
14554
|
<xsl:otherwise>
|
|
13800
14555
|
<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
|
|
14556
|
+
|
|
14557
|
+
<xsl:if test="$layoutVersion = '2024'">
|
|
14558
|
+
<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
|
|
14559
|
+
</xsl:if>
|
|
14560
|
+
|
|
13801
14561
|
<fo:list-item-label end-indent="label-end()">
|
|
13802
14562
|
<fo:block role="SKIP">
|
|
13803
14563
|
<fo:inline role="SKIP">
|
|
@@ -15682,4 +16442,6 @@
|
|
|
15682
16442
|
</xsl:if>
|
|
15683
16443
|
</xsl:template>
|
|
15684
16444
|
|
|
16445
|
+
<!-- update -->
|
|
16446
|
+
|
|
15685
16447
|
</xsl:stylesheet>
|