Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Jan 2013 14:45:35 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org
Subject:   svn commit: r40557 - head/share/xml
Message-ID:  <201301091445.r09EjZtj010443@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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'" />



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301091445.r09EjZtj010443>