Rocco Rutte:

- oops, fix <link/> for <muttng-doc:varref/>

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@512 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/VERSION.svn b/VERSION.svn
index c0556fb..4d0e90c 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-511
+512

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 4c0cb67..83168b4 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -195,7 +195,7 @@ muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.he
                > muttrc.man
        touch stamp-doc-man
 
                > muttrc.man
        touch stamp-doc-man
 

-manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.xml.head manual.xml.tail $(top_srcdir)/VERSION.in $(top_srcdir)/VERSION.svn
+manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttng-manual.xsl manual.xml.head manual.xml.tail $(top_srcdir)/VERSION.in $(top_srcdir)/VERSION.svn

        ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-r`cat $(top_srcdir)/VERSION.svn`/" $(srcdir)/manual.xml.head ;\
          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
                cat - $(srcdir)/manual.xml.tail > manual-pre.xml
        ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-r`cat $(top_srcdir)/VERSION.svn`/" $(srcdir)/manual.xml.head ;\
          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
                cat - $(srcdir)/manual.xml.tail > manual-pre.xml

diff --git a/doc/muttng-manual.xsl b/doc/muttng-manual.xsl
index 4e6e2ee..8f68116 100644 (file)
--- a/doc/muttng-manual.xsl
+++ b/doc/muttng-manual.xsl
@@ -112,20 +112,17 @@
   </xsl:template>
  
   <xsl:template match="muttng-doc:varref">
   </xsl:template>
  
   <xsl:template match="muttng-doc:varref">

-    <link>
-      <xsl:choose>
-        <xsl:when test="@link">
-          <xsl:param name="linkend" value="@link"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:param name="linkend" value="@name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:value-of select="concat('$',@name)"/>
-    </link>
+    <xsl:choose>
+      <xsl:when test="@link">
+        <link linkend="{@link}"><literal><xsl:value-of select="concat('$',@name)"/></literal></link>
+      </xsl:when>
+      <xsl:otherwise>
+        <link linkend="{@name}"><literal><xsl:value-of select="concat('$',@name)"/></literal></link>
+      </xsl:otherwise>
+    </xsl:choose>

     <indexterm>
       <primary>Configuration Variables</primary>
     <indexterm>
       <primary>Configuration Variables</primary>

-      <secondary><xsl:value-of select="@name"/></secondary>
+      <secondary>$<xsl:value-of select="@name"/></secondary>

     </indexterm>
   </xsl:template>
 
     </indexterm>
   </xsl:template>