metanorma-ribose 2.7.6 → 2.7.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/isodoc/ribose/init.rb +2 -2
- data/lib/isodoc/ribose/ribose.standard.xsl +144 -98
- data/lib/metanorma/ribose/converter.rb +2 -0
- data/lib/metanorma/ribose/log.rb +15 -0
- data/lib/metanorma/ribose/version.rb +1 -1
- data/metanorma-ribose.gemspec +1 -1
- metadata +5 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9d3838b3c591e380f3d4181c3cfc086562d74f1013ad27ace96d39eecf1cd9bd
|
|
4
|
+
data.tar.gz: 19925bc0c4bd917e79a7c7b803f7f58d798ec5422944828da679079c6b4d6d7f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7c718aa3dc36f894f235f3ff73ed0c7d02131f5ac56fb59d0b91e16eaff5b192d072707898a4e38d1c9eef6e2a1243c54580498630bcc3ddc250a9999d84e27c
|
|
7
|
+
data.tar.gz: 7a5d544904e782bef4d78827801464ea8b36dc40560a6ac6b8809c2c3b87c8e8e0fca57fac2f4431e5412b11b964ef9d53e84ce469333b4ac7863ca8e6a14d35
|
data/lib/isodoc/ribose/init.rb
CHANGED
|
@@ -16,8 +16,8 @@ module IsoDoc
|
|
|
16
16
|
|
|
17
17
|
def i18n_init(lang, script, locale, i18nyaml = nil)
|
|
18
18
|
@i18n = I18n.new(
|
|
19
|
-
lang, script, locale: locale, i18nyaml: i18nyaml
|
|
20
|
-
Metanorma::Ribose.configuration.i18nyaml
|
|
19
|
+
lang, script, locale: locale, i18nyaml: [i18nyaml,
|
|
20
|
+
Metanorma::Ribose.configuration.i18nyaml, @i18nyaml]
|
|
21
21
|
)
|
|
22
22
|
end
|
|
23
23
|
end
|
|
@@ -35,24 +35,20 @@
|
|
|
35
35
|
<xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
|
|
36
36
|
|
|
37
37
|
<xsl:variable name="docnumber_version">
|
|
38
|
-
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'rsd' or @type = 'Ribose']"/>
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
</xsl:variable>
|
|
53
|
-
<xsl:text>, </xsl:text><xsl:value-of select="$title-version"/><xsl:text> </xsl:text><xsl:value-of select="$edition"/>
|
|
54
|
-
</xsl:if>
|
|
55
|
-
|
|
38
|
+
<xsl:value-of select="concat(/mn:metanorma/mn:bibdata/mn:docidentifier[@type = 'rsd' or @type = 'Ribose' or @primary = 'true'], ':', $copyright_year)"/>
|
|
39
|
+
<xsl:variable name="edition" select="normalize-space(/mn:metanorma/mn:bibdata/mn:edition[normalize-space(@language) = ''])"/>
|
|
40
|
+
<xsl:if test="$edition != ''">
|
|
41
|
+
<xsl:variable name="title-version">
|
|
42
|
+
<xsl:call-template name="capitalize">
|
|
43
|
+
<xsl:with-param name="str">
|
|
44
|
+
<xsl:call-template name="getLocalizedString">
|
|
45
|
+
<xsl:with-param name="key">version</xsl:with-param>
|
|
46
|
+
</xsl:call-template>
|
|
47
|
+
</xsl:with-param>
|
|
48
|
+
</xsl:call-template>
|
|
49
|
+
</xsl:variable>
|
|
50
|
+
<xsl:value-of select="concat(', ', $title-version, ' ', $edition)"/>
|
|
51
|
+
</xsl:if>
|
|
56
52
|
</xsl:variable>
|
|
57
53
|
|
|
58
54
|
<xsl:template name="layout-master-set">
|
|
@@ -638,7 +634,7 @@
|
|
|
638
634
|
<xsl:if test="$contents//mnx:item[@display = 'true']">
|
|
639
635
|
|
|
640
636
|
<fo:block-container xsl:use-attribute-sets="toc-style">
|
|
641
|
-
<fo:block-container
|
|
637
|
+
<fo:block-container xsl:use-attribute-sets="reset-margins-style">
|
|
642
638
|
<xsl:for-each select="$contents//mnx:item[@display = 'true']">
|
|
643
639
|
<fo:block xsl:use-attribute-sets="toc-item-style">
|
|
644
640
|
|
|
@@ -810,44 +806,6 @@
|
|
|
810
806
|
<xsl:call-template name="getLevel"/>
|
|
811
807
|
</xsl:variable>
|
|
812
808
|
|
|
813
|
-
<xsl:variable name="font-size">
|
|
814
|
-
<xsl:choose>
|
|
815
|
-
<!-- <xsl:when test="ancestor::mn:preface and $level >= 2">12pt</xsl:when>
|
|
816
|
-
<xsl:when test="ancestor::mn:preface">13pt</xsl:when> -->
|
|
817
|
-
<xsl:when test="$level = 1">22pt</xsl:when>
|
|
818
|
-
<!-- <xsl:when test="$level = 2">13pt</xsl:when>
|
|
819
|
-
<xsl:when test="$level >= 3">11pt</xsl:when>
|
|
820
|
-
<xsl:otherwise>16pt</xsl:otherwise> -->
|
|
821
|
-
<xsl:when test="$level >= 2">13pt</xsl:when>
|
|
822
|
-
<xsl:otherwise>13pt</xsl:otherwise>
|
|
823
|
-
</xsl:choose>
|
|
824
|
-
</xsl:variable>
|
|
825
|
-
|
|
826
|
-
<xsl:variable name="font-weight">
|
|
827
|
-
<xsl:choose>
|
|
828
|
-
<xsl:when test="$level >= 4">normal</xsl:when>
|
|
829
|
-
<xsl:otherwise>bold</xsl:otherwise> <!-- 600 - semibold-->
|
|
830
|
-
</xsl:choose>
|
|
831
|
-
</xsl:variable>
|
|
832
|
-
|
|
833
|
-
<xsl:variable name="space-before">
|
|
834
|
-
<xsl:choose>
|
|
835
|
-
<xsl:when test="$level = 1">25mm</xsl:when>
|
|
836
|
-
<xsl:when test="$level = 2">9mm</xsl:when>
|
|
837
|
-
<xsl:when test="$level = 3">12pt</xsl:when>
|
|
838
|
-
<xsl:when test="$level >= 4">8pt</xsl:when>
|
|
839
|
-
<xsl:otherwise>13.5pt</xsl:otherwise>
|
|
840
|
-
</xsl:choose>
|
|
841
|
-
</xsl:variable>
|
|
842
|
-
|
|
843
|
-
<xsl:variable name="margin-bottom">
|
|
844
|
-
<xsl:choose>
|
|
845
|
-
<xsl:when test="$level = 1">12pt</xsl:when>
|
|
846
|
-
<xsl:when test="$level >= 4">4pt</xsl:when>
|
|
847
|
-
<xsl:otherwise>12pt</xsl:otherwise>
|
|
848
|
-
</xsl:choose>
|
|
849
|
-
</xsl:variable>
|
|
850
|
-
|
|
851
809
|
<xsl:variable name="element-name">
|
|
852
810
|
<xsl:choose>
|
|
853
811
|
<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
|
|
@@ -855,27 +813,17 @@
|
|
|
855
813
|
</xsl:choose>
|
|
856
814
|
</xsl:variable>
|
|
857
815
|
|
|
858
|
-
<xsl:variable name="
|
|
859
|
-
<xsl:
|
|
860
|
-
<xsl:when test="$level = 3"><xsl:value-of select="$color_blue"/></xsl:when>
|
|
861
|
-
<xsl:otherwise>black</xsl:otherwise>
|
|
862
|
-
</xsl:choose>
|
|
816
|
+
<xsl:variable name="title_styles">
|
|
817
|
+
<styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"/></styles>
|
|
863
818
|
</xsl:variable>
|
|
864
819
|
|
|
865
820
|
<xsl:element name="{$element-name}">
|
|
866
|
-
<xsl:
|
|
867
|
-
<xsl:attribute name="font-weight"><xsl:value-of select="$font-weight"/></xsl:attribute>
|
|
868
|
-
<xsl:attribute name="space-before"><xsl:value-of select="$space-before"/></xsl:attribute>
|
|
869
|
-
<xsl:attribute name="margin-bottom"><xsl:value-of select="$margin-bottom"/></xsl:attribute>
|
|
870
|
-
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
871
|
-
<xsl:attribute name="color"><xsl:value-of select="$color"/></xsl:attribute>
|
|
872
|
-
<xsl:attribute name="line-height">125%</xsl:attribute>
|
|
873
|
-
<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
|
|
821
|
+
<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
|
|
874
822
|
|
|
875
823
|
<xsl:choose>
|
|
876
824
|
<xsl:when test="$level = 1">
|
|
877
825
|
<fo:block-container margin-left="-15mm" role="SKIP">
|
|
878
|
-
<fo:block-container
|
|
826
|
+
<fo:block-container xsl:use-attribute-sets="reset-margins-style">
|
|
879
827
|
<fo:table width="100%" table-layout="fixed" role="SKIP">
|
|
880
828
|
<fo:table-column column-width="15mm"/>
|
|
881
829
|
<fo:table-column column-width="150mm"/>
|
|
@@ -944,25 +892,16 @@
|
|
|
944
892
|
</xsl:variable>
|
|
945
893
|
|
|
946
894
|
<xsl:call-template name="setNamedDestination"/>
|
|
947
|
-
<xsl:element name="{$element-name}">
|
|
948
|
-
<xsl:attribute name="id">
|
|
949
|
-
<xsl:value-of select="@id"/>
|
|
950
|
-
</xsl:attribute>
|
|
951
895
|
|
|
952
|
-
|
|
896
|
+
<xsl:variable name="p_styles">
|
|
897
|
+
<styles xsl:use-attribute-sets="p-style">
|
|
898
|
+
<xsl:call-template name="refine_p-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template>
|
|
899
|
+
</styles>
|
|
900
|
+
</xsl:variable>
|
|
953
901
|
|
|
954
|
-
|
|
955
|
-
|
|
956
|
-
<xsl:when test="ancestor::mn:li">6pt</xsl:when>
|
|
957
|
-
<xsl:when test="ancestor::mn:feedback-statement and not(following-sibling::mn:p)">0pt</xsl:when>
|
|
958
|
-
<xsl:otherwise>6pt</xsl:otherwise> <!-- 12pt-->
|
|
959
|
-
</xsl:choose>
|
|
960
|
-
</xsl:attribute>
|
|
961
|
-
<xsl:if test="ancestor::mn:dl"> <!-- ancestor::mn:li or -->
|
|
962
|
-
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
963
|
-
</xsl:if>
|
|
902
|
+
<xsl:element name="{$element-name}">
|
|
903
|
+
<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
|
|
964
904
|
|
|
965
|
-
<!-- <xsl:attribute name="line-height">155%</xsl:attribute> -->
|
|
966
905
|
<xsl:apply-templates>
|
|
967
906
|
<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
|
|
968
907
|
</xsl:apply-templates>
|
|
@@ -982,7 +921,7 @@
|
|
|
982
921
|
|
|
983
922
|
<xsl:template match="mn:ul | mn:ol" mode="list" priority="2">
|
|
984
923
|
<fo:block-container role="SKIP">
|
|
985
|
-
<fo:block-container
|
|
924
|
+
<fo:block-container xsl:use-attribute-sets="reset-margins-style">
|
|
986
925
|
<xsl:choose>
|
|
987
926
|
<xsl:when test="not(ancestor::mn:ul) and not(ancestor::mn:ol)">
|
|
988
927
|
<fo:block padding-bottom="12pt" padding-top="4pt" role="SKIP">
|
|
@@ -1142,7 +1081,7 @@
|
|
|
1142
1081
|
<fo:block-container xsl:use-attribute-sets="clause-style">
|
|
1143
1082
|
<xsl:call-template name="refine_clause-style"/>
|
|
1144
1083
|
|
|
1145
|
-
<fo:block-container
|
|
1084
|
+
<fo:block-container xsl:use-attribute-sets="reset-margins-style">
|
|
1146
1085
|
<xsl:call-template name="setNamedDestination"/>
|
|
1147
1086
|
<fo:block role="SKIP">
|
|
1148
1087
|
<xsl:call-template name="setId"/>
|
|
@@ -1273,7 +1212,8 @@
|
|
|
1273
1212
|
<xsl:template name="insertFooter">
|
|
1274
1213
|
<!-- <xsl:param name="invert"/> -->
|
|
1275
1214
|
<xsl:variable name="footerText">
|
|
1276
|
-
|
|
1215
|
+
<!-- Ribose -->
|
|
1216
|
+
<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type = 'publisher']/mn:organization/mn:abbreviation"/>
|
|
1277
1217
|
<xsl:text> </xsl:text>
|
|
1278
1218
|
<xsl:call-template name="capitalizeWords">
|
|
1279
1219
|
<xsl:with-param name="str">
|
|
@@ -3416,6 +3356,10 @@
|
|
|
3416
3356
|
</xsl:element>
|
|
3417
3357
|
</xsl:template>
|
|
3418
3358
|
|
|
3359
|
+
<!-- show sourcecode's name 'before' or 'after' source code -->
|
|
3360
|
+
<xsl:variable name="sourcecode-name-position"><xsl:text>before</xsl:text>
|
|
3361
|
+
</xsl:variable>
|
|
3362
|
+
|
|
3419
3363
|
<xsl:template match="mn:sourcecode" name="sourcecode">
|
|
3420
3364
|
|
|
3421
3365
|
<xsl:variable name="sourcecode_attributes">
|
|
@@ -3439,8 +3383,12 @@
|
|
|
3439
3383
|
|
|
3440
3384
|
<xsl:call-template name="refine_sourcecode-container-style"/>
|
|
3441
3385
|
|
|
3442
|
-
<fo:block-container margin-left="0mm" role="SKIP">
|
|
3443
|
-
|
|
3386
|
+
<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
|
|
3387
|
+
|
|
3388
|
+
<!-- <xsl:if test="$namespace = 'rsd'"> -->
|
|
3389
|
+
<xsl:if test="$sourcecode-name-position = 'before'">
|
|
3390
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
|
|
3391
|
+
</xsl:if>
|
|
3444
3392
|
|
|
3445
3393
|
<fo:block xsl:use-attribute-sets="sourcecode-style">
|
|
3446
3394
|
|
|
@@ -3463,6 +3411,16 @@
|
|
|
3463
3411
|
|
|
3464
3412
|
<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
|
|
3465
3413
|
|
|
3414
|
+
<!-- <xsl:choose>
|
|
3415
|
+
<xsl:when test="$namespace = 'rsd'"></xsl:when>
|
|
3416
|
+
<xsl:otherwise>
|
|
3417
|
+
<xsl:apply-templates select="mn:fmt-name" /> --><!-- show sourcecode's name AFTER content -->
|
|
3418
|
+
<!-- </xsl:otherwise>
|
|
3419
|
+
</xsl:choose> -->
|
|
3420
|
+
<xsl:if test="$sourcecode-name-position = 'after'">
|
|
3421
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
|
|
3422
|
+
</xsl:if>
|
|
3423
|
+
|
|
3466
3424
|
</fo:block-container>
|
|
3467
3425
|
</fo:block-container>
|
|
3468
3426
|
</xsl:otherwise>
|
|
@@ -9313,6 +9271,10 @@
|
|
|
9313
9271
|
<!-- image -->
|
|
9314
9272
|
<!-- ====== -->
|
|
9315
9273
|
|
|
9274
|
+
<!-- show figure's name 'before' or 'after' image -->
|
|
9275
|
+
<xsl:variable name="figure-name-position"><xsl:text>before</xsl:text>
|
|
9276
|
+
</xsl:variable>
|
|
9277
|
+
|
|
9316
9278
|
<xsl:template match="mn:figure" name="figure">
|
|
9317
9279
|
<xsl:variable name="isAdded" select="@added"/>
|
|
9318
9280
|
<xsl:variable name="isDeleted" select="@deleted"/>
|
|
@@ -9323,8 +9285,11 @@
|
|
|
9323
9285
|
<xsl:call-template name="setTrackChangesStyles">
|
|
9324
9286
|
<xsl:with-param name="isAdded" select="$isAdded"/>
|
|
9325
9287
|
<xsl:with-param name="isDeleted" select="$isDeleted"/>
|
|
9326
|
-
</xsl:call-template>
|
|
9327
|
-
|
|
9288
|
+
</xsl:call-template>
|
|
9289
|
+
|
|
9290
|
+
<xsl:if test="$figure-name-position = 'before'"> <!-- show figure's name BEFORE image -->
|
|
9291
|
+
<xsl:apply-templates select="mn:fmt-name"/>
|
|
9292
|
+
</xsl:if>
|
|
9328
9293
|
|
|
9329
9294
|
<!-- Example: Dimensions in millimeters -->
|
|
9330
9295
|
<xsl:apply-templates select="mn:note[@type = 'units']"/>
|
|
@@ -9347,6 +9312,16 @@
|
|
|
9347
9312
|
<xsl:call-template name="showFigureKey"/>
|
|
9348
9313
|
</xsl:if>
|
|
9349
9314
|
|
|
9315
|
+
<!-- <xsl:choose>
|
|
9316
|
+
<xsl:when test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'rsd'"></xsl:when>
|
|
9317
|
+
<xsl:otherwise>
|
|
9318
|
+
<xsl:apply-templates select="mn:fmt-name" /> --> <!-- show figure's name AFTER image -->
|
|
9319
|
+
<!-- </xsl:otherwise>
|
|
9320
|
+
</xsl:choose> -->
|
|
9321
|
+
<xsl:if test="$figure-name-position = 'after'">
|
|
9322
|
+
<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
|
|
9323
|
+
</xsl:if>
|
|
9324
|
+
|
|
9350
9325
|
</fo:block-container>
|
|
9351
9326
|
</xsl:template>
|
|
9352
9327
|
|
|
@@ -11447,7 +11422,6 @@
|
|
|
11447
11422
|
</xsl:attribute-set>
|
|
11448
11423
|
|
|
11449
11424
|
<xsl:template name="refine_references-non-normative-title-style">
|
|
11450
|
-
|
|
11451
11425
|
</xsl:template>
|
|
11452
11426
|
|
|
11453
11427
|
<!-- bibitem in Normative References (references/@normative="true") -->
|
|
@@ -13577,7 +13551,7 @@
|
|
|
13577
13551
|
<!-- ===================================== -->
|
|
13578
13552
|
|
|
13579
13553
|
<xsl:attribute-set name="annex-title-style">
|
|
13580
|
-
</xsl:attribute-set>
|
|
13554
|
+
</xsl:attribute-set> <!-- annex-title-style -->
|
|
13581
13555
|
|
|
13582
13556
|
<xsl:template name="refine_annex-title-style">
|
|
13583
13557
|
</xsl:template>
|
|
@@ -13588,6 +13562,65 @@
|
|
|
13588
13562
|
<xsl:template name="refine_p-zzSTDTitle1-style">
|
|
13589
13563
|
</xsl:template>
|
|
13590
13564
|
|
|
13565
|
+
<xsl:attribute-set name="p-style">
|
|
13566
|
+
</xsl:attribute-set> <!-- p-style -->
|
|
13567
|
+
|
|
13568
|
+
<xsl:template name="refine_p-style">
|
|
13569
|
+
<xsl:param name="element-name"/>
|
|
13570
|
+
<xsl:param name="margin"/>
|
|
13571
|
+
<xsl:call-template name="setBlockAttributes"/>
|
|
13572
|
+
|
|
13573
|
+
<xsl:copy-of select="@id"/>
|
|
13574
|
+
|
|
13575
|
+
<xsl:attribute name="space-after">
|
|
13576
|
+
<xsl:choose>
|
|
13577
|
+
<xsl:when test="ancestor::mn:li">6pt</xsl:when>
|
|
13578
|
+
<xsl:when test="ancestor::mn:feedback-statement and not(following-sibling::mn:p)">0pt</xsl:when>
|
|
13579
|
+
<xsl:otherwise>6pt</xsl:otherwise>
|
|
13580
|
+
</xsl:choose>
|
|
13581
|
+
</xsl:attribute>
|
|
13582
|
+
<xsl:if test="ancestor::mn:dl">
|
|
13583
|
+
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
|
|
13584
|
+
</xsl:if>
|
|
13585
|
+
<!-- namespace = 'rsd' -->
|
|
13586
|
+
|
|
13587
|
+
</xsl:template> <!-- refine_p-style -->
|
|
13588
|
+
|
|
13589
|
+
<xsl:attribute-set name="title-style">
|
|
13590
|
+
<!-- Note: font-size for level 1 title -->
|
|
13591
|
+
<xsl:attribute name="font-size">22pt</xsl:attribute>
|
|
13592
|
+
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
13593
|
+
<xsl:attribute name="space-before">25mm</xsl:attribute>
|
|
13594
|
+
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
13595
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
13596
|
+
<xsl:attribute name="color">black</xsl:attribute>
|
|
13597
|
+
<xsl:attribute name="line-height">125%</xsl:attribute>
|
|
13598
|
+
</xsl:attribute-set> <!-- title-style -->
|
|
13599
|
+
|
|
13600
|
+
<xsl:template name="refine_title-style">
|
|
13601
|
+
<xsl:param name="element-name"/>
|
|
13602
|
+
<xsl:variable name="level">
|
|
13603
|
+
<xsl:call-template name="getLevel"/>
|
|
13604
|
+
</xsl:variable>
|
|
13605
|
+
<xsl:if test="$level >= 2">
|
|
13606
|
+
<xsl:attribute name="font-size">13pt</xsl:attribute>
|
|
13607
|
+
</xsl:if>
|
|
13608
|
+
<xsl:if test="$level = 2">
|
|
13609
|
+
<xsl:attribute name="space-before">9mm</xsl:attribute>
|
|
13610
|
+
</xsl:if>
|
|
13611
|
+
<xsl:if test="$level = 3">
|
|
13612
|
+
<xsl:attribute name="space-before">12pt</xsl:attribute>
|
|
13613
|
+
<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
|
|
13614
|
+
</xsl:if>
|
|
13615
|
+
<xsl:if test="$level >= 4">
|
|
13616
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
13617
|
+
<xsl:attribute name="space-before">8pt</xsl:attribute>
|
|
13618
|
+
<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
|
|
13619
|
+
</xsl:if>
|
|
13620
|
+
<!-- $namespace = 'rsd' -->
|
|
13621
|
+
<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
|
|
13622
|
+
</xsl:template> <!-- refine_title-style -->
|
|
13623
|
+
|
|
13591
13624
|
<xsl:template name="processPrefaceSectionsDefault">
|
|
13592
13625
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
|
|
13593
13626
|
<xsl:sort select="@displayorder" data-type="number"/>
|
|
@@ -13926,6 +13959,12 @@
|
|
|
13926
13959
|
</xsl:choose>
|
|
13927
13960
|
</xsl:template>
|
|
13928
13961
|
|
|
13962
|
+
<xsl:attribute-set name="reset-margins-style">
|
|
13963
|
+
<xsl:attribute name="margin-left">0mm</xsl:attribute>
|
|
13964
|
+
<xsl:attribute name="margin-right">0mm</xsl:attribute>
|
|
13965
|
+
<xsl:attribute name="role">SKIP</xsl:attribute>
|
|
13966
|
+
</xsl:attribute-set>
|
|
13967
|
+
|
|
13929
13968
|
<xsl:attribute-set name="clause-style">
|
|
13930
13969
|
|
|
13931
13970
|
</xsl:attribute-set>
|
|
@@ -14945,8 +14984,9 @@
|
|
|
14945
14984
|
|
|
14946
14985
|
<xsl:template name="setTextAlignment">
|
|
14947
14986
|
<xsl:param name="default">left</xsl:param>
|
|
14987
|
+
<xsl:param name="skip_default">false</xsl:param>
|
|
14948
14988
|
<xsl:variable name="align" select="normalize-space(@align)"/>
|
|
14949
|
-
<xsl:
|
|
14989
|
+
<xsl:variable name="text_align">
|
|
14950
14990
|
<xsl:choose>
|
|
14951
14991
|
<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
|
|
14952
14992
|
<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
|
|
@@ -14954,9 +14994,13 @@
|
|
|
14954
14994
|
<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
|
|
14955
14995
|
<xsl:when test="ancestor::mn:td/@align"><xsl:value-of select="ancestor::mn:td/@align"/></xsl:when>
|
|
14956
14996
|
<xsl:when test="ancestor::mn:th/@align"><xsl:value-of select="ancestor::mn:th/@align"/></xsl:when>
|
|
14997
|
+
<xsl:when test="$skip_default = 'true'"/>
|
|
14957
14998
|
<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
|
|
14958
14999
|
</xsl:choose>
|
|
14959
|
-
</xsl:
|
|
15000
|
+
</xsl:variable>
|
|
15001
|
+
<xsl:if test="normalize-space($text_align) != ''">
|
|
15002
|
+
<xsl:attribute name="text-align"><xsl:value-of select="$text_align"/></xsl:attribute>
|
|
15003
|
+
</xsl:if>
|
|
14960
15004
|
<xsl:if test="$align = 'indent'">
|
|
14961
15005
|
<xsl:attribute name="margin-left">7mm</xsl:attribute>
|
|
14962
15006
|
</xsl:if>
|
|
@@ -14964,8 +15008,10 @@
|
|
|
14964
15008
|
|
|
14965
15009
|
<xsl:template name="setBlockAttributes">
|
|
14966
15010
|
<xsl:param name="text_align_default">left</xsl:param>
|
|
15011
|
+
<xsl:param name="skip_text_align_default">false</xsl:param>
|
|
14967
15012
|
<xsl:call-template name="setTextAlignment">
|
|
14968
15013
|
<xsl:with-param name="default" select="$text_align_default"/>
|
|
15014
|
+
<xsl:with-param name="skip_default" select="$skip_text_align_default"/>
|
|
14969
15015
|
</xsl:call-template>
|
|
14970
15016
|
<xsl:call-template name="setKeepAttributes"/>
|
|
14971
15017
|
<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
module Metanorma
|
|
2
|
+
module Ribose
|
|
3
|
+
class Converter
|
|
4
|
+
RIBOSE_LOG_MESSAGES = {
|
|
5
|
+
# rubocop:disable Naming/VariableNumber
|
|
6
|
+
# No gem-specific log messages currently defined
|
|
7
|
+
}.freeze
|
|
8
|
+
# rubocop:enable Naming/VariableNumber
|
|
9
|
+
|
|
10
|
+
def log_messages
|
|
11
|
+
super.merge(RIBOSE_LOG_MESSAGES)
|
|
12
|
+
end
|
|
13
|
+
end
|
|
14
|
+
end
|
|
15
|
+
end
|
data/metanorma-ribose.gemspec
CHANGED
|
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
|
|
|
29
29
|
spec.require_paths = ["lib"]
|
|
30
30
|
spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
|
|
31
31
|
|
|
32
|
-
spec.add_dependency "metanorma-generic", "~> 3.
|
|
32
|
+
spec.add_dependency "metanorma-generic", "~> 3.2.0"
|
|
33
33
|
|
|
34
34
|
spec.add_development_dependency "debug"
|
|
35
35
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-ribose
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.7.
|
|
4
|
+
version: 2.7.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-
|
|
11
|
+
date: 2025-11-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 3.
|
|
19
|
+
version: 3.2.0
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - "~>"
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 3.
|
|
26
|
+
version: 3.2.0
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: debug
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -242,6 +242,7 @@ files:
|
|
|
242
242
|
- lib/metanorma/ribose/boilerplate.adoc
|
|
243
243
|
- lib/metanorma/ribose/converter.rb
|
|
244
244
|
- lib/metanorma/ribose/isodoc.rng
|
|
245
|
+
- lib/metanorma/ribose/log.rb
|
|
245
246
|
- lib/metanorma/ribose/processor.rb
|
|
246
247
|
- lib/metanorma/ribose/relaton-ribose.rng
|
|
247
248
|
- lib/metanorma/ribose/reqt.rng
|