Skip to content

Commit

Permalink
reverse kosek pollution of autoidx
Browse files Browse the repository at this point in the history
  • Loading branch information
@hryom
hryom committed Jul 29, 2018
1 parent d1f75ba commit 0ebbd66
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions xsl/fo/autoidx.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:see)"/>
<xsl:sort select="translate(d:see, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</xsl:if>

Expand All @@ -366,14 +366,14 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:seealso)"/>
<xsl:sort select="translate(d:seealso, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
<xsl:apply-templates select="$refs[d:secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
mode="index-secondary">
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(&secondary;)"/>
<xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</fo:block>
</xsl:if>
Expand Down Expand Up @@ -471,7 +471,7 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:index-term(d:see)"/>
<xsl:sort select="translate(d:see, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</xsl:if>

Expand All @@ -484,14 +484,14 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:index-term(d:seealso)"/>
<xsl:sort select="translate(d:seealso, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
<xsl:apply-templates select="$refs[d:tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]"
mode="index-tertiary">
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:index-term(&tertiary;)"/>
<xsl:sort select="translate(&tertiary;, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</fo:block>
</xsl:if>
Expand Down Expand Up @@ -592,7 +592,7 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:see)"/>
<xsl:sort select="translate(d:see, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</xsl:if>

Expand All @@ -605,7 +605,7 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:seealso)"/>
<xsl:sort select="translate(d:seealso, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</fo:block>
</xsl:if>
Expand Down
20 changes: 10 additions & 10 deletions xsl/html/autoidx.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:see)"/>
<xsl:sort select="translate(d:see, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</xsl:if>
</dt>
Expand All @@ -370,15 +370,15 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:seealso)"/>
<xsl:sort select="translate(d:seealso, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
<xsl:apply-templates select="$refs[d:secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
mode="index-secondary">
<xsl:with-param name="position" select="position()"/>
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(&secondary;)"/>
<xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</dl>
</dd>
Expand Down Expand Up @@ -444,7 +444,7 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:see)"/>
<xsl:sort select="translate(d:see, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</xsl:if>
</dt>
Expand All @@ -458,15 +458,15 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:seealso)"/>
<xsl:sort select="translate(d:seealso, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
<xsl:apply-templates select="$refs[d:tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]"
mode="index-tertiary">
<xsl:with-param name="position" select="position()"/>
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(&tertiary;)"/>
<xsl:sort select="translate(&tertiary;, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</dl>
</dd>
Expand Down Expand Up @@ -531,7 +531,7 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:see)"/>
<xsl:sort select="translate(d:see, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</xsl:if>
</dt>
Expand All @@ -545,7 +545,7 @@
<xsl:with-param name="scope" select="$scope"/>
<xsl:with-param name="role" select="$role"/>
<xsl:with-param name="type" select="$type"/>
<xsl:sort select="i:term-index(d:seealso)"/>
<xsl:sort select="translate(d:seealso, &lowercase;, &uppercase;)"/>
</xsl:apply-templates>
</dl>
</dd>
Expand Down Expand Up @@ -767,8 +767,8 @@
<xsl:param name="role" select="''"/>
<xsl:param name="type" select="''"/>

<xsl:for-each select="seealso">
<xsl:sort select="i:term-index(.)"/>
<xsl:for-each select="d:seealso">
<xsl:sort select="translate(., &lowercase;, &uppercase;)"/>

<xsl:variable name="seealso" select="normalize-space(.)"/>

Expand Down

0 comments on commit 0ebbd66

Please sign in to comment.