metanorma-ogc 2.3.14 → 2.4.0
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 +38 -15
- data/lib/isodoc/ogc/ogc.best-practice.xsl +38 -15
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +38 -15
- data/lib/isodoc/ogc/ogc.community-practice.xsl +38 -15
- data/lib/isodoc/ogc/ogc.community-standard.xsl +38 -15
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +38 -15
- data/lib/isodoc/ogc/ogc.draft-standard.xsl +38 -15
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +38 -15
- data/lib/isodoc/ogc/ogc.other.xsl +38 -15
- data/lib/isodoc/ogc/ogc.policy.xsl +38 -15
- data/lib/isodoc/ogc/ogc.reference-model.xsl +38 -15
- data/lib/isodoc/ogc/ogc.release-notes.xsl +38 -15
- data/lib/isodoc/ogc/ogc.standard.xsl +38 -15
- data/lib/isodoc/ogc/ogc.test-suite.xsl +38 -15
- data/lib/isodoc/ogc/ogc.user-guide.xsl +38 -15
- data/lib/isodoc/ogc/ogc.white-paper.xsl +37 -14
- data/lib/isodoc/ogc/presentation_xml_convert.rb +2 -0
- data/lib/isodoc/ogc/sections.rb +4 -27
- data/lib/isodoc/ogc/word_convert.rb +3 -22
- data/lib/metanorma/ogc/boilerplate.adoc +2 -2
- data/lib/metanorma/ogc/isodoc.rng +26 -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>
|
|
@@ -5577,6 +5577,9 @@
|
|
|
5577
5577
|
<!-- END Definition List -->
|
|
5578
5578
|
<!-- ===================== -->
|
|
5579
5579
|
|
|
5580
|
+
<!-- default: ignore title in sections/p -->
|
|
5581
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5582
|
+
|
|
5580
5583
|
<!-- ========================= -->
|
|
5581
5584
|
<!-- Rich text formatting -->
|
|
5582
5585
|
<!-- ========================= -->
|
|
@@ -7668,25 +7671,45 @@
|
|
|
7668
7671
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7672
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7673
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7674
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
|
7675
|
+
<xsl:attribute name="width">
|
|
7676
|
+
<xsl:value-of select="@width"/>
|
|
7677
|
+
</xsl:attribute>
|
|
7678
|
+
</xsl:if>
|
|
7677
7679
|
|
|
7678
|
-
<xsl:
|
|
7680
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7681
|
+
<xsl:attribute name="height">
|
|
7682
|
+
<xsl:value-of select="@height"/>
|
|
7683
|
+
</xsl:attribute>
|
|
7684
|
+
</xsl:if>
|
|
7679
7685
|
|
|
7680
|
-
|
|
7686
|
+
<xsl:choose>
|
|
7687
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7688
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7689
|
+
</xsl:when>
|
|
7690
|
+
<xsl:otherwise>
|
|
7681
7691
|
|
|
7682
|
-
|
|
7692
|
+
<xsl:variable name="img_src">
|
|
7693
|
+
<xsl:choose>
|
|
7694
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7695
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7696
|
+
</xsl:choose>
|
|
7697
|
+
</xsl:variable>
|
|
7683
7698
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7699
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7700
|
|
|
7687
|
-
|
|
7701
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7702
|
|
|
7689
|
-
|
|
7703
|
+
</xsl:variable>
|
|
7704
|
+
|
|
7705
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7706
|
+
<xsl:if test="number($scale) < 100">
|
|
7707
|
+
|
|
7708
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7709
|
+
|
|
7710
|
+
</xsl:if>
|
|
7711
|
+
</xsl:otherwise>
|
|
7712
|
+
</xsl:choose>
|
|
7690
7713
|
|
|
7691
7714
|
</xsl:if>
|
|
7692
7715
|
|
|
@@ -11387,7 +11410,7 @@
|
|
|
11387
11410
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11411
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11412
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11413
|
+
<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
11414
|
<xsl:copy>
|
|
11392
11415
|
<xsl:copy-of select="@*"/>
|
|
11393
11416
|
<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>
|
|
@@ -5577,6 +5577,9 @@
|
|
|
5577
5577
|
<!-- END Definition List -->
|
|
5578
5578
|
<!-- ===================== -->
|
|
5579
5579
|
|
|
5580
|
+
<!-- default: ignore title in sections/p -->
|
|
5581
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5582
|
+
|
|
5580
5583
|
<!-- ========================= -->
|
|
5581
5584
|
<!-- Rich text formatting -->
|
|
5582
5585
|
<!-- ========================= -->
|
|
@@ -7668,25 +7671,45 @@
|
|
|
7668
7671
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7672
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7673
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7674
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
|
7675
|
+
<xsl:attribute name="width">
|
|
7676
|
+
<xsl:value-of select="@width"/>
|
|
7677
|
+
</xsl:attribute>
|
|
7678
|
+
</xsl:if>
|
|
7677
7679
|
|
|
7678
|
-
<xsl:
|
|
7680
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7681
|
+
<xsl:attribute name="height">
|
|
7682
|
+
<xsl:value-of select="@height"/>
|
|
7683
|
+
</xsl:attribute>
|
|
7684
|
+
</xsl:if>
|
|
7679
7685
|
|
|
7680
|
-
|
|
7686
|
+
<xsl:choose>
|
|
7687
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7688
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7689
|
+
</xsl:when>
|
|
7690
|
+
<xsl:otherwise>
|
|
7681
7691
|
|
|
7682
|
-
|
|
7692
|
+
<xsl:variable name="img_src">
|
|
7693
|
+
<xsl:choose>
|
|
7694
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7695
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7696
|
+
</xsl:choose>
|
|
7697
|
+
</xsl:variable>
|
|
7683
7698
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7699
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7700
|
|
|
7687
|
-
|
|
7701
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7702
|
|
|
7689
|
-
|
|
7703
|
+
</xsl:variable>
|
|
7704
|
+
|
|
7705
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7706
|
+
<xsl:if test="number($scale) < 100">
|
|
7707
|
+
|
|
7708
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7709
|
+
|
|
7710
|
+
</xsl:if>
|
|
7711
|
+
</xsl:otherwise>
|
|
7712
|
+
</xsl:choose>
|
|
7690
7713
|
|
|
7691
7714
|
</xsl:if>
|
|
7692
7715
|
|
|
@@ -11387,7 +11410,7 @@
|
|
|
11387
11410
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11411
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11412
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11413
|
+
<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
11414
|
<xsl:copy>
|
|
11392
11415
|
<xsl:copy-of select="@*"/>
|
|
11393
11416
|
<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>
|
|
@@ -5577,6 +5577,9 @@
|
|
|
5577
5577
|
<!-- END Definition List -->
|
|
5578
5578
|
<!-- ===================== -->
|
|
5579
5579
|
|
|
5580
|
+
<!-- default: ignore title in sections/p -->
|
|
5581
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5582
|
+
|
|
5580
5583
|
<!-- ========================= -->
|
|
5581
5584
|
<!-- Rich text formatting -->
|
|
5582
5585
|
<!-- ========================= -->
|
|
@@ -7668,25 +7671,45 @@
|
|
|
7668
7671
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7672
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7673
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7674
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
|
7675
|
+
<xsl:attribute name="width">
|
|
7676
|
+
<xsl:value-of select="@width"/>
|
|
7677
|
+
</xsl:attribute>
|
|
7678
|
+
</xsl:if>
|
|
7677
7679
|
|
|
7678
|
-
<xsl:
|
|
7680
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7681
|
+
<xsl:attribute name="height">
|
|
7682
|
+
<xsl:value-of select="@height"/>
|
|
7683
|
+
</xsl:attribute>
|
|
7684
|
+
</xsl:if>
|
|
7679
7685
|
|
|
7680
|
-
|
|
7686
|
+
<xsl:choose>
|
|
7687
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7688
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7689
|
+
</xsl:when>
|
|
7690
|
+
<xsl:otherwise>
|
|
7681
7691
|
|
|
7682
|
-
|
|
7692
|
+
<xsl:variable name="img_src">
|
|
7693
|
+
<xsl:choose>
|
|
7694
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7695
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7696
|
+
</xsl:choose>
|
|
7697
|
+
</xsl:variable>
|
|
7683
7698
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7699
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7700
|
|
|
7687
|
-
|
|
7701
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7702
|
|
|
7689
|
-
|
|
7703
|
+
</xsl:variable>
|
|
7704
|
+
|
|
7705
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7706
|
+
<xsl:if test="number($scale) < 100">
|
|
7707
|
+
|
|
7708
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7709
|
+
|
|
7710
|
+
</xsl:if>
|
|
7711
|
+
</xsl:otherwise>
|
|
7712
|
+
</xsl:choose>
|
|
7690
7713
|
|
|
7691
7714
|
</xsl:if>
|
|
7692
7715
|
|
|
@@ -11387,7 +11410,7 @@
|
|
|
11387
11410
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11411
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11412
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11413
|
+
<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
11414
|
<xsl:copy>
|
|
11392
11415
|
<xsl:copy-of select="@*"/>
|
|
11393
11416
|
<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>
|
|
@@ -5577,6 +5577,9 @@
|
|
|
5577
5577
|
<!-- END Definition List -->
|
|
5578
5578
|
<!-- ===================== -->
|
|
5579
5579
|
|
|
5580
|
+
<!-- default: ignore title in sections/p -->
|
|
5581
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5582
|
+
|
|
5580
5583
|
<!-- ========================= -->
|
|
5581
5584
|
<!-- Rich text formatting -->
|
|
5582
5585
|
<!-- ========================= -->
|
|
@@ -7668,25 +7671,45 @@
|
|
|
7668
7671
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7672
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7673
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7674
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
|
7675
|
+
<xsl:attribute name="width">
|
|
7676
|
+
<xsl:value-of select="@width"/>
|
|
7677
|
+
</xsl:attribute>
|
|
7678
|
+
</xsl:if>
|
|
7677
7679
|
|
|
7678
|
-
<xsl:
|
|
7680
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7681
|
+
<xsl:attribute name="height">
|
|
7682
|
+
<xsl:value-of select="@height"/>
|
|
7683
|
+
</xsl:attribute>
|
|
7684
|
+
</xsl:if>
|
|
7679
7685
|
|
|
7680
|
-
|
|
7686
|
+
<xsl:choose>
|
|
7687
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7688
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7689
|
+
</xsl:when>
|
|
7690
|
+
<xsl:otherwise>
|
|
7681
7691
|
|
|
7682
|
-
|
|
7692
|
+
<xsl:variable name="img_src">
|
|
7693
|
+
<xsl:choose>
|
|
7694
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7695
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7696
|
+
</xsl:choose>
|
|
7697
|
+
</xsl:variable>
|
|
7683
7698
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7699
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7700
|
|
|
7687
|
-
|
|
7701
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7702
|
|
|
7689
|
-
|
|
7703
|
+
</xsl:variable>
|
|
7704
|
+
|
|
7705
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7706
|
+
<xsl:if test="number($scale) < 100">
|
|
7707
|
+
|
|
7708
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7709
|
+
|
|
7710
|
+
</xsl:if>
|
|
7711
|
+
</xsl:otherwise>
|
|
7712
|
+
</xsl:choose>
|
|
7690
7713
|
|
|
7691
7714
|
</xsl:if>
|
|
7692
7715
|
|
|
@@ -11387,7 +11410,7 @@
|
|
|
11387
11410
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11411
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11412
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11413
|
+
<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
11414
|
<xsl:copy>
|
|
11392
11415
|
<xsl:copy-of select="@*"/>
|
|
11393
11416
|
<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>
|
|
@@ -5577,6 +5577,9 @@
|
|
|
5577
5577
|
<!-- END Definition List -->
|
|
5578
5578
|
<!-- ===================== -->
|
|
5579
5579
|
|
|
5580
|
+
<!-- default: ignore title in sections/p -->
|
|
5581
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5582
|
+
|
|
5580
5583
|
<!-- ========================= -->
|
|
5581
5584
|
<!-- Rich text formatting -->
|
|
5582
5585
|
<!-- ========================= -->
|
|
@@ -7668,25 +7671,45 @@
|
|
|
7668
7671
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7672
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7673
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7674
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
|
7675
|
+
<xsl:attribute name="width">
|
|
7676
|
+
<xsl:value-of select="@width"/>
|
|
7677
|
+
</xsl:attribute>
|
|
7678
|
+
</xsl:if>
|
|
7677
7679
|
|
|
7678
|
-
<xsl:
|
|
7680
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7681
|
+
<xsl:attribute name="height">
|
|
7682
|
+
<xsl:value-of select="@height"/>
|
|
7683
|
+
</xsl:attribute>
|
|
7684
|
+
</xsl:if>
|
|
7679
7685
|
|
|
7680
|
-
|
|
7686
|
+
<xsl:choose>
|
|
7687
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7688
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7689
|
+
</xsl:when>
|
|
7690
|
+
<xsl:otherwise>
|
|
7681
7691
|
|
|
7682
|
-
|
|
7692
|
+
<xsl:variable name="img_src">
|
|
7693
|
+
<xsl:choose>
|
|
7694
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7695
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7696
|
+
</xsl:choose>
|
|
7697
|
+
</xsl:variable>
|
|
7683
7698
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7699
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7700
|
|
|
7687
|
-
|
|
7701
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7702
|
|
|
7689
|
-
|
|
7703
|
+
</xsl:variable>
|
|
7704
|
+
|
|
7705
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7706
|
+
<xsl:if test="number($scale) < 100">
|
|
7707
|
+
|
|
7708
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7709
|
+
|
|
7710
|
+
</xsl:if>
|
|
7711
|
+
</xsl:otherwise>
|
|
7712
|
+
</xsl:choose>
|
|
7690
7713
|
|
|
7691
7714
|
</xsl:if>
|
|
7692
7715
|
|
|
@@ -11387,7 +11410,7 @@
|
|
|
11387
11410
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11411
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11412
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11413
|
+
<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
11414
|
<xsl:copy>
|
|
11392
11415
|
<xsl:copy-of select="@*"/>
|
|
11393
11416
|
<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>
|
|
@@ -5577,6 +5577,9 @@
|
|
|
5577
5577
|
<!-- END Definition List -->
|
|
5578
5578
|
<!-- ===================== -->
|
|
5579
5579
|
|
|
5580
|
+
<!-- default: ignore title in sections/p -->
|
|
5581
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5582
|
+
|
|
5580
5583
|
<!-- ========================= -->
|
|
5581
5584
|
<!-- Rich text formatting -->
|
|
5582
5585
|
<!-- ========================= -->
|
|
@@ -7668,25 +7671,45 @@
|
|
|
7668
7671
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7672
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7673
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7674
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
|
7675
|
+
<xsl:attribute name="width">
|
|
7676
|
+
<xsl:value-of select="@width"/>
|
|
7677
|
+
</xsl:attribute>
|
|
7678
|
+
</xsl:if>
|
|
7677
7679
|
|
|
7678
|
-
<xsl:
|
|
7680
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7681
|
+
<xsl:attribute name="height">
|
|
7682
|
+
<xsl:value-of select="@height"/>
|
|
7683
|
+
</xsl:attribute>
|
|
7684
|
+
</xsl:if>
|
|
7679
7685
|
|
|
7680
|
-
|
|
7686
|
+
<xsl:choose>
|
|
7687
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7688
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7689
|
+
</xsl:when>
|
|
7690
|
+
<xsl:otherwise>
|
|
7681
7691
|
|
|
7682
|
-
|
|
7692
|
+
<xsl:variable name="img_src">
|
|
7693
|
+
<xsl:choose>
|
|
7694
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7695
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7696
|
+
</xsl:choose>
|
|
7697
|
+
</xsl:variable>
|
|
7683
7698
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7699
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7700
|
|
|
7687
|
-
|
|
7701
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7702
|
|
|
7689
|
-
|
|
7703
|
+
</xsl:variable>
|
|
7704
|
+
|
|
7705
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7706
|
+
<xsl:if test="number($scale) < 100">
|
|
7707
|
+
|
|
7708
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7709
|
+
|
|
7710
|
+
</xsl:if>
|
|
7711
|
+
</xsl:otherwise>
|
|
7712
|
+
</xsl:choose>
|
|
7690
7713
|
|
|
7691
7714
|
</xsl:if>
|
|
7692
7715
|
|
|
@@ -11387,7 +11410,7 @@
|
|
|
11387
11410
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11411
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11412
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11413
|
+
<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
11414
|
<xsl:copy>
|
|
11392
11415
|
<xsl:copy-of select="@*"/>
|
|
11393
11416
|
<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>
|
|
@@ -5577,6 +5577,9 @@
|
|
|
5577
5577
|
<!-- END Definition List -->
|
|
5578
5578
|
<!-- ===================== -->
|
|
5579
5579
|
|
|
5580
|
+
<!-- default: ignore title in sections/p -->
|
|
5581
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
|
5582
|
+
|
|
5580
5583
|
<!-- ========================= -->
|
|
5581
5584
|
<!-- Rich text formatting -->
|
|
5582
5585
|
<!-- ========================= -->
|
|
@@ -7668,25 +7671,45 @@
|
|
|
7668
7671
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
|
7669
7672
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
|
7670
7673
|
|
|
7671
|
-
<xsl:
|
|
7672
|
-
<xsl:
|
|
7673
|
-
<xsl:
|
|
7674
|
-
|
|
7675
|
-
|
|
7676
|
-
</xsl:variable>
|
|
7674
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
|
7675
|
+
<xsl:attribute name="width">
|
|
7676
|
+
<xsl:value-of select="@width"/>
|
|
7677
|
+
</xsl:attribute>
|
|
7678
|
+
</xsl:if>
|
|
7677
7679
|
|
|
7678
|
-
<xsl:
|
|
7680
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
|
7681
|
+
<xsl:attribute name="height">
|
|
7682
|
+
<xsl:value-of select="@height"/>
|
|
7683
|
+
</xsl:attribute>
|
|
7684
|
+
</xsl:if>
|
|
7679
7685
|
|
|
7680
|
-
|
|
7686
|
+
<xsl:choose>
|
|
7687
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
|
7688
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
|
7689
|
+
</xsl:when>
|
|
7690
|
+
<xsl:otherwise>
|
|
7681
7691
|
|
|
7682
|
-
|
|
7692
|
+
<xsl:variable name="img_src">
|
|
7693
|
+
<xsl:choose>
|
|
7694
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
|
7695
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
|
7696
|
+
</xsl:choose>
|
|
7697
|
+
</xsl:variable>
|
|
7683
7698
|
|
|
7684
|
-
|
|
7685
|
-
<xsl:if test="number($scale) < 100">
|
|
7699
|
+
<xsl:variable name="image_width_effective">
|
|
7686
7700
|
|
|
7687
|
-
|
|
7701
|
+
<xsl:value-of select="$width_effective"/>
|
|
7688
7702
|
|
|
7689
|
-
|
|
7703
|
+
</xsl:variable>
|
|
7704
|
+
|
|
7705
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
|
7706
|
+
<xsl:if test="number($scale) < 100">
|
|
7707
|
+
|
|
7708
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
|
7709
|
+
|
|
7710
|
+
</xsl:if>
|
|
7711
|
+
</xsl:otherwise>
|
|
7712
|
+
</xsl:choose>
|
|
7690
7713
|
|
|
7691
7714
|
</xsl:if>
|
|
7692
7715
|
|
|
@@ -11387,7 +11410,7 @@
|
|
|
11387
11410
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
|
11388
11411
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
11389
11412
|
</xsl:template>
|
|
11390
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
|
11413
|
+
<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
11414
|
<xsl:copy>
|
|
11392
11415
|
<xsl:copy-of select="@*"/>
|
|
11393
11416
|
<xsl:apply-templates mode="update_xml_step1"/>
|