metanorma-ogc 2.3.14 → 2.4.1
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/ogc/base_convert.rb +9 -18
- data/lib/isodoc/ogc/html_convert.rb +2 -11
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +71 -29
- data/lib/isodoc/ogc/ogc.best-practice.xsl +71 -29
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +71 -29
- data/lib/isodoc/ogc/ogc.community-practice.xsl +71 -29
- data/lib/isodoc/ogc/ogc.community-standard.xsl +71 -29
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +71 -29
- data/lib/isodoc/ogc/ogc.draft-standard.xsl +71 -29
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +71 -29
- data/lib/isodoc/ogc/ogc.other.xsl +71 -29
- data/lib/isodoc/ogc/ogc.policy.xsl +71 -29
- data/lib/isodoc/ogc/ogc.reference-model.xsl +71 -29
- data/lib/isodoc/ogc/ogc.release-notes.xsl +71 -29
- data/lib/isodoc/ogc/ogc.standard.xsl +71 -29
- data/lib/isodoc/ogc/ogc.test-suite.xsl +71 -29
- data/lib/isodoc/ogc/ogc.user-guide.xsl +71 -29
- data/lib/isodoc/ogc/ogc.white-paper.xsl +70 -28
- data/lib/isodoc/ogc/presentation_xml_convert.rb +2 -27
- data/lib/isodoc/ogc/sections.rb +4 -27
- data/lib/isodoc/ogc/word_convert.rb +3 -22
- data/lib/isodoc/ogc/xref.rb +21 -46
- data/lib/metanorma/ogc/boilerplate.adoc +2 -2
- data/lib/metanorma/ogc/isodoc.rng +29 -4
- data/lib/metanorma/ogc/version.rb +1 -1
- data/metanorma-ogc.gemspec +1 -1
- metadata +4 -4
|
@@ -1184,7 +1184,7 @@
|
|
|
1184
1184
|
</xsl:if>
|
|
1185
1185
|
</xsl:template>
|
|
1186
1186
|
|
|
1187
|
-
<xsl:template match="*[local-name()='th']//text()" priority="2">
|
|
1187
|
+
<xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
|
|
1188
1188
|
<xsl:variable name="text">
|
|
1189
1189
|
<xsl:call-template name="add-zero-spaces-java"/>
|
|
1190
1190
|
</xsl:variable>
|
|
@@ -1822,11 +1822,26 @@
|
|
|
1822
1822
|
<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
|
|
1823
1823
|
</xsl:if>
|
|
1824
1824
|
|
|
1825
|
-
<xsl:
|
|
1825
|
+
<xsl:variable name="font_family" select="."/>
|
|
1826
1826
|
|
|
1827
|
-
<xsl:
|
|
1828
|
-
<xsl:
|
|
1829
|
-
|
|
1827
|
+
<xsl:choose>
|
|
1828
|
+
<xsl:when test="$additional_fonts = ''">
|
|
1829
|
+
<xsl:value-of select="$font_family"/>
|
|
1830
|
+
</xsl:when>
|
|
1831
|
+
<xsl:otherwise> <!-- $additional_fonts != '' -->
|
|
1832
|
+
<xsl:choose>
|
|
1833
|
+
<xsl:when test="contains($font_family, ',')">
|
|
1834
|
+
<xsl:value-of select="substring-before($font_family, ',')"/>
|
|
1835
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
|
1836
|
+
<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
|
|
1837
|
+
</xsl:when>
|
|
1838
|
+
<xsl:otherwise>
|
|
1839
|
+
<xsl:value-of select="$font_family"/>
|
|
1840
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
|
1841
|
+
</xsl:otherwise>
|
|
1842
|
+
</xsl:choose>
|
|
1843
|
+
</xsl:otherwise>
|
|
1844
|
+
</xsl:choose>
|
|
1830
1845
|
</xsl:attribute>
|
|
1831
1846
|
</xsl:when>
|
|
1832
1847
|
<xsl:otherwise>
|
|
@@ -4480,21 +4495,21 @@
|
|
|
4480
4495
|
|
|
4481
4496
|
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
|
4482
4497
|
|
|
4483
|
-
|
|
4498
|
+
<fo:block xsl:use-attribute-sets="table-note-style">
|
|
4484
4499
|
|
|
4485
|
-
|
|
4500
|
+
<xsl:call-template name="refine_table-note-style"/>
|
|
4486
4501
|
|
|
4487
|
-
|
|
4488
|
-
|
|
4502
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
|
4503
|
+
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
|
4489
4504
|
|
|
4490
|
-
|
|
4505
|
+
<xsl:call-template name="refine_table-note-name-style"/>
|
|
4491
4506
|
|
|
4492
|
-
|
|
4507
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/>
|
|
4493
4508
|
|
|
4494
|
-
|
|
4509
|
+
</fo:inline>
|
|
4495
4510
|
|
|
4496
|
-
|
|
4497
|
-
|
|
4511
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
4512
|
+
</fo:block>
|
|
4498
4513
|
|
|
4499
4514
|
</xsl:template> <!-- table/note -->
|
|
4500
4515
|
|
|
@@ -5577,6 +5592,9 @@
|
|
|
5577
5592
|
<!-- END Definition List -->
|
|
5578
5593
|
<!-- ===================== -->
|
|
5579
5594
|
|
|
5595
|
+
<!-- default: ignore title in sections/p -->
|
|
5596
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5597
|
+
|
|
5580
5598
|
<!-- ========================= -->
|
|
5581
5599
|
<!-- Rich text formatting -->
|
|
5582
5600
|
<!-- ========================= -->
|
|
@@ -7634,8 +7652,12 @@
|
|
|
7634
7652
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
7635
7653
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
7636
7654
|
<xsl:choose>
|
|
7637
|
-
<xsl:when test="ancestor::*[local-name() = 'title']">
|
|
7655
|
+
<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
|
7638
7656
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
7657
|
+
<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
|
7658
|
+
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
7659
|
+
<xsl:attribute name="padding-right">0mm</xsl:attribute>
|
|
7660
|
+
</xsl:if>
|
|
7639
7661
|
<xsl:variable name="src">
|
|
7640
7662
|
<xsl:call-template name="image_src"/>
|
|
7641
7663
|
</xsl:variable>
|
|
@@ -7668,25 +7690,45 @@
|
|
|
7668
7690
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7691
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7692
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7693
|
+
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
|
7694
|
+
<xsl:attribute name="width">
|
|
7695
|
+
<xsl:value-of select="@width"/>
|
|
7696
|
+
</xsl:attribute>
|
|
7697
|
+
</xsl:if>
|
|
7677
7698
|
|
|
7678
|
-
<xsl:
|
|
7699
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7700
|
+
<xsl:attribute name="height">
|
|
7701
|
+
<xsl:value-of select="@height"/>
|
|
7702
|
+
</xsl:attribute>
|
|
7703
|
+
</xsl:if>
|
|
7679
7704
|
|
|
7680
|
-
|
|
7705
|
+
<xsl:choose>
|
|
7706
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7707
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7708
|
+
</xsl:when>
|
|
7709
|
+
<xsl:otherwise>
|
|
7681
7710
|
|
|
7682
|
-
|
|
7711
|
+
<xsl:variable name="img_src">
|
|
7712
|
+
<xsl:choose>
|
|
7713
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7714
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7715
|
+
</xsl:choose>
|
|
7716
|
+
</xsl:variable>
|
|
7683
7717
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7718
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7719
|
|
|
7687
|
-
|
|
7720
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7721
|
|
|
7689
|
-
|
|
7722
|
+
</xsl:variable>
|
|
7723
|
+
|
|
7724
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7725
|
+
<xsl:if test="number($scale) < 100">
|
|
7726
|
+
|
|
7727
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7728
|
+
|
|
7729
|
+
</xsl:if>
|
|
7730
|
+
</xsl:otherwise>
|
|
7731
|
+
</xsl:choose>
|
|
7690
7732
|
|
|
7691
7733
|
</xsl:if>
|
|
7692
7734
|
|
|
@@ -11387,7 +11429,7 @@
|
|
|
11387
11429
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11430
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11431
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11432
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11391
11433
|
<xsl:copy>
|
|
11392
11434
|
<xsl:copy-of select="@*"/>
|
|
11393
11435
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
@@ -1184,7 +1184,7 @@
|
|
|
1184
1184
|
</xsl:if>
|
|
1185
1185
|
</xsl:template>
|
|
1186
1186
|
|
|
1187
|
-
<xsl:template match="*[local-name()='th']//text()" priority="2">
|
|
1187
|
+
<xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
|
|
1188
1188
|
<xsl:variable name="text">
|
|
1189
1189
|
<xsl:call-template name="add-zero-spaces-java"/>
|
|
1190
1190
|
</xsl:variable>
|
|
@@ -1822,11 +1822,26 @@
|
|
|
1822
1822
|
<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
|
|
1823
1823
|
</xsl:if>
|
|
1824
1824
|
|
|
1825
|
-
<xsl:
|
|
1825
|
+
<xsl:variable name="font_family" select="."/>
|
|
1826
1826
|
|
|
1827
|
-
<xsl:
|
|
1828
|
-
<xsl:
|
|
1829
|
-
|
|
1827
|
+
<xsl:choose>
|
|
1828
|
+
<xsl:when test="$additional_fonts = ''">
|
|
1829
|
+
<xsl:value-of select="$font_family"/>
|
|
1830
|
+
</xsl:when>
|
|
1831
|
+
<xsl:otherwise> <!-- $additional_fonts != '' -->
|
|
1832
|
+
<xsl:choose>
|
|
1833
|
+
<xsl:when test="contains($font_family, ',')">
|
|
1834
|
+
<xsl:value-of select="substring-before($font_family, ',')"/>
|
|
1835
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
|
1836
|
+
<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
|
|
1837
|
+
</xsl:when>
|
|
1838
|
+
<xsl:otherwise>
|
|
1839
|
+
<xsl:value-of select="$font_family"/>
|
|
1840
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
|
1841
|
+
</xsl:otherwise>
|
|
1842
|
+
</xsl:choose>
|
|
1843
|
+
</xsl:otherwise>
|
|
1844
|
+
</xsl:choose>
|
|
1830
1845
|
</xsl:attribute>
|
|
1831
1846
|
</xsl:when>
|
|
1832
1847
|
<xsl:otherwise>
|
|
@@ -4480,21 +4495,21 @@
|
|
|
4480
4495
|
|
|
4481
4496
|
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
|
4482
4497
|
|
|
4483
|
-
|
|
4498
|
+
<fo:block xsl:use-attribute-sets="table-note-style">
|
|
4484
4499
|
|
|
4485
|
-
|
|
4500
|
+
<xsl:call-template name="refine_table-note-style"/>
|
|
4486
4501
|
|
|
4487
|
-
|
|
4488
|
-
|
|
4502
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
|
4503
|
+
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
|
4489
4504
|
|
|
4490
|
-
|
|
4505
|
+
<xsl:call-template name="refine_table-note-name-style"/>
|
|
4491
4506
|
|
|
4492
|
-
|
|
4507
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/>
|
|
4493
4508
|
|
|
4494
|
-
|
|
4509
|
+
</fo:inline>
|
|
4495
4510
|
|
|
4496
|
-
|
|
4497
|
-
|
|
4511
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
4512
|
+
</fo:block>
|
|
4498
4513
|
|
|
4499
4514
|
</xsl:template> <!-- table/note -->
|
|
4500
4515
|
|
|
@@ -5577,6 +5592,9 @@
|
|
|
5577
5592
|
<!-- END Definition List -->
|
|
5578
5593
|
<!-- ===================== -->
|
|
5579
5594
|
|
|
5595
|
+
<!-- default: ignore title in sections/p -->
|
|
5596
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5597
|
+
|
|
5580
5598
|
<!-- ========================= -->
|
|
5581
5599
|
<!-- Rich text formatting -->
|
|
5582
5600
|
<!-- ========================= -->
|
|
@@ -7634,8 +7652,12 @@
|
|
|
7634
7652
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
7635
7653
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
7636
7654
|
<xsl:choose>
|
|
7637
|
-
<xsl:when test="ancestor::*[local-name() = 'title']">
|
|
7655
|
+
<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
|
7638
7656
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
7657
|
+
<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
|
7658
|
+
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
7659
|
+
<xsl:attribute name="padding-right">0mm</xsl:attribute>
|
|
7660
|
+
</xsl:if>
|
|
7639
7661
|
<xsl:variable name="src">
|
|
7640
7662
|
<xsl:call-template name="image_src"/>
|
|
7641
7663
|
</xsl:variable>
|
|
@@ -7668,25 +7690,45 @@
|
|
|
7668
7690
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7691
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7692
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7693
|
+
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
|
7694
|
+
<xsl:attribute name="width">
|
|
7695
|
+
<xsl:value-of select="@width"/>
|
|
7696
|
+
</xsl:attribute>
|
|
7697
|
+
</xsl:if>
|
|
7677
7698
|
|
|
7678
|
-
<xsl:
|
|
7699
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7700
|
+
<xsl:attribute name="height">
|
|
7701
|
+
<xsl:value-of select="@height"/>
|
|
7702
|
+
</xsl:attribute>
|
|
7703
|
+
</xsl:if>
|
|
7679
7704
|
|
|
7680
|
-
|
|
7705
|
+
<xsl:choose>
|
|
7706
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7707
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7708
|
+
</xsl:when>
|
|
7709
|
+
<xsl:otherwise>
|
|
7681
7710
|
|
|
7682
|
-
|
|
7711
|
+
<xsl:variable name="img_src">
|
|
7712
|
+
<xsl:choose>
|
|
7713
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7714
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7715
|
+
</xsl:choose>
|
|
7716
|
+
</xsl:variable>
|
|
7683
7717
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7718
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7719
|
|
|
7687
|
-
|
|
7720
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7721
|
|
|
7689
|
-
|
|
7722
|
+
</xsl:variable>
|
|
7723
|
+
|
|
7724
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7725
|
+
<xsl:if test="number($scale) < 100">
|
|
7726
|
+
|
|
7727
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7728
|
+
|
|
7729
|
+
</xsl:if>
|
|
7730
|
+
</xsl:otherwise>
|
|
7731
|
+
</xsl:choose>
|
|
7690
7732
|
|
|
7691
7733
|
</xsl:if>
|
|
7692
7734
|
|
|
@@ -11387,7 +11429,7 @@
|
|
|
11387
11429
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11430
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11431
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11432
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11391
11433
|
<xsl:copy>
|
|
11392
11434
|
<xsl:copy-of select="@*"/>
|
|
11393
11435
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
@@ -1184,7 +1184,7 @@
|
|
|
1184
1184
|
</xsl:if>
|
|
1185
1185
|
</xsl:template>
|
|
1186
1186
|
|
|
1187
|
-
<xsl:template match="*[local-name()='th']//text()" priority="2">
|
|
1187
|
+
<xsl:template match="*[local-name()='th']//text()[not(ancestor::ogc:fn)]" priority="2">
|
|
1188
1188
|
<xsl:variable name="text">
|
|
1189
1189
|
<xsl:call-template name="add-zero-spaces-java"/>
|
|
1190
1190
|
</xsl:variable>
|
|
@@ -1822,11 +1822,26 @@
|
|
|
1822
1822
|
<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
|
|
1823
1823
|
</xsl:if>
|
|
1824
1824
|
|
|
1825
|
-
<xsl:
|
|
1825
|
+
<xsl:variable name="font_family" select="."/>
|
|
1826
1826
|
|
|
1827
|
-
<xsl:
|
|
1828
|
-
<xsl:
|
|
1829
|
-
|
|
1827
|
+
<xsl:choose>
|
|
1828
|
+
<xsl:when test="$additional_fonts = ''">
|
|
1829
|
+
<xsl:value-of select="$font_family"/>
|
|
1830
|
+
</xsl:when>
|
|
1831
|
+
<xsl:otherwise> <!-- $additional_fonts != '' -->
|
|
1832
|
+
<xsl:choose>
|
|
1833
|
+
<xsl:when test="contains($font_family, ',')">
|
|
1834
|
+
<xsl:value-of select="substring-before($font_family, ',')"/>
|
|
1835
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
|
1836
|
+
<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
|
|
1837
|
+
</xsl:when>
|
|
1838
|
+
<xsl:otherwise>
|
|
1839
|
+
<xsl:value-of select="$font_family"/>
|
|
1840
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
|
1841
|
+
</xsl:otherwise>
|
|
1842
|
+
</xsl:choose>
|
|
1843
|
+
</xsl:otherwise>
|
|
1844
|
+
</xsl:choose>
|
|
1830
1845
|
</xsl:attribute>
|
|
1831
1846
|
</xsl:when>
|
|
1832
1847
|
<xsl:otherwise>
|
|
@@ -4480,21 +4495,21 @@
|
|
|
4480
4495
|
|
|
4481
4496
|
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
|
4482
4497
|
|
|
4483
|
-
|
|
4498
|
+
<fo:block xsl:use-attribute-sets="table-note-style">
|
|
4484
4499
|
|
|
4485
|
-
|
|
4500
|
+
<xsl:call-template name="refine_table-note-style"/>
|
|
4486
4501
|
|
|
4487
|
-
|
|
4488
|
-
|
|
4502
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
|
4503
|
+
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
|
4489
4504
|
|
|
4490
|
-
|
|
4505
|
+
<xsl:call-template name="refine_table-note-name-style"/>
|
|
4491
4506
|
|
|
4492
|
-
|
|
4507
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/>
|
|
4493
4508
|
|
|
4494
|
-
|
|
4509
|
+
</fo:inline>
|
|
4495
4510
|
|
|
4496
|
-
|
|
4497
|
-
|
|
4511
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
|
4512
|
+
</fo:block>
|
|
4498
4513
|
|
|
4499
4514
|
</xsl:template> <!-- table/note -->
|
|
4500
4515
|
|
|
@@ -5577,6 +5592,9 @@
|
|
|
5577
5592
|
<!-- END Definition List -->
|
|
5578
5593
|
<!-- ===================== -->
|
|
5579
5594
|
|
|
5595
|
+
<!-- default: ignore title in sections/p -->
|
|
5596
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5597
|
+
|
|
5580
5598
|
<!-- ========================= -->
|
|
5581
5599
|
<!-- Rich text formatting -->
|
|
5582
5600
|
<!-- ========================= -->
|
|
@@ -7634,8 +7652,12 @@
|
|
|
7634
7652
|
<xsl:variable name="isAdded" select="../@added"/>
|
|
7635
7653
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
|
7636
7654
|
<xsl:choose>
|
|
7637
|
-
<xsl:when test="ancestor::*[local-name() = 'title']">
|
|
7655
|
+
<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
|
7638
7656
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
|
7657
|
+
<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
|
7658
|
+
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
|
7659
|
+
<xsl:attribute name="padding-right">0mm</xsl:attribute>
|
|
7660
|
+
</xsl:if>
|
|
7639
7661
|
<xsl:variable name="src">
|
|
7640
7662
|
<xsl:call-template name="image_src"/>
|
|
7641
7663
|
</xsl:variable>
|
|
@@ -7668,25 +7690,45 @@
|
|
|
7668
7690
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7691
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7692
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7693
|
+
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
|
7694
|
+
<xsl:attribute name="width">
|
|
7695
|
+
<xsl:value-of select="@width"/>
|
|
7696
|
+
</xsl:attribute>
|
|
7697
|
+
</xsl:if>
|
|
7677
7698
|
|
|
7678
|
-
<xsl:
|
|
7699
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7700
|
+
<xsl:attribute name="height">
|
|
7701
|
+
<xsl:value-of select="@height"/>
|
|
7702
|
+
</xsl:attribute>
|
|
7703
|
+
</xsl:if>
|
|
7679
7704
|
|
|
7680
|
-
|
|
7705
|
+
<xsl:choose>
|
|
7706
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7707
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7708
|
+
</xsl:when>
|
|
7709
|
+
<xsl:otherwise>
|
|
7681
7710
|
|
|
7682
|
-
|
|
7711
|
+
<xsl:variable name="img_src">
|
|
7712
|
+
<xsl:choose>
|
|
7713
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7714
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7715
|
+
</xsl:choose>
|
|
7716
|
+
</xsl:variable>
|
|
7683
7717
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7718
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7719
|
|
|
7687
|
-
|
|
7720
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7721
|
|
|
7689
|
-
|
|
7722
|
+
</xsl:variable>
|
|
7723
|
+
|
|
7724
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7725
|
+
<xsl:if test="number($scale) < 100">
|
|
7726
|
+
|
|
7727
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7728
|
+
|
|
7729
|
+
</xsl:if>
|
|
7730
|
+
</xsl:otherwise>
|
|
7731
|
+
</xsl:choose>
|
|
7690
7732
|
|
|
7691
7733
|
</xsl:if>
|
|
7692
7734
|
|
|
@@ -11387,7 +11429,7 @@
|
|
|
11387
11429
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11430
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11431
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11432
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11391
11433
|
<xsl:copy>
|
|
11392
11434
|
<xsl:copy-of select="@*"/>
|
|
11393
11435
|
<xsl:apply-templates mode="update_xml_step1"/>
|