Skip to content

Commit

Permalink
Merge branch 'master' into update_pres_xml_part4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Intelligent2013
Intelligent2013 authored Dec 7, 2024
2 parents 64eee76 + 538be82 commit 659f7de
Show file tree
Hide file tree
Showing 3 changed files with 399 additions and 157 deletions.
5 changes: 4 additions & 1 deletion xslt_src/common.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21215,7 +21215,10 @@

<!-- END: insert cover page image -->

<xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
<!-- https://github.com/metanorma/docs/blob/main/109.adoc -->
<!-- U+301A LEFT WHITE SQUARE BRACKET (〚) -->
<!-- U+301B RIGHT WHITE SQUARE BRACKET (〛) -->
<xsl:variable name="regex_ja_spec">[\u301A\u301B]</xsl:variable>
<xsl:template name="insertVerticalChar">
<xsl:param name="str"/>
<xsl:param name="writing-mode">lr-tb</xsl:param>
Expand Down
37 changes: 26 additions & 11 deletions xslt_src/iso.international-standard.core.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1945,7 +1945,7 @@
</fo:table-cell>
<fo:table-cell number-columns-spanned="2" display-align="after" padding-left="6mm">
<fo:block font-size="19pt" font-weight="bold" line-height="1">
<xsl:if test="$stage &gt;=60">
<xsl:if test="$stage &gt;=60 and $substage != 0">
<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
</xsl:if>
<xsl:value-of select="$docidentifierISO"/>
Expand All @@ -1971,7 +1971,7 @@
<xsl:call-template name="insertTitlesLangMain"/>
</fo:block>

<xsl:if test="not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')">
<xsl:if test="not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stage-abbreviation = 'PRF')">
<xsl:for-each select="xalan:nodeset($lang_other)/lang">
<xsl:variable name="lang_other" select="."/>
<fo:block font-size="12pt" role="SKIP"><xsl:value-of select="$linebreak"/></fo:block>
Expand Down Expand Up @@ -2009,7 +2009,7 @@
</xsl:if>

<xsl:if test="$doctype = 'amendment'"> <!-- and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM') -->
<fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
<fo:block font-size="15pt" font-weight="bold" margin-bottom="3mm">
<xsl:value-of select="$doctype_uppercased"/>
<xsl:text> </xsl:text>
<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
Expand Down Expand Up @@ -2083,15 +2083,21 @@
<xsl:variable name="additionalNotes">
<xsl:call-template name="insertCoverPageAdditionalNotes"/>
</xsl:variable>
<xsl:if test="normalize-space($additionalNotes) != '' or $stage-abbreviation = 'PRF'">

<xsl:variable name="feedback_link" select="normalize-space(/iso:iso-standard/iso:metanorma-extension/iso:semantic-metadata/iso:feedback-link)"/>

<xsl:if test="normalize-space($additionalNotes) != ''"> <!-- or $stage-abbreviation = 'PRF' -->
<xsl:attribute name="display-align">center</xsl:attribute>
<fo:block>
<xsl:copy-of select="$additionalNotes"/>
</fo:block>
</xsl:if>

<xsl:if test="$stage-abbreviation = 'PRF'">
<fo:block font-size="28pt" font-weight="bold">
<fo:block font-size="34pt" font-weight="bold">
<xsl:if test="normalize-space($additionalNotes) = '' and $feedback_link = ''">
<xsl:attribute name="margin-bottom">3.5mm</xsl:attribute>
</xsl:if>
<xsl:call-template name="add-letter-spacing">
<xsl:with-param name="text" select="$proof-text"/>
<xsl:with-param name="letter-spacing" select="0.65"/>
Expand All @@ -2100,7 +2106,6 @@
</xsl:if>

<fo:block>
<xsl:variable name="feedback_link" select="normalize-space(/iso:iso-standard/iso:metanorma-extension/iso:semantic-metadata/iso:feedback-link)"/>
<xsl:if test="$stage &gt;=60 and $feedback_link != ''">
<fo:block-container width="69mm" background-color="rgb(242,242,242)" display-align="before">
<fo:table table-layout="fixed" width="100%" role="SKIP">
Expand Down Expand Up @@ -3044,7 +3049,7 @@
<xsl:when test="($stage-abbreviation = 'IS' or $stage-abbreviation = 'D') and /iso:iso-standard/iso:bibdata/iso:date[@type = 'created']">
<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'created']"/>
</xsl:when>
<xsl:when test="$stage-abbreviation = 'IS' or $stage-abbreviation = 'published'">
<xsl:when test="$stage-abbreviation = 'IS' or $stage-abbreviation = 'published' or $stage-abbreviation = 'PRF'">
<xsl:value-of select="substring(/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date,1, 7)"/>
</xsl:when>
</xsl:choose>
Expand Down Expand Up @@ -5215,12 +5220,22 @@
<xsl:param name="font-weight" select="'bold'"/>
<xsl:attribute name="text-align">center</xsl:attribute>
<xsl:attribute name="line-height">1.1</xsl:attribute>
<xsl:if test="$stage-abbreviation = 'PRF'">
<fo:block font-size="10pt" font-weight="bold" text-align="center">
<xsl:value-of select="$proof-text"/>
</fo:block>
</xsl:if>
<fo:block font-size="9pt">
<!-- <xsl:call-template name="insertInterFont"/> -->
<xsl:value-of select="$copyrightText"/>
</fo:block>
<xsl:if test="$copyrightAbbrIEEE = ''"><fo:block>&#xa0;</fo:block></xsl:if>
<fo:block font-size="11pt" font-weight="{$font-weight}"><fo:page-number/></fo:block>
<xsl:if test="$copyrightAbbrIEEE = '' and $stage-abbreviation != 'PRF'"><fo:block>&#xa0;</fo:block></xsl:if>
<fo:block font-size="11pt" font-weight="{$font-weight}">
<xsl:if test="$stage-abbreviation = 'PRF'">
<xsl:attribute name="margin-top">1mm</xsl:attribute>
</xsl:if>
<fo:page-number/>
</fo:block>
</xsl:template>
<xsl:template name="insertLayoutVersionAttributesTop">
<xsl:param name="odd_or_even"/>
Expand Down Expand Up @@ -5437,7 +5452,7 @@
</fo:table-cell>
<fo:table-cell number-columns-spanned="2" text-align="right" display-align="after">
<fo:block font-size="16pt" font-weight="bold" margin-bottom="1mm" margin-right="1.5mm">
<xsl:if test="$stage &gt;=60">
<xsl:if test="$stage &gt;=60 and $substage != 0">
<xsl:attribute name="color"><xsl:value-of select="$color_red"/></xsl:attribute>
</xsl:if>
<xsl:text>iso.org</xsl:text>
Expand Down Expand Up @@ -5477,7 +5492,7 @@
<xsl:variable name="Image-ISO-Logo-SVG">
<xsl:variable name="logo_color">
<xsl:choose>
<xsl:when test="$stage &gt;=60"><xsl:value-of select="$color_red"/></xsl:when>
<xsl:when test="$stage &gt;=60 and $substage != 0"><xsl:value-of select="$color_red"/></xsl:when>
<xsl:otherwise>rgb(88,88,90)</xsl:otherwise>
</xsl:choose>
</xsl:variable>
Expand Down
Loading

0 comments on commit 659f7de

Please sign in to comment.