richter at apache
Jun 18, 2002, 9:19 PM
Post #1 of 1
(73 views)
Permalink
|
|
cvs commit: embperl/eg/web pod.xsl
|
|
richter 2002/06/18 21:19:15
Modified: . Tag: Embperl2c epdom.c
eg/web Tag: Embperl2c pod.xsl
Log:
fix rtf segafualt
Revision Changes Path
No revision
No revision
1.4.2.94 +7 -2 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.93
retrieving revision 1.4.2.94
diff -u -r1.4.2.93 -r1.4.2.94
--- epdom.c 17 Jun 2002 19:25:49 -0000 1.4.2.93
+++ epdom.c 19 Jun 2002 04:19:14 -0000 1.4.2.94
@@ -754,9 +754,14 @@
{
int nIndex ;
-
+ int nFill ;
+
if (nLen == 0)
nLen = strlen (sAdd) ;
+
+ nFill = ArrayGetSize (a, *pArray) ;
+ /* make sure we always have a trailing zero */
+ ArraySet(a, pArray, nFill + nLen + 1) ;
nIndex = ArrayAdd (a, pArray, nLen) ;
No revision
No revision
1.1.2.8 +20 -28 embperl/eg/web/Attic/pod.xsl
Index: pod.xsl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/pod.xsl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- pod.xsl 18 Jun 2002 06:27:35 -0000 1.1.2.7
+++ pod.xsl 19 Jun 2002 04:19:15 -0000 1.1.2.8
@@ -50,6 +50,10 @@
<xsl:template name="headernav">
<a name="top">
<xsl:choose>
+
+ <!-- - - - - Header Navigation - normal page - - - -->
+
+
<xsl:when test="not(pod/sect1)">
<xsl:variable name="nextpage">
<xsl:apply-templates select="following-sibling::sect1[para|verbatim|sect2][position()=1]" mode="number"/>
@@ -82,23 +86,22 @@
</tr>
</table>
</xsl:when>
+
+ <!-- - - - - Header Navigation - content page - - - -->
+
<xsl:otherwise>
<xsl:variable name="nextpage">
<xsl:apply-templates select="/pod/sect1[para|verbatim|sect2][position()=1]" mode="number"/>
</xsl:variable>
- <table width="100%"><tr><td align="right">
- <xsl:element name="a">
- <xsl:if test="$pageinname != 0">
- <xsl:attribute name="href"><xsl:value-of select="concat ($basename, '.', $nextpage, $extension)"/></xsl:attribute>
- </xsl:if>
- <xsl:if test="$pageinname = 0">
- <xsl:attribute name="href"><xsl:value-of select="concat ($basename, $extension)"/>?page=<xsl:value-of select="$nextpage"/></xsl:attribute>
- </xsl:if>
- <xsl:attribute name="class">cPodHeaderNavLink</xsl:attribute>
- Next: <xsl:value-of select="/pod/sect1[para|verbatim|sect2]/title"/> >>
- </xsl:element>
- </td>
- </tr></table>
+ <table width="100%">
+ <tr>
+ <td align="right">
+ <a href="{$basename}.-page-{$nextpage}-.{$extension}" class="cPodHeaderNavLink">
+ [Next: <xsl:value-of select="/pod/sect1[para|verbatim|sect2]/title"/> >>]
+ </a>
+ </td>
+ </tr>
+ </table>
</xsl:otherwise>
</xsl:choose>
</a>
@@ -151,14 +154,9 @@
<xsl:template match="sect1" mode="toc_short">
<xsl:if test="para|verbatim|sect2|list">
<li><b>
- <xsl:element name="a">
- <xsl:if test="$pageinname != 0">
- <xsl:attribute name="href"><xsl:value-of select="$basename"/>.<xsl:number/><xsl:value-of select="$extension"/></xsl:attribute>
- </xsl:if>
- <xsl:if test="$pageinname = 0">
- <xsl:attribute name="href"><xsl:value-of select="concat($basename,$extension)"/>?page=<xsl:number/></xsl:attribute>
- </xsl:if>
- <xsl:attribute name="class">cPodH1ContentLink</xsl:attribute>
+ <xsl:element name="a">
+ <xsl:attribute name="href"><xsl:value-of select="$basename"/>.-page-<xsl:number/>-.<xsl:value-of select="$extension"/></xsl:attribute>
+ <xsl:attribute name="class">cPodH1ContentLink</xsl:attribute>
<xsl:value-of select="title"/>
</xsl:element>
</b></li>
@@ -170,14 +168,8 @@
<xsl:template match="sect1" mode="toc">
<xsl:if test="para|verbatim|sect2|list">
<xsl:variable name="pagehref">
- <xsl:if test="$pageinname != 0">
- <xsl:value-of select="$basename"/>.<xsl:number/><xsl:value-of select="$extension"/>
- </xsl:if>
- <xsl:if test="$pageinname = 0">
- <xsl:value-of select="concat($basename, $extension)"/>?page=<xsl:number/>
- </xsl:if>
+ <xsl:value-of select="$basename"/>.-page-<xsl:number/>-.<xsl:value-of select="$extension"/>
</xsl:variable>
-
<li><a href="{$pagehref}" class="cPodH1ContentLink"><xsl:value-of select="title"/></a></li>
<xsl:if test="sect2">
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe [at] perl
For additional commands, e-mail: embperl-cvs-help [at] perl
|
