diff --git a/modules/paper-calendar.xml b/modules/paper-calendar.xml
index 505a048..26e3502 100644
--- a/modules/paper-calendar.xml
+++ b/modules/paper-calendar.xml
@@ -13,6 +13,12 @@
 		@number-of-weeks: The duration of the paper in weeks. [required]
 		
 		@lectures-per-week: The number of lectures per week in the paper. Each lecture is assumed to occupy exactly one row in the resulting table, so this effectively determines the number of rows in the resulting table that each week occupies. [required]
+		
+		@number-lectures
+		@number-tutorials
+		@number-laboratories: Whether to generate numbers for lectures, tutorials and labs, respectively. These can be specified globally because you normally want to switch this off for the entire calendar. They're not actually used in this template; rather they're just attached to the root element for ease of reference.
+		    "yes" [default]
+		    "no"
 	-->
 	<template match="calendar">
 		<common>
@@ -768,30 +774,46 @@
 
 
 	<!--
-		Output a calendar entry for a lecture. Note that lectures are always assumed to span a single row. Lectures are automatically numbered.
+		Output a calendar entry for a lecture. Note that lectures are always assumed to span a single row. Lectures are automatically numbered unless otherwise specified. Note that the lecture occupies two cells in the generated table regardless of whether it's numbered.
+		
+		@number: Whether or not to generate a number for this lecture. The value of this attribute will override any value of parent::calendar/@number-lectures (so you can have all lectures numbered apart from certain ones, or vice versa). If unspecified, it defaults to the value of parent::calendar/@number-lectures, or failing that, "yes".
+		    "yes"   [default if parent::calendar/@number-lectures not specified]
+		    "no"
 	-->
 	<template match="lecture[node() and not( @holiday )]">
+	    <common>
+	        <xsl:variable name="numbered" select="
+	            if ( @number )                                  then @number
+	            else if ( ancestor::calendar/@number-lectures ) then ancestor::calendar/@number-lectures
+	            else                                            'yes'" />
+	    </common>
 		<common formats="/latex/xelatex/">
-			<xsl:call-template name="generate-number-cell">
-				<xsl:with-param name="rows">1</xsl:with-param>
-				<xsl:with-param name="number" select="1 + count( preceding::lecture[node() and not( @holiday )] )" />
-			</xsl:call-template>
-
-			<xsl:call-template name="tabular-column-separator" />
+		    <xsl:if test="$numbered = 'yes'">
+                <xsl:call-template name="generate-number-cell">
+                    <xsl:with-param name="rows">1</xsl:with-param>
+                    <xsl:with-param name="number" select="1 + count( preceding::lecture[node() and not( @holiday )] )" />
+                </xsl:call-template>
+    
+                <xsl:call-template name="tabular-column-separator" />
+            </xsl:if>
 			
 			<xsl:call-template name="generate-content-cell">
+				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
 				<xsl:with-param name="rows">1</xsl:with-param>
 				<xsl:with-param name="align">left</xsl:with-param>
 			</xsl:call-template>
 		</common>
 		<common formats="/html/xhtml/">
-			<xsl:call-template name="generate-number-cell">
-				<xsl:with-param name="rows">1</xsl:with-param>
-				<xsl:with-param name="colour">ltgrey</xsl:with-param>
-				<xsl:with-param name="number" select="1 + count( preceding::lecture[node() and not( @holiday )] )" />
-			</xsl:call-template>
+		    <xsl:if test="$numbered = 'yes'">
+                <xsl:call-template name="generate-number-cell">
+                    <xsl:with-param name="rows">1</xsl:with-param>
+                    <xsl:with-param name="colour">ltgrey</xsl:with-param>
+                    <xsl:with-param name="number" select="1 + count( preceding::lecture[node() and not( @holiday )] )" />
+                </xsl:call-template>
+            </xsl:if>
 
 			<xsl:call-template name="generate-content-cell">
+				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
 				<xsl:with-param name="rows">1</xsl:with-param>
 				<xsl:with-param name="colour">ltgrey</xsl:with-param>
 				<xsl:with-param name="align">left</xsl:with-param>
@@ -801,7 +823,7 @@
 
 
 	<!--
-		Output a calendar entry for a lecture that occurs on a holiday. These aren't numbered.
+		Output a calendar entry for a lecture that occurs on a holiday. These aren't numbered regardless.
 	-->
 	<template match="lecture[@holiday]">
 		<common formats="/latex/xelatex/">
@@ -823,7 +845,7 @@
 
 
 	<!--
-		Output an empty lecture cell.
+		Output an empty lecture cell. These aren't numbered regardless.
 	-->
 	<template match="lecture[not( node() )]">
 		<common>
@@ -835,59 +857,93 @@
 
 
 	<!--
-		Output a calendar entry for a laboratory. Laboratories are automatically numbered.
+		Output a calendar entry for a laboratory. Laboratories are automatically numbered unless otherwise specified. Note that the laboratory occupies two cells in the generated table regardless of whether it's numbered.
+		
+		@number: Whether or not to generate a number for this laboratory. The value of this attribute will override any value of parent::calendar/@number-laboratories (so you can have all laboratories numbered apart from certain ones, or vice versa). If unspecified, it defaults to the value of parent::calendar/@number-laboratories, or failing that, "yes".
+		    "yes"   [default if parent::calendar/@number-laboratories not specified]
+		    "no"
 	-->
 	<template match="laboratory[node()]">
+	    <common>
+	        <xsl:variable name="numbered" select="
+	            if ( @number )                                      then @number
+	            else if ( ancestor::calendar/@number-laboratories ) then ancestor::calendar/@number-laboratories
+	            else                                                'yes'" />
+	    </common>
 		<common formats="/latex/xelatex/">
-			<xsl:call-template name="generate-number-cell">
-				<xsl:with-param name="number" select="1 + count( preceding::laboratory[node()] )" />
-			</xsl:call-template>
-			
-			<xsl:call-template name="tabular-column-separator" />
+		    <xsl:if test="$numbered = 'yes'">
+                <xsl:call-template name="generate-number-cell">
+                    <xsl:with-param name="number" select="1 + count( preceding::laboratory[node()] )" />
+                </xsl:call-template>
+                
+                <xsl:call-template name="tabular-column-separator" />
+            </xsl:if>
 	
-			<xsl:call-template name="generate-content-cell" />
+			<xsl:call-template name="generate-content-cell">
+				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
+			</xsl:call-template>
 		</common>
 		<common formats="/html/xhtml/">
-			<xsl:call-template name="generate-number-cell">
-				<xsl:with-param name="colour">ltblue</xsl:with-param>
-				<xsl:with-param name="number" select="1 + count( preceding::laboratory[node()] )" />
-			</xsl:call-template>
+		    <xsl:if test="$numbered = 'yes'">
+                <xsl:call-template name="generate-number-cell">
+                    <xsl:with-param name="colour">ltblue</xsl:with-param>
+                    <xsl:with-param name="number" select="1 + count( preceding::laboratory[node()] )" />
+                </xsl:call-template>
+            </xsl:if>
 
 			<xsl:call-template name="generate-content-cell">
 				<xsl:with-param name="colour">ltblue</xsl:with-param>
+				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
 			</xsl:call-template>
 		</common>
 	</template>
 
 
 	<!--
-		Output a calendar entry for a tutorial. Tutorials are automatically numbered.
+		Output a calendar entry for a tutorial. Tutorials are automatically numbered unless otherwise specified. Note that the tutorial occupies two cells in the generated table regardless of whether it's numbered.
+		
+		@number: Whether or not to generate a number for this tutorial. The value of this attribute will override any value of parent::calendar/@number-tutorials (so you can have all tutorials numbered apart from certain ones, or vice versa). If unspecified, it defaults to the value of parent::calendar/@number-tutorials, or failing that, "yes".
+		    "yes"   [default if parent::calendar/@number-tutorials not specified]
+		    "no"
 	-->
 	<template match="tutorial[node()]">
+	    <common>
+	        <xsl:variable name="numbered" select="
+	            if ( @number )                                   then @number
+	            else if ( ancestor::calendar/@number-tutorials ) then ancestor::calendar/@number-tutorials
+	            else                                             'yes'" />
+	    </common>
 		<common formats="/latex/xelatex/">
-			<xsl:call-template name="generate-number-cell">
-				<xsl:with-param name="number" select="1 + count( preceding::tutorial[node()] )" />
-			</xsl:call-template>
-			
-			<xsl:call-template name="tabular-column-separator" />
+		    <xsl:if test="$numbered = 'yes'">
+                <xsl:call-template name="generate-number-cell">
+                    <xsl:with-param name="number" select="1 + count( preceding::tutorial[node()] )" />
+                </xsl:call-template>
+                
+                <xsl:call-template name="tabular-column-separator" />
+            </xsl:if>
 	
-			<xsl:call-template name="generate-content-cell" />
+			<xsl:call-template name="generate-content-cell">
+				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
+			</xsl:call-template>
 		</common>
 		<common formats="/html/xhtml/">
-			<xsl:call-template name="generate-number-cell">
-				<xsl:with-param name="colour">medgreen</xsl:with-param>
-				<xsl:with-param name="number" select="1 + count( preceding::tutorial[node()] )" />
-			</xsl:call-template>
+		    <xsl:if test="$numbered = 'yes'">
+                <xsl:call-template name="generate-number-cell">
+                    <xsl:with-param name="colour">medgreen</xsl:with-param>
+                    <xsl:with-param name="number" select="1 + count( preceding::tutorial[node()] )" />
+                </xsl:call-template>
+            </xsl:if>
 
 			<xsl:call-template name="generate-content-cell">
 				<xsl:with-param name="colour">medgreen</xsl:with-param>
+				<xsl:with-param name="columns" select="if ( $numbered = 'yes' ) then 1 else 2" />
 			</xsl:call-template>
 		</common>
 	</template>
 
 
 	<!--
-		Output an empty laboratory/tutorial cell.
+		Output an empty laboratory/tutorial cell. These aren't numbered regardless.
 	-->
 	<template match="laboratory[not( node() )]|tutorial[not( node() )]">
 		<common>