metanorma-itu 2.1.11 → 2.1.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/itu/itu.implementers-guide.xsl +126 -21
- data/lib/isodoc/itu/itu.in-force.xsl +126 -21
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +126 -21
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +126 -21
- data/lib/isodoc/itu/itu.recommendation.xsl +126 -21
- data/lib/isodoc/itu/itu.resolution.xsl +126 -21
- data/lib/isodoc/itu/itu.service-publication.xsl +126 -21
- data/lib/isodoc/itu/itu.technical-paper.xsl +126 -21
- data/lib/isodoc/itu/itu.technical-report.xsl +126 -21
- data/lib/metanorma/itu/biblio.rng +5 -0
- data/lib/metanorma/itu/isodoc.rng +46 -12
- data/lib/metanorma/itu/version.rb +1 -1
- data/metanorma-itu.gemspec +3 -2
- metadata +4 -11
- data/.github/workflows/automerge.yml +0 -31
- data/.github/workflows/rake.yml +0 -15
- data/.github/workflows/release.yml +0 -24
- data/Rakefile +0 -8
- data/bin/console +0 -14
- data/bin/rspec +0 -17
- data/bin/setup +0 -8
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b5393dc3cee8090f06aa62a1232cea3cf22d13f0e036ee0ec62a84d333bd2a67
|
|
4
|
+
data.tar.gz: 0a63a589bf8155bef1b4912218b3eb0ba8db32373db44002ea182554dee23efb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d62a67ecfb1d2de974adb8018f3400d4dd54973f208cb9de7d78d06bcb374f16078973bc39281cb5a0362f6eceb1f0cd24bcd92831eaf140d33131c6739475e3
|
|
7
|
+
data.tar.gz: a3ea90814d66b1b2e9df11caa2064cfbad13e7ab705d1fd685c81354f4b18b1b9f292a95b3db8dc190f85cdc31b30035cb0a530fb075df2d927db3e9db0fb4e9
|
|
@@ -219,7 +219,7 @@
|
|
|
219
219
|
<fo:page-sequence master-reference="TR-first-page">
|
|
220
220
|
<fo:flow flow-name="xsl-region-body">
|
|
221
221
|
<fo:block>
|
|
222
|
-
<fo:table width="175mm" table-layout="fixed" border-top="1.5pt solid black">
|
|
222
|
+
<fo:table width="175mm" table-layout="fixed" border-top="1.5pt solid black" id="__internal_layout__meeting_{generate-id()}">
|
|
223
223
|
<fo:table-column column-width="29mm"/>
|
|
224
224
|
<fo:table-column column-width="45mm"/>
|
|
225
225
|
<fo:table-column column-width="28mm"/>
|
|
@@ -252,7 +252,7 @@
|
|
|
252
252
|
</fo:table-body>
|
|
253
253
|
</fo:table>
|
|
254
254
|
|
|
255
|
-
<fo:table width="175mm" table-layout="fixed">
|
|
255
|
+
<fo:table width="175mm" table-layout="fixed" id="__internal_layout__groups_{generate-id()}">
|
|
256
256
|
<fo:table-column column-width="29mm"/>
|
|
257
257
|
<fo:table-column column-width="10mm"/>
|
|
258
258
|
<fo:table-column column-width="35mm"/>
|
|
@@ -300,7 +300,7 @@
|
|
|
300
300
|
</fo:table>
|
|
301
301
|
|
|
302
302
|
<xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:person">
|
|
303
|
-
<fo:table width="175mm" table-layout="fixed" line-height="110%">
|
|
303
|
+
<fo:table width="175mm" table-layout="fixed" line-height="110%" id="__internal_layout__person_{generate-id()}">
|
|
304
304
|
<fo:table-column column-width="29mm"/>
|
|
305
305
|
<fo:table-column column-width="75mm"/>
|
|
306
306
|
<fo:table-column column-width="71mm"/>
|
|
@@ -538,7 +538,7 @@
|
|
|
538
538
|
</fo:block-container>
|
|
539
539
|
<fo:block-container font-family="Arial">
|
|
540
540
|
<xsl:variable name="annexid" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:annexid)"/>
|
|
541
|
-
<fo:table width="100%" table-layout="fixed"> <!-- 175.4mm-->
|
|
541
|
+
<fo:table width="100%" table-layout="fixed" id="__internal_layout__coverpage_{generate-id()}"> <!-- 175.4mm-->
|
|
542
542
|
<fo:table-column column-width="25.2mm"/>
|
|
543
543
|
<fo:table-column column-width="44.4mm"/>
|
|
544
544
|
<fo:table-column column-width="35.8mm"/>
|
|
@@ -2467,6 +2467,14 @@
|
|
|
2467
2467
|
|
|
2468
2468
|
</xsl:attribute-set>
|
|
2469
2469
|
|
|
2470
|
+
<xsl:attribute-set name="pre-style">
|
|
2471
|
+
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
|
2472
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
2473
|
+
|
|
2474
|
+
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
|
2475
|
+
|
|
2476
|
+
</xsl:attribute-set>
|
|
2477
|
+
|
|
2470
2478
|
<xsl:attribute-set name="permission-style">
|
|
2471
2479
|
|
|
2472
2480
|
</xsl:attribute-set>
|
|
@@ -2570,6 +2578,11 @@
|
|
|
2570
2578
|
</xsl:variable>
|
|
2571
2579
|
<xsl:variable name="table-border" select="normalize-space($table-border_)"/>
|
|
2572
2580
|
|
|
2581
|
+
<xsl:variable name="table-cell-border_">
|
|
2582
|
+
|
|
2583
|
+
</xsl:variable>
|
|
2584
|
+
<xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
|
|
2585
|
+
|
|
2573
2586
|
<xsl:attribute-set name="table-container-style">
|
|
2574
2587
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
2575
2588
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
@@ -2582,8 +2595,6 @@
|
|
|
2582
2595
|
<xsl:attribute-set name="table-style">
|
|
2583
2596
|
<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
|
|
2584
2597
|
<xsl:attribute name="table-layout">fixed</xsl:attribute>
|
|
2585
|
-
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
2586
|
-
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
2587
2598
|
|
|
2588
2599
|
</xsl:attribute-set><!-- table-style -->
|
|
2589
2600
|
|
|
@@ -3698,6 +3709,12 @@
|
|
|
3698
3709
|
<xsl:variable name="table_attributes">
|
|
3699
3710
|
|
|
3700
3711
|
<xsl:element name="table_attributes" use-attribute-sets="table-style">
|
|
3712
|
+
|
|
3713
|
+
<xsl:if test="$margin-side != 0">
|
|
3714
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
3715
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
3716
|
+
</xsl:if>
|
|
3717
|
+
|
|
3701
3718
|
<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
|
|
3702
3719
|
|
|
3703
3720
|
<xsl:if test="$doctype = 'service-publication'">
|
|
@@ -4481,6 +4498,10 @@
|
|
|
4481
4498
|
<xsl:template match="*[local-name()='tr']">
|
|
4482
4499
|
<fo:table-row xsl:use-attribute-sets="table-body-row-style">
|
|
4483
4500
|
|
|
4501
|
+
<xsl:if test="*[local-name() = 'th']">
|
|
4502
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
4503
|
+
</xsl:if>
|
|
4504
|
+
|
|
4484
4505
|
<xsl:call-template name="setTableRowAttributes"/>
|
|
4485
4506
|
<xsl:apply-templates/>
|
|
4486
4507
|
</fo:table-row>
|
|
@@ -6492,6 +6513,9 @@
|
|
|
6492
6513
|
<xsl:value-of select="substring($str, 2)"/>
|
|
6493
6514
|
</xsl:template>
|
|
6494
6515
|
|
|
6516
|
+
<!-- ======================================= -->
|
|
6517
|
+
<!-- math -->
|
|
6518
|
+
<!-- ======================================= -->
|
|
6495
6519
|
<xsl:template match="mathml:math">
|
|
6496
6520
|
<xsl:variable name="isAdded" select="@added"/>
|
|
6497
6521
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
@@ -6542,14 +6566,57 @@
|
|
|
6542
6566
|
<xsl:value-of select="$comment_text"/>
|
|
6543
6567
|
</xsl:template>
|
|
6544
6568
|
|
|
6569
|
+
<xsl:template match="*[local-name() = 'asciimath']">
|
|
6570
|
+
<xsl:param name="process" select="'false'"/>
|
|
6571
|
+
<xsl:if test="$process = 'true'">
|
|
6572
|
+
<xsl:apply-templates/>
|
|
6573
|
+
</xsl:if>
|
|
6574
|
+
</xsl:template>
|
|
6575
|
+
|
|
6576
|
+
<xsl:template match="*[local-name() = 'latexmath']"/>
|
|
6577
|
+
|
|
6578
|
+
<xsl:template name="getMathml_asciimath_text">
|
|
6579
|
+
<xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
|
|
6580
|
+
<xsl:variable name="latexmath">
|
|
6581
|
+
|
|
6582
|
+
</xsl:variable>
|
|
6583
|
+
<xsl:variable name="asciimath_text_following">
|
|
6584
|
+
<xsl:choose>
|
|
6585
|
+
<xsl:when test="normalize-space($latexmath) != ''">
|
|
6586
|
+
<xsl:value-of select="$latexmath"/>
|
|
6587
|
+
</xsl:when>
|
|
6588
|
+
<xsl:when test="normalize-space($asciimath) != ''">
|
|
6589
|
+
<xsl:value-of select="$asciimath"/>
|
|
6590
|
+
</xsl:when>
|
|
6591
|
+
<xsl:otherwise>
|
|
6592
|
+
<xsl:value-of select="following-sibling::node()[1][self::comment()]"/>
|
|
6593
|
+
</xsl:otherwise>
|
|
6594
|
+
</xsl:choose>
|
|
6595
|
+
</xsl:variable>
|
|
6596
|
+
<xsl:variable name="asciimath_text_">
|
|
6597
|
+
<xsl:choose>
|
|
6598
|
+
<xsl:when test="normalize-space($asciimath_text_following) != ''">
|
|
6599
|
+
<xsl:value-of select="$asciimath_text_following"/>
|
|
6600
|
+
</xsl:when>
|
|
6601
|
+
<xsl:otherwise>
|
|
6602
|
+
<xsl:value-of select="normalize-space(translate(.,' ',' '))"/>
|
|
6603
|
+
</xsl:otherwise>
|
|
6604
|
+
</xsl:choose>
|
|
6605
|
+
</xsl:variable>
|
|
6606
|
+
<xsl:variable name="asciimath_text_2" select="java:org.metanorma.fop.Util.unescape($asciimath_text_)"/>
|
|
6607
|
+
<xsl:variable name="asciimath_text" select="java:trim(java:java.lang.String.new($asciimath_text_2))"/>
|
|
6608
|
+
<xsl:value-of select="$asciimath_text"/>
|
|
6609
|
+
</xsl:template>
|
|
6610
|
+
|
|
6545
6611
|
<xsl:template name="mathml_instream_object">
|
|
6546
|
-
<xsl:param name="
|
|
6612
|
+
<xsl:param name="asciimath_text"/>
|
|
6547
6613
|
<xsl:param name="mathml_content"/>
|
|
6548
6614
|
|
|
6549
|
-
<xsl:variable name="
|
|
6615
|
+
<xsl:variable name="asciimath_text_">
|
|
6550
6616
|
<xsl:choose>
|
|
6551
|
-
<xsl:when test="normalize-space($
|
|
6552
|
-
<xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise>
|
|
6617
|
+
<xsl:when test="normalize-space($asciimath_text) != ''"><xsl:value-of select="$asciimath_text"/></xsl:when>
|
|
6618
|
+
<!-- <xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise> -->
|
|
6619
|
+
<xsl:otherwise><xsl:call-template name="getMathml_asciimath_text"/></xsl:otherwise>
|
|
6553
6620
|
</xsl:choose>
|
|
6554
6621
|
</xsl:variable>
|
|
6555
6622
|
|
|
@@ -6566,10 +6633,10 @@
|
|
|
6566
6633
|
</xsl:attribute>
|
|
6567
6634
|
|
|
6568
6635
|
<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
|
|
6569
|
-
<xsl:if test="normalize-space($
|
|
6636
|
+
<xsl:if test="normalize-space($asciimath_text_) != ''">
|
|
6570
6637
|
<!-- put Mathin Alternate Text -->
|
|
6571
6638
|
<xsl:attribute name="fox:alt-text">
|
|
6572
|
-
<xsl:value-of select="$
|
|
6639
|
+
<xsl:value-of select="$asciimath_text_"/>
|
|
6573
6640
|
</xsl:attribute>
|
|
6574
6641
|
</xsl:if>
|
|
6575
6642
|
<!-- </xsl:if> -->
|
|
@@ -6642,6 +6709,29 @@
|
|
|
6642
6709
|
<xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
|
|
6643
6710
|
</xsl:template>
|
|
6644
6711
|
|
|
6712
|
+
<!-- Examples:
|
|
6713
|
+
<stem type="AsciiMath">x = 1</stem>
|
|
6714
|
+
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
6715
|
+
<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
|
|
6716
|
+
-->
|
|
6717
|
+
<xsl:template match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3">
|
|
6718
|
+
<fo:inline xsl:use-attribute-sets="mathml-style">
|
|
6719
|
+
|
|
6720
|
+
<xsl:choose>
|
|
6721
|
+
<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
|
|
6722
|
+
<xsl:otherwise>
|
|
6723
|
+
<xsl:apply-templates>
|
|
6724
|
+
<xsl:with-param name="process">true</xsl:with-param>
|
|
6725
|
+
</xsl:apply-templates>
|
|
6726
|
+
</xsl:otherwise>
|
|
6727
|
+
</xsl:choose>
|
|
6728
|
+
|
|
6729
|
+
</fo:inline>
|
|
6730
|
+
</xsl:template>
|
|
6731
|
+
<!-- ======================================= -->
|
|
6732
|
+
<!-- END: math -->
|
|
6733
|
+
<!-- ======================================= -->
|
|
6734
|
+
|
|
6645
6735
|
<xsl:template match="*[local-name()='localityStack']"/>
|
|
6646
6736
|
|
|
6647
6737
|
<xsl:template match="*[local-name()='link']" name="link">
|
|
@@ -7986,9 +8076,9 @@
|
|
|
7986
8076
|
<xsl:apply-templates mode="contents_item"/>
|
|
7987
8077
|
</xsl:template>
|
|
7988
8078
|
|
|
7989
|
-
<!--
|
|
7990
|
-
<!-- sourcecode
|
|
7991
|
-
<!--
|
|
8079
|
+
<!-- =============== -->
|
|
8080
|
+
<!-- sourcecode -->
|
|
8081
|
+
<!-- =============== -->
|
|
7992
8082
|
<xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
|
7993
8083
|
|
|
7994
8084
|
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
|
|
@@ -8287,8 +8377,22 @@
|
|
|
8287
8377
|
</fo:block>
|
|
8288
8378
|
</xsl:if>
|
|
8289
8379
|
</xsl:template>
|
|
8290
|
-
<!--
|
|
8291
|
-
<!--
|
|
8380
|
+
<!-- =============== -->
|
|
8381
|
+
<!-- END sourcecode -->
|
|
8382
|
+
<!-- =============== -->
|
|
8383
|
+
|
|
8384
|
+
<!-- =============== -->
|
|
8385
|
+
<!-- pre -->
|
|
8386
|
+
<!-- =============== -->
|
|
8387
|
+
<xsl:template match="*[local-name()='pre']" name="pre">
|
|
8388
|
+
<fo:block xsl:use-attribute-sets="pre-style">
|
|
8389
|
+
<xsl:copy-of select="@id"/>
|
|
8390
|
+
<xsl:apply-templates/>
|
|
8391
|
+
</fo:block>
|
|
8392
|
+
</xsl:template>
|
|
8393
|
+
<!-- =============== -->
|
|
8394
|
+
<!-- pre -->
|
|
8395
|
+
<!-- =============== -->
|
|
8292
8396
|
|
|
8293
8397
|
<!-- ========== -->
|
|
8294
8398
|
<!-- permission -->
|
|
@@ -9786,7 +9890,7 @@
|
|
|
9786
9890
|
<fo:table-column column-width="80%"/>
|
|
9787
9891
|
<fo:table-body>
|
|
9788
9892
|
<fo:table-row>
|
|
9789
|
-
<fo:table-cell><fo:block><xsl:
|
|
9893
|
+
<fo:table-cell><fo:block><xsl:value-of select="$bibitem_label"/></fo:block></fo:table-cell>
|
|
9790
9894
|
<fo:table-cell><fo:block><xsl:copy-of select="$bibitem_body"/></fo:block></fo:table-cell>
|
|
9791
9895
|
</fo:table-row>
|
|
9792
9896
|
</fo:table-body>
|
|
@@ -9803,7 +9907,7 @@
|
|
|
9803
9907
|
<fo:list-item>
|
|
9804
9908
|
<fo:list-item-label end-indent="label-end()">
|
|
9805
9909
|
<fo:block>
|
|
9806
|
-
<xsl:
|
|
9910
|
+
<xsl:value-of select="$bibitem_label"/>
|
|
9807
9911
|
</fo:block>
|
|
9808
9912
|
</fo:list-item-label>
|
|
9809
9913
|
<fo:list-item-body start-indent="body-start()">
|
|
@@ -10876,13 +10980,14 @@
|
|
|
10876
10980
|
</xsl:template>
|
|
10877
10981
|
|
|
10878
10982
|
<xsl:template name="setId">
|
|
10983
|
+
<xsl:param name="prefix"/>
|
|
10879
10984
|
<xsl:attribute name="id">
|
|
10880
10985
|
<xsl:choose>
|
|
10881
10986
|
<xsl:when test="@id">
|
|
10882
|
-
<xsl:value-of select="@id"/>
|
|
10987
|
+
<xsl:value-of select="concat($prefix, @id)"/>
|
|
10883
10988
|
</xsl:when>
|
|
10884
10989
|
<xsl:otherwise>
|
|
10885
|
-
<xsl:value-of select="generate-id()"/>
|
|
10990
|
+
<xsl:value-of select="concat($prefix, generate-id())"/>
|
|
10886
10991
|
</xsl:otherwise>
|
|
10887
10992
|
</xsl:choose>
|
|
10888
10993
|
</xsl:attribute>
|
|
@@ -219,7 +219,7 @@
|
|
|
219
219
|
<fo:page-sequence master-reference="TR-first-page">
|
|
220
220
|
<fo:flow flow-name="xsl-region-body">
|
|
221
221
|
<fo:block>
|
|
222
|
-
<fo:table width="175mm" table-layout="fixed" border-top="1.5pt solid black">
|
|
222
|
+
<fo:table width="175mm" table-layout="fixed" border-top="1.5pt solid black" id="__internal_layout__meeting_{generate-id()}">
|
|
223
223
|
<fo:table-column column-width="29mm"/>
|
|
224
224
|
<fo:table-column column-width="45mm"/>
|
|
225
225
|
<fo:table-column column-width="28mm"/>
|
|
@@ -252,7 +252,7 @@
|
|
|
252
252
|
</fo:table-body>
|
|
253
253
|
</fo:table>
|
|
254
254
|
|
|
255
|
-
<fo:table width="175mm" table-layout="fixed">
|
|
255
|
+
<fo:table width="175mm" table-layout="fixed" id="__internal_layout__groups_{generate-id()}">
|
|
256
256
|
<fo:table-column column-width="29mm"/>
|
|
257
257
|
<fo:table-column column-width="10mm"/>
|
|
258
258
|
<fo:table-column column-width="35mm"/>
|
|
@@ -300,7 +300,7 @@
|
|
|
300
300
|
</fo:table>
|
|
301
301
|
|
|
302
302
|
<xsl:if test="/itu:itu-standard/itu:bibdata/itu:contributor/itu:person">
|
|
303
|
-
<fo:table width="175mm" table-layout="fixed" line-height="110%">
|
|
303
|
+
<fo:table width="175mm" table-layout="fixed" line-height="110%" id="__internal_layout__person_{generate-id()}">
|
|
304
304
|
<fo:table-column column-width="29mm"/>
|
|
305
305
|
<fo:table-column column-width="75mm"/>
|
|
306
306
|
<fo:table-column column-width="71mm"/>
|
|
@@ -538,7 +538,7 @@
|
|
|
538
538
|
</fo:block-container>
|
|
539
539
|
<fo:block-container font-family="Arial">
|
|
540
540
|
<xsl:variable name="annexid" select="normalize-space(/itu:itu-standard/itu:bibdata/itu:ext/itu:structuredidentifier/itu:annexid)"/>
|
|
541
|
-
<fo:table width="100%" table-layout="fixed"> <!-- 175.4mm-->
|
|
541
|
+
<fo:table width="100%" table-layout="fixed" id="__internal_layout__coverpage_{generate-id()}"> <!-- 175.4mm-->
|
|
542
542
|
<fo:table-column column-width="25.2mm"/>
|
|
543
543
|
<fo:table-column column-width="44.4mm"/>
|
|
544
544
|
<fo:table-column column-width="35.8mm"/>
|
|
@@ -2467,6 +2467,14 @@
|
|
|
2467
2467
|
|
|
2468
2468
|
</xsl:attribute-set>
|
|
2469
2469
|
|
|
2470
|
+
<xsl:attribute-set name="pre-style">
|
|
2471
|
+
<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
|
|
2472
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
|
2473
|
+
|
|
2474
|
+
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
|
2475
|
+
|
|
2476
|
+
</xsl:attribute-set>
|
|
2477
|
+
|
|
2470
2478
|
<xsl:attribute-set name="permission-style">
|
|
2471
2479
|
|
|
2472
2480
|
</xsl:attribute-set>
|
|
@@ -2570,6 +2578,11 @@
|
|
|
2570
2578
|
</xsl:variable>
|
|
2571
2579
|
<xsl:variable name="table-border" select="normalize-space($table-border_)"/>
|
|
2572
2580
|
|
|
2581
|
+
<xsl:variable name="table-cell-border_">
|
|
2582
|
+
|
|
2583
|
+
</xsl:variable>
|
|
2584
|
+
<xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
|
|
2585
|
+
|
|
2573
2586
|
<xsl:attribute-set name="table-container-style">
|
|
2574
2587
|
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
2575
2588
|
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
@@ -2582,8 +2595,6 @@
|
|
|
2582
2595
|
<xsl:attribute-set name="table-style">
|
|
2583
2596
|
<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
|
|
2584
2597
|
<xsl:attribute name="table-layout">fixed</xsl:attribute>
|
|
2585
|
-
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
2586
|
-
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
2587
2598
|
|
|
2588
2599
|
</xsl:attribute-set><!-- table-style -->
|
|
2589
2600
|
|
|
@@ -3698,6 +3709,12 @@
|
|
|
3698
3709
|
<xsl:variable name="table_attributes">
|
|
3699
3710
|
|
|
3700
3711
|
<xsl:element name="table_attributes" use-attribute-sets="table-style">
|
|
3712
|
+
|
|
3713
|
+
<xsl:if test="$margin-side != 0">
|
|
3714
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
3715
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
3716
|
+
</xsl:if>
|
|
3717
|
+
|
|
3701
3718
|
<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
|
|
3702
3719
|
|
|
3703
3720
|
<xsl:if test="$doctype = 'service-publication'">
|
|
@@ -4481,6 +4498,10 @@
|
|
|
4481
4498
|
<xsl:template match="*[local-name()='tr']">
|
|
4482
4499
|
<fo:table-row xsl:use-attribute-sets="table-body-row-style">
|
|
4483
4500
|
|
|
4501
|
+
<xsl:if test="*[local-name() = 'th']">
|
|
4502
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
4503
|
+
</xsl:if>
|
|
4504
|
+
|
|
4484
4505
|
<xsl:call-template name="setTableRowAttributes"/>
|
|
4485
4506
|
<xsl:apply-templates/>
|
|
4486
4507
|
</fo:table-row>
|
|
@@ -6492,6 +6513,9 @@
|
|
|
6492
6513
|
<xsl:value-of select="substring($str, 2)"/>
|
|
6493
6514
|
</xsl:template>
|
|
6494
6515
|
|
|
6516
|
+
<!-- ======================================= -->
|
|
6517
|
+
<!-- math -->
|
|
6518
|
+
<!-- ======================================= -->
|
|
6495
6519
|
<xsl:template match="mathml:math">
|
|
6496
6520
|
<xsl:variable name="isAdded" select="@added"/>
|
|
6497
6521
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
@@ -6542,14 +6566,57 @@
|
|
|
6542
6566
|
<xsl:value-of select="$comment_text"/>
|
|
6543
6567
|
</xsl:template>
|
|
6544
6568
|
|
|
6569
|
+
<xsl:template match="*[local-name() = 'asciimath']">
|
|
6570
|
+
<xsl:param name="process" select="'false'"/>
|
|
6571
|
+
<xsl:if test="$process = 'true'">
|
|
6572
|
+
<xsl:apply-templates/>
|
|
6573
|
+
</xsl:if>
|
|
6574
|
+
</xsl:template>
|
|
6575
|
+
|
|
6576
|
+
<xsl:template match="*[local-name() = 'latexmath']"/>
|
|
6577
|
+
|
|
6578
|
+
<xsl:template name="getMathml_asciimath_text">
|
|
6579
|
+
<xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
|
|
6580
|
+
<xsl:variable name="latexmath">
|
|
6581
|
+
|
|
6582
|
+
</xsl:variable>
|
|
6583
|
+
<xsl:variable name="asciimath_text_following">
|
|
6584
|
+
<xsl:choose>
|
|
6585
|
+
<xsl:when test="normalize-space($latexmath) != ''">
|
|
6586
|
+
<xsl:value-of select="$latexmath"/>
|
|
6587
|
+
</xsl:when>
|
|
6588
|
+
<xsl:when test="normalize-space($asciimath) != ''">
|
|
6589
|
+
<xsl:value-of select="$asciimath"/>
|
|
6590
|
+
</xsl:when>
|
|
6591
|
+
<xsl:otherwise>
|
|
6592
|
+
<xsl:value-of select="following-sibling::node()[1][self::comment()]"/>
|
|
6593
|
+
</xsl:otherwise>
|
|
6594
|
+
</xsl:choose>
|
|
6595
|
+
</xsl:variable>
|
|
6596
|
+
<xsl:variable name="asciimath_text_">
|
|
6597
|
+
<xsl:choose>
|
|
6598
|
+
<xsl:when test="normalize-space($asciimath_text_following) != ''">
|
|
6599
|
+
<xsl:value-of select="$asciimath_text_following"/>
|
|
6600
|
+
</xsl:when>
|
|
6601
|
+
<xsl:otherwise>
|
|
6602
|
+
<xsl:value-of select="normalize-space(translate(.,' ',' '))"/>
|
|
6603
|
+
</xsl:otherwise>
|
|
6604
|
+
</xsl:choose>
|
|
6605
|
+
</xsl:variable>
|
|
6606
|
+
<xsl:variable name="asciimath_text_2" select="java:org.metanorma.fop.Util.unescape($asciimath_text_)"/>
|
|
6607
|
+
<xsl:variable name="asciimath_text" select="java:trim(java:java.lang.String.new($asciimath_text_2))"/>
|
|
6608
|
+
<xsl:value-of select="$asciimath_text"/>
|
|
6609
|
+
</xsl:template>
|
|
6610
|
+
|
|
6545
6611
|
<xsl:template name="mathml_instream_object">
|
|
6546
|
-
<xsl:param name="
|
|
6612
|
+
<xsl:param name="asciimath_text"/>
|
|
6547
6613
|
<xsl:param name="mathml_content"/>
|
|
6548
6614
|
|
|
6549
|
-
<xsl:variable name="
|
|
6615
|
+
<xsl:variable name="asciimath_text_">
|
|
6550
6616
|
<xsl:choose>
|
|
6551
|
-
<xsl:when test="normalize-space($
|
|
6552
|
-
<xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise>
|
|
6617
|
+
<xsl:when test="normalize-space($asciimath_text) != ''"><xsl:value-of select="$asciimath_text"/></xsl:when>
|
|
6618
|
+
<!-- <xsl:otherwise><xsl:call-template name="getMathml_comment_text"/></xsl:otherwise> -->
|
|
6619
|
+
<xsl:otherwise><xsl:call-template name="getMathml_asciimath_text"/></xsl:otherwise>
|
|
6553
6620
|
</xsl:choose>
|
|
6554
6621
|
</xsl:variable>
|
|
6555
6622
|
|
|
@@ -6566,10 +6633,10 @@
|
|
|
6566
6633
|
</xsl:attribute>
|
|
6567
6634
|
|
|
6568
6635
|
<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
|
|
6569
|
-
<xsl:if test="normalize-space($
|
|
6636
|
+
<xsl:if test="normalize-space($asciimath_text_) != ''">
|
|
6570
6637
|
<!-- put Mathin Alternate Text -->
|
|
6571
6638
|
<xsl:attribute name="fox:alt-text">
|
|
6572
|
-
<xsl:value-of select="$
|
|
6639
|
+
<xsl:value-of select="$asciimath_text_"/>
|
|
6573
6640
|
</xsl:attribute>
|
|
6574
6641
|
</xsl:if>
|
|
6575
6642
|
<!-- </xsl:if> -->
|
|
@@ -6642,6 +6709,29 @@
|
|
|
6642
6709
|
<xsl:value-of select="."/><xsl:value-of select="$zero_width_space"/>
|
|
6643
6710
|
</xsl:template>
|
|
6644
6711
|
|
|
6712
|
+
<!-- Examples:
|
|
6713
|
+
<stem type="AsciiMath">x = 1</stem>
|
|
6714
|
+
<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
|
|
6715
|
+
<stem type="AsciiMath"><asciimath>x = 1</asciimath><latexmath>x = 1</latexmath></stem>
|
|
6716
|
+
-->
|
|
6717
|
+
<xsl:template match="*[local-name() = 'stem'][@type = 'AsciiMath'][count(*) = 0]/text() | *[local-name() = 'stem'][@type = 'AsciiMath'][*[local-name() = 'asciimath']]" priority="3">
|
|
6718
|
+
<fo:inline xsl:use-attribute-sets="mathml-style">
|
|
6719
|
+
|
|
6720
|
+
<xsl:choose>
|
|
6721
|
+
<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
|
|
6722
|
+
<xsl:otherwise>
|
|
6723
|
+
<xsl:apply-templates>
|
|
6724
|
+
<xsl:with-param name="process">true</xsl:with-param>
|
|
6725
|
+
</xsl:apply-templates>
|
|
6726
|
+
</xsl:otherwise>
|
|
6727
|
+
</xsl:choose>
|
|
6728
|
+
|
|
6729
|
+
</fo:inline>
|
|
6730
|
+
</xsl:template>
|
|
6731
|
+
<!-- ======================================= -->
|
|
6732
|
+
<!-- END: math -->
|
|
6733
|
+
<!-- ======================================= -->
|
|
6734
|
+
|
|
6645
6735
|
<xsl:template match="*[local-name()='localityStack']"/>
|
|
6646
6736
|
|
|
6647
6737
|
<xsl:template match="*[local-name()='link']" name="link">
|
|
@@ -7986,9 +8076,9 @@
|
|
|
7986
8076
|
<xsl:apply-templates mode="contents_item"/>
|
|
7987
8077
|
</xsl:template>
|
|
7988
8078
|
|
|
7989
|
-
<!--
|
|
7990
|
-
<!-- sourcecode
|
|
7991
|
-
<!--
|
|
8079
|
+
<!-- =============== -->
|
|
8080
|
+
<!-- sourcecode -->
|
|
8081
|
+
<!-- =============== -->
|
|
7992
8082
|
<xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
|
|
7993
8083
|
|
|
7994
8084
|
<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
|
|
@@ -8287,8 +8377,22 @@
|
|
|
8287
8377
|
</fo:block>
|
|
8288
8378
|
</xsl:if>
|
|
8289
8379
|
</xsl:template>
|
|
8290
|
-
<!--
|
|
8291
|
-
<!--
|
|
8380
|
+
<!-- =============== -->
|
|
8381
|
+
<!-- END sourcecode -->
|
|
8382
|
+
<!-- =============== -->
|
|
8383
|
+
|
|
8384
|
+
<!-- =============== -->
|
|
8385
|
+
<!-- pre -->
|
|
8386
|
+
<!-- =============== -->
|
|
8387
|
+
<xsl:template match="*[local-name()='pre']" name="pre">
|
|
8388
|
+
<fo:block xsl:use-attribute-sets="pre-style">
|
|
8389
|
+
<xsl:copy-of select="@id"/>
|
|
8390
|
+
<xsl:apply-templates/>
|
|
8391
|
+
</fo:block>
|
|
8392
|
+
</xsl:template>
|
|
8393
|
+
<!-- =============== -->
|
|
8394
|
+
<!-- pre -->
|
|
8395
|
+
<!-- =============== -->
|
|
8292
8396
|
|
|
8293
8397
|
<!-- ========== -->
|
|
8294
8398
|
<!-- permission -->
|
|
@@ -9786,7 +9890,7 @@
|
|
|
9786
9890
|
<fo:table-column column-width="80%"/>
|
|
9787
9891
|
<fo:table-body>
|
|
9788
9892
|
<fo:table-row>
|
|
9789
|
-
<fo:table-cell><fo:block><xsl:
|
|
9893
|
+
<fo:table-cell><fo:block><xsl:value-of select="$bibitem_label"/></fo:block></fo:table-cell>
|
|
9790
9894
|
<fo:table-cell><fo:block><xsl:copy-of select="$bibitem_body"/></fo:block></fo:table-cell>
|
|
9791
9895
|
</fo:table-row>
|
|
9792
9896
|
</fo:table-body>
|
|
@@ -9803,7 +9907,7 @@
|
|
|
9803
9907
|
<fo:list-item>
|
|
9804
9908
|
<fo:list-item-label end-indent="label-end()">
|
|
9805
9909
|
<fo:block>
|
|
9806
|
-
<xsl:
|
|
9910
|
+
<xsl:value-of select="$bibitem_label"/>
|
|
9807
9911
|
</fo:block>
|
|
9808
9912
|
</fo:list-item-label>
|
|
9809
9913
|
<fo:list-item-body start-indent="body-start()">
|
|
@@ -10876,13 +10980,14 @@
|
|
|
10876
10980
|
</xsl:template>
|
|
10877
10981
|
|
|
10878
10982
|
<xsl:template name="setId">
|
|
10983
|
+
<xsl:param name="prefix"/>
|
|
10879
10984
|
<xsl:attribute name="id">
|
|
10880
10985
|
<xsl:choose>
|
|
10881
10986
|
<xsl:when test="@id">
|
|
10882
|
-
<xsl:value-of select="@id"/>
|
|
10987
|
+
<xsl:value-of select="concat($prefix, @id)"/>
|
|
10883
10988
|
</xsl:when>
|
|
10884
10989
|
<xsl:otherwise>
|
|
10885
|
-
<xsl:value-of select="generate-id()"/>
|
|
10990
|
+
<xsl:value-of select="concat($prefix, generate-id())"/>
|
|
10886
10991
|
</xsl:otherwise>
|
|
10887
10992
|
</xsl:choose>
|
|
10888
10993
|
</xsl:attribute>
|