From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-607939-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id C60641381F3
	for <garchives@archives.gentoo.org>; Mon,  8 Jul 2013 19:54:41 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E6AF7E08E1;
	Mon,  8 Jul 2013 19:54:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 7E006E08E1
	for <gentoo-commits@lists.gentoo.org>; Mon,  8 Jul 2013 19:54:37 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 7095933E8E6
	for <gentoo-commits@lists.gentoo.org>; Mon,  8 Jul 2013 19:54:36 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 617)
	id 347572171C; Mon,  8 Jul 2013 19:54:35 +0000 (UTC)
From: "Sven Vermeulen (swift)" <swift@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, swift@gentoo.org
Subject: [gentoo-commits] gentoo commit in xml/htdocs/xsl: guidexml2wiki.xsl
X-VCS-Repository: gentoo
X-VCS-Files: guidexml2wiki.xsl
X-VCS-Directories: xml/htdocs/xsl
X-VCS-Committer: swift
X-VCS-Committer-Name: Sven Vermeulen
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <20130708195435.347572171C@flycatcher.gentoo.org>
Date: Mon,  8 Jul 2013 19:54:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7c626991-1184-41fc-9d70-a25c6aefc169
X-Archives-Hash: abe646b7268c2f20ea7ea6df2ee0b7ca

swift       13/07/08 19:54:35

  Modified:             guidexml2wiki.xsl
  Log:
  Updates on wikification of GuideXML, better newline handling

Revision  Changes    Path
1.2                  xml/htdocs/xsl/guidexml2wiki.xsl

file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/xsl/guidexml2wiki.xsl?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/xsl/guidexml2wiki.xsl?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/xsl/guidexml2wiki.xsl?r1=1.1&r2=1.2

Index: guidexml2wiki.xsl
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/xsl/guidexml2wiki.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- guidexml2wiki.xsl	13 Jun 2013 16:30:44 -0000	1.1
+++ guidexml2wiki.xsl	8 Jul 2013 19:54:35 -0000	1.2
@@ -13,15 +13,18 @@
                 extension-element-prefixes="exslt func dyn str" >
 
 <xsl:output encoding="UTF-8" method="text" indent="no" />
-<xsl:preserve-space elements="li p pre" />
+<xsl:preserve-space elements="pre" />
+<!-- <xsl:preserve-space elements="li p pre" /> -->
 
 <xsl:template match="guide"><xsl:apply-templates />
+<xsl:if test="//guide/author[not(@title='script generated')]">
 == Acknowledgements ==
 
 We would like to thank the following authors and editors for their contributions to this guide:
 <xsl:for-each select="//guide/author">
 * <xsl:value-of select="mail" />
 </xsl:for-each>
+</xsl:if>
 
 [[Category:Server and Security]]
 </xsl:template>
@@ -32,7 +35,9 @@
 
 <xsl:template match="chapter">
 
-== <xsl:value-of select="title" /> ==
+== <xsl:value-of select="title" /> ==<xsl:text>
+
+</xsl:text>
 <xsl:apply-templates />
 </xsl:template>
 
@@ -40,18 +45,47 @@
 <xsl:if test="preceding-sibling::section"><xsl:text>
 </xsl:text>
 </xsl:if>
+<xsl:if test="title">
 === <xsl:value-of select="title" /> ===
+</xsl:if>
 
 <xsl:apply-templates />
 </xsl:template>
 
-<xsl:template match="p">
-<xsl:apply-templates /><xsl:text>
+<xsl:template match="body"><xsl:apply-templates /></xsl:template>
+
+<!-- 
+  i is for in-pre commands, we cannot support that easily as we have no
+  knowledge of what needs to be RootCmd, UserCmd, what is output, etc.
+-->
+<xsl:template match="i"><xsl:apply-templates /></xsl:template>
+
+<xsl:template match="mail"><xsl:choose><xsl:when test="link">{{Mail|<xsl:value-of select="@link" />|<xsl:value-of select="text()" />}}</xsl:when><xsl:otherwise>{{Mail|<xsl:value-of select="text()" />}}</xsl:otherwise></xsl:choose></xsl:template>
+
+<xsl:template match="p"><xsl:apply-templates /><xsl:text> 
 
 </xsl:text>
 </xsl:template>
 
-<xsl:template match="uri"><xsl:choose><xsl:when test="starts-with(@link, 'http')">[<xsl:value-of select="@link" /><xsl:text> </xsl:text><xsl:value-of select="text()" />]</xsl:when><xsl:otherwise> [[INTERNAL <xsl:value-of select="@link" />]] </xsl:otherwise></xsl:choose></xsl:template>
+<xsl:template match="br" />
+<xsl:template match="license" />
+
+<!-- 
+     var is formatting in pre, difficult to handle this
+-->
+<xsl:template match="var"><xsl:apply-templates /></xsl:template>
+
+<!--
+     stmt is formatting in pre, difficult to handle this
+-->
+<xsl:template match="stmt"><xsl:apply-templates /></xsl:template>
+
+<!--
+     const is formatting in pre, difficult to handle this
+-->
+<xsl:template match="const"><xsl:apply-templates /></xsl:template>
+
+<xsl:template match="uri"><xsl:text> </xsl:text><xsl:choose><xsl:when test="starts-with(@link, 'http')">[<xsl:value-of select="@link" /><xsl:text> </xsl:text><xsl:value-of select="normalize-space(text())" />]</xsl:when><xsl:when test="not(starts-with(@link, '#'))">[http://www.gentoo.org/<xsl:value-of select="@link"/><xsl:text> </xsl:text><xsl:value-of select="normalize-space(text())" />]</xsl:when></xsl:choose><xsl:text> </xsl:text></xsl:template>
 
 <xsl:template match="e"> ''<xsl:apply-templates />'' </xsl:template>
 
@@ -159,9 +193,7 @@
 <xsl:template match="text()">
 <xsl:choose>
 <xsl:when test="ancestor::pre"><xsl:value-of select="." /></xsl:when>
-<xsl:otherwise>
-<xsl:value-of select="normalize-space()" />
-</xsl:otherwise>
+<xsl:otherwise><xsl:value-of select="normalize-space()" /></xsl:otherwise>
 </xsl:choose>
 </xsl:template>