Skip to content

Commit

Permalink
version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@opoudjis
opoudjis committed Nov 9, 2020
1 parent 012346f commit 0e679c7
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 22 deletions.
13 changes: 13 additions & 0 deletions lib/asciidoctor/m3aawg/isodoc.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
<start>
<ref name="standard-document"/>
</start>
<define name="doctype">
<element name="doctype">
<optional>
<attribute name="abbreviation"/>
</optional>
<ref name="DocumentType"/>
</element>
</define>
<define name="hyperlink">
<element name="link">
<attribute name="target">
Expand Down Expand Up @@ -141,6 +149,11 @@
<data type="boolean"/>
</attribute>
</optional>
<optional>
<attribute name="key">
<data type="boolean"/>
</attribute>
</optional>
<oneOrMore>
<ref name="dt"/>
<ref name="dd"/>
Expand Down
121 changes: 99 additions & 22 deletions lib/isodoc/m3aawg/m3d.report.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -908,13 +908,22 @@
<title-part lang="en">



</title-part>
<title-part lang="fr">



</title-part>
<title-part lang="zh">第 # 部分:</title-part>

<title-subpart lang="en">

</title-subpart>
<title-subpart lang="fr">

</title-subpart>

<title-modified lang="en">modified</title-modified>
<title-modified lang="fr">modifiée</title-modified>

Expand Down Expand Up @@ -1380,7 +1389,9 @@




<!-- <xsl:if test="$namespace = 'bipm'">
<fo:block>&#xA0;</fo:block>
</xsl:if> -->

<!-- $namespace = 'iso' or -->

Expand Down Expand Up @@ -1543,6 +1554,7 @@
<xsl:if test="normalize-space() != ''">
<fo:block xsl:use-attribute-sets="table-name-style">


<xsl:apply-templates/>
</fo:block>
</xsl:if>
Expand Down Expand Up @@ -1896,6 +1908,7 @@




<!-- <xsl:if test="$namespace = 'bipm'">
<xsl:attribute name="height">8mm</xsl:attribute>
</xsl:if> -->
Expand Down Expand Up @@ -1981,7 +1994,8 @@
</xsl:attribute>
</xsl:if>
<xsl:call-template name="display-align"/>
<fo:block>
<fo:block>

<xsl:apply-templates/>
</fo:block>
</fo:table-cell>
Expand Down Expand Up @@ -2193,7 +2207,11 @@
<xsl:apply-templates/>
</fo:inline>
</xsl:template><xsl:template match="*[local-name()='dl']">
<fo:block-container margin-left="0mm">
<fo:block-container>

<xsl:attribute name="margin-left">0mm</xsl:attribute>


<xsl:if test="parent::*[local-name() = 'note']">
<xsl:attribute name="margin-left">
<xsl:choose>
Expand All @@ -2203,8 +2221,11 @@
</xsl:attribute>

</xsl:if>
<fo:block-container margin-left="0mm">

<fo:block-container>

<xsl:attribute name="margin-left">0mm</xsl:attribute>


<xsl:variable name="parent" select="local-name(..)"/>

<xsl:variable name="key_iso">
Expand All @@ -2218,9 +2239,12 @@
<fo:block margin-bottom="12pt" text-align="left">

<xsl:variable name="title-where">
<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-where'"/>
</xsl:call-template>


<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-where'"/>
</xsl:call-template>

</xsl:variable>
<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
<xsl:apply-templates select="*[local-name()='dt']/*"/>
Expand All @@ -2236,9 +2260,12 @@


<xsl:variable name="title-where">
<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-where'"/>
</xsl:call-template>


<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-where'"/>
</xsl:call-template>

</xsl:variable>
<xsl:value-of select="$title-where"/>
</fo:block>
Expand All @@ -2249,9 +2276,12 @@


<xsl:variable name="title-key">
<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-key'"/>
</xsl:call-template>


<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-key'"/>
</xsl:call-template>

</xsl:variable>
<xsl:value-of select="$title-key"/>
</fo:block>
Expand Down Expand Up @@ -2827,7 +2857,18 @@
<xsl:with-param name="previousRow" select="$newRow"/>
</xsl:apply-templates>
</xsl:template><xsl:template name="getLang">
<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
<xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
<xsl:variable name="language">
<xsl:choose>
<xsl:when test="$language_current != ''">
<xsl:value-of select="$language_current"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>

<xsl:choose>
<xsl:when test="$language = 'English'">en</xsl:when>
<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
Expand Down Expand Up @@ -2862,6 +2903,7 @@
<xsl:value-of select="substring($str, 2)"/>
</xsl:template><xsl:template match="mathml:math">
<fo:inline font-family="STIX Two Math"> <!-- -->

<xsl:variable name="mathml">
<xsl:apply-templates select="." mode="mathml"/>
</xsl:variable>
Expand Down Expand Up @@ -2944,10 +2986,14 @@
</fo:inline>
</xsl:template><xsl:template match="*[local-name() = 'modification']">
<xsl:variable name="title-modified">
<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-modified'"/>
</xsl:call-template>


<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-modified'"/>
</xsl:call-template>

</xsl:variable>

<xsl:choose>
<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
Expand Down Expand Up @@ -3824,9 +3870,12 @@
</fo:block>
</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
<xsl:variable name="title-deprecated">
<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-deprecated'"/>
</xsl:call-template>


<xsl:call-template name="getTitle">
<xsl:with-param name="name" select="'title-deprecated'"/>
</xsl:call-template>

</xsl:variable>
<fo:block xsl:use-attribute-sets="deprecates-style">
<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
Expand Down Expand Up @@ -4194,13 +4243,22 @@
</xsl:template><xsl:template name="split">
<xsl:param name="pText" select="."/>
<xsl:param name="sep" select="','"/>
<xsl:param name="normalize-space" select="'true'"/>
<xsl:if test="string-length($pText) &gt;0">
<item>
<xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
<xsl:choose>
<xsl:when test="$normalize-space = 'true'">
<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
</xsl:otherwise>
</xsl:choose>
</item>
<xsl:call-template name="split">
<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
<xsl:with-param name="sep" select="$sep"/>
<xsl:with-param name="normalize-space" select="$normalize-space"/>
</xsl:call-template>
</xsl:if>
</xsl:template><xsl:template name="getDocumentId">
Expand Down Expand Up @@ -4266,4 +4324,23 @@
<xsl:with-param name="letter-spacing" select="$letter-spacing"/>
</xsl:call-template>
</xsl:if>
</xsl:template><xsl:template name="repeat">
<xsl:param name="char" select="'*'"/>
<xsl:param name="count"/>
<xsl:if test="$count &gt; 0">
<xsl:value-of select="$char"/>
<xsl:call-template name="repeat">
<xsl:with-param name="char" select="$char"/>
<xsl:with-param name="count" select="$count - 1"/>
</xsl:call-template>
</xsl:if>
</xsl:template><xsl:template name="getLocalizedString">
<xsl:param name="key"/>

<xsl:variable name="curr_lang">
<xsl:call-template name="getLang"/>
</xsl:variable>

<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>

</xsl:template></xsl:stylesheet>

0 comments on commit 0e679c7

Please sign in to comment.