From owner-svn-doc-head@FreeBSD.ORG  Wed Jan  9 14:45:36 2013
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@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 4B47596D;
 Wed,  9 Jan 2013 14:45:36 +0000 (UTC) (envelope-from hrs@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 2EF7831E;
 Wed,  9 Jan 2013 14:45:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r09EjaSo010445;
 Wed, 9 Jan 2013 14:45:36 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r09EjZtj010443;
 Wed, 9 Jan 2013 14:45:35 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201301091445.r09EjZtj010443@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 9 Jan 2013 14:45:35 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r40557 - head/share/xml
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jan 2013 14:45:36 -0000

Author: hrs
Date: Wed Jan  9 14:45:35 2013
New Revision: 40557
URL: http://svnweb.freebsd.org/changeset/doc/40557

Log:
  Fix a syntax error.  This caused a build breakage in newer libxslt which check
  the stylesheet syntax more strictly.
  
  |It is an error for the value of either the use attribute or the match
  |attribute to contain a VariableReference.
  | (XSL Transformations (XSLT) |Version 1.0, Section 12.2)
  
  Reported by:	gjb on -doc@

Modified:
  head/share/xml/templates.events.xsl
  head/share/xml/templates.pastevents.xsl

Modified: head/share/xml/templates.events.xsl
==============================================================================
--- head/share/xml/templates.events.xsl	Wed Jan  9 11:22:16 2013	(r40556)
+++ head/share/xml/templates.events.xsl	Wed Jan  9 14:45:35 2013	(r40557)
@@ -51,12 +51,12 @@
   <xsl:key name="event-by-country" match="event"
     use="location/country" />
 
-  <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) &gt; number($curdate.year)) or
-	    (number(enddate/year) = number($curdate.year) and
-	     number(enddate/month) &gt; number($curdate.month)) or
-	    (number(enddate/year) = number($curdate.year) and
-	     number(enddate/month) = number($curdate.month) and
-	     enddate/day &gt;= $curdate.day))]"
+  <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) &gt; number(date:year())) or
+	    (number(enddate/year) = number(date:year()) and
+	     number(enddate/month) &gt; number(date:month-in-year())) or
+	    (number(enddate/year) = number(date:year()) and
+	     number(enddate/month) = number(date:month-in-year()) and
+	     enddate/day &gt;= date:day-in-month()))]"
     use="location/country" />
 
   <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&amp;chs=400x200&amp;chtm=world&amp;chco=ffffff,ffbe38,600000&amp;chf=bg,s,4D89F9'" />

Modified: head/share/xml/templates.pastevents.xsl
==============================================================================
--- head/share/xml/templates.pastevents.xsl	Wed Jan  9 11:22:16 2013	(r40556)
+++ head/share/xml/templates.pastevents.xsl	Wed Jan  9 14:45:35 2013	(r40557)
@@ -53,12 +53,12 @@
   <xsl:key name="event-by-country" match="event"
     use="location/country" />
 
-  <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) &gt; number($curdate.year)) or
-	    (number(enddate/year) = number($curdate.year) and
-	     number(enddate/month) &gt; number($curdate.month)) or
-	    (number(enddate/year) = number($curdate.year) and
-	     number(enddate/month) = number($curdate.month) and
-	     enddate/day &gt;= $curdate.day))]"
+  <xsl:key name="upcoming-event-by-country" match="event[((number(enddate/year) &gt; number(date:year())) or
+	    (number(enddate/year) = number(date:year()) and
+	     number(enddate/month) &gt; number(date:month-in-year())) or
+	    (number(enddate/year) = number(date:year()) and
+	     number(enddate/month) = number(date:month-in-year()) and
+	     enddate/day &gt;= date:day-in-month()))]"
     use="location/country" />
 
   <xsl:variable name="charturl" select="'http://chart.apis.google.com/chart?cht=t&amp;chs=400x200&amp;chtm=world&amp;chco=ffffff,ffbe38,600000&amp;chf=bg,s,4D89F9'" />