From owner-svn-doc-projects@FreeBSD.ORG  Fri Jul  5 19:19:14 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 47E2C9AD;
 Fri,  5 Jul 2013 19:19:14 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 220161DD8;
 Fri,  5 Jul 2013 19:19:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65JJEeY046426;
 Fri, 5 Jul 2013 19:19:14 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65JJDmA046421;
 Fri, 5 Jul 2013 19:19:13 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201307051919.r65JJDmA046421@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 5 Jul 2013 19:19:13 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42165 - in projects/entities/share: xml xsl
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 19:19:14 -0000

Author: rene
Date: Fri Jul  5 19:19:13 2013
New Revision: 42165
URL: http://svnweb.freebsd.org/changeset/doc/42165

Log:
  Re-add support for the nolink attribute, in which case the email address
  is rendered but without a clickable link.

Modified:
  projects/entities/share/xml/xhtml.xsl
  projects/entities/share/xsl/freebsd-xhtml-common.xsl

Modified: projects/entities/share/xml/xhtml.xsl
==============================================================================
--- projects/entities/share/xml/xhtml.xsl	Fri Jul  5 19:18:25 2013	(r42164)
+++ projects/entities/share/xml/xhtml.xsl	Fri Jul  5 19:19:13 2013	(r42165)
@@ -164,13 +164,20 @@
 
   <xsl:template match="xhtml:email">
     <xsl:text>&lt;</xsl:text>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:text>mailto:</xsl:text>
-        <xsl:value-of select="." />
-      </xsl:attribute>
-      <xsl:apply-templates />
-    </a>
+    <xsl:choose>
+      <xsl:when test="@role='nolink'">
+	<xsl:apply-templates />
+      </xsl:when>
+      <xsl:otherwise>
+	<a>
+	  <xsl:attribute name="href">
+	    <xsl:text>mailto:</xsl:text>
+	    <xsl:value-of select="." />
+	  </xsl:attribute>
+	  <xsl:apply-templates />
+	</a>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:text>&gt;</xsl:text>
   </xsl:template>
 

Modified: projects/entities/share/xsl/freebsd-xhtml-common.xsl
==============================================================================
--- projects/entities/share/xsl/freebsd-xhtml-common.xsl	Fri Jul  5 19:18:25 2013	(r42164)
+++ projects/entities/share/xsl/freebsd-xhtml-common.xsl	Fri Jul  5 19:19:13 2013	(r42165)
@@ -166,13 +166,20 @@
   <xsl:template match="xhtml:email">
     <code class="email">
       <xsl:text>&lt;</xsl:text>
-	<a class="email">
-	  <xsl:attribute name="href">
-	    <xsl:text>mailto:</xsl:text>
-	    <xsl:value-of select="."/>
-	  </xsl:attribute>
-	  <xsl:value-of select="."/>
-	</a>
+      <xsl:choose>
+	<xsl:when test="@role='nolink'">
+	  <xsl:apply-templates />
+	</xsl:when>
+	<xsl:otherwise>
+	  <a class="email">
+	    <xsl:attribute name="href">
+	      <xsl:text>mailto:</xsl:text>
+	      <xsl:value-of select="."/>
+	    </xsl:attribute>
+	    <xsl:apply-templates />
+	  </a>
+	</xsl:otherwise>
+      </xsl:choose>
       <xsl:text>&gt;</xsl:text>
     </code>
   </xsl:template>