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

Plateau update #733

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Plateau update #733

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
09e7616
Plateau xslt updated for note style, metanorma/metanorma-plateau#97
Intelligent2013 Aug 21, 2024
433d40a
Plateau xslt updated for note style, metanorma/metanorma-plateau#97
Intelligent2013 Aug 21, 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
2 changes: 1 addition & 1 deletion xslt_src/common.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12775,7 +12775,7 @@
</fo:inline>
</xsl:when>
<xsl:otherwise>
<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
<xsl:apply-templates />
</fo:block>
</xsl:otherwise>
Expand Down
41 changes: 40 additions & 1 deletion xslt_src/plateau.international-standard.core.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,11 @@
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
</xsl:if>

<xsl:if test="parent::plateau:clause">
<xsl:if test="parent::plateau:note and not(following-sibling::*)">
<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
</xsl:if>

<xsl:if test="parent::plateau:clause or (ancestor::plateau:note and not(ancestor::plateau:table))">
<xsl:text>&#x3000;</xsl:text>
</xsl:if>

Expand All @@ -1192,6 +1196,41 @@
</xsl:template>


<xsl:template match="*[local-name() = 'note'][not(ancestor::plateau:table)]" priority="2">

<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
<xsl:attribute name="margin-top">6pt</xsl:attribute>
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>

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

<xsl:call-template name="refine_note-style"/>

<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">

<fo:table table-layout="fixed" width="99%" border="1pt solid black">
<fo:table-body>
<fo:table-row>
<fo:table-cell padding="2mm">
<fo:block keep-with-next="always" margin-bottom="10pt" role="SKIP">
<xsl:apply-templates select="*[local-name() = 'name']" />
</fo:block>
<fo:block>
<xsl:apply-templates select="node()[not(local-name() = 'name')]" />
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</fo:block-container>
</fo:block-container>
</xsl:template>

<xsl:template match="*[local-name() = 'note'][not(ancestor::plateau:table)]/*[local-name() = 'p']" priority="2">
<xsl:call-template name="paragraph"/>
</xsl:template>


<xsl:template match="plateau:termnote" priority="2">
<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
<fo:list-block provisional-distance-between-starts="{14 + $text_indent}mm">
Expand Down
Loading