Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #757

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Updates #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32c4780
ISO xslt updated for secondary copyright, metanorma/metanorma-iso#1230
Intelligent2013 Oct 29, 2024
24e157b
common.xsl updated for figure key, metanorma/isodoc#607
Intelligent2013 Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions xslt_src/common.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9861,7 +9861,8 @@
</fo:block>
</xsl:when> <!-- END: a few components -->
<xsl:when test="$parent = 'figure' and (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
<!-- commented, Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
<!-- <fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">

<xsl:call-template name="refine_figure_key_style"/>

Expand All @@ -9871,7 +9872,7 @@
</xsl:call-template>
</xsl:variable>
<xsl:value-of select="$title-key"/>
</fo:block>
</fo:block> -->
</xsl:when> <!-- END: definition list in a figure -->
</xsl:choose>

Expand Down Expand Up @@ -10086,6 +10087,14 @@

</xsl:template> <!-- END: dl -->

<!-- caption for figure key and another caption -->
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'p'][@keep-with-next = 'true' and *[local-name() = 'strong']]" priority="3">
<fo:block text-align="left" margin-bottom="12pt" keep-with-next="always">
<xsl:call-template name="refine_figure_key_style"/>
<xsl:apply-templates/>
</fo:block>
</xsl:template>

<xsl:template name="refine_dl_formula_where_style">
<xsl:if test="$namespace = 'bsi'">
<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
Expand Down
17 changes: 16 additions & 1 deletion xslt_src/iso.international-standard.core.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3832,6 +3832,21 @@
</xsl:choose>
</xsl:template>

<xsl:template match="iso:copyright-statement/iso:clause" priority="3">
<fo:block role="SKIP">
<xsl:if test="@id = 'boilerplate-copyright-default' and ../iso:clause">
<xsl:attribute name="color">blue</xsl:attribute>
<xsl:attribute name="border">1pt solid blue</xsl:attribute>
<xsl:attribute name="padding">1mm</xsl:attribute>
</xsl:if>
<xsl:if test="not(@id = 'boilerplate-copyright-default') and preceding-sibling::iso:clause">
<xsl:attribute name="margin-top">5mm</xsl:attribute>
</xsl:if>
<xsl:copy-of select="@id"/>
<xsl:apply-templates/>
</fo:block>
</xsl:template>

<xsl:template match="iso:copyright-statement//iso:p" priority="2">
<xsl:choose>
<xsl:when test="$layoutVersion = '1951'">
Expand Down Expand Up @@ -3878,7 +3893,7 @@
<xsl:attribute name="margin-left">0.5mm</xsl:attribute>
<xsl:attribute name="margin-right">0.5mm</xsl:attribute>
</xsl:if>
<xsl:if test="contains(@id, 'address')">
<xsl:if test="contains(@id, 'address') or contains(normalize-space(), 'Tel:') or contains(normalize-space(), 'Phone:')">
<xsl:attribute name="margin-left">4.5mm</xsl:attribute>
</xsl:if>
<xsl:apply-templates />
Expand Down
Loading