diff --git a/calendar/generate_lecturedates.php b/calendar/generate_lecturedates.php
index 4d35545..b3d29a7 100644
--- a/calendar/generate_lecturedates.php
+++ b/calendar/generate_lecturedates.php
@@ -1,14 +1,14 @@
 <?php
 
 /*
-    This script generates a LaTeX include file that contains macros specifying
+    This script generates a LaTeX include file that contains macros for generating
     the dates for every lecture in a teaching period. It doesn't generate dates
     for multiple papers; rather, you should generate a separate include file for
-    each paper individually. The main reason for this approach is that paper
-    codes include digits, which you can't include in LaTeX macro names. We
-    therefore generate generic macros (\DateLectureOne, \DateLectureTwo, etc.),
-    that don't include any paper information. The configuration for a specific
-    paper is read from a separate file.
+    each paper individually. The main reason for this approach is that each paper
+    will have different lecture offsets in a week, and possibly also a different
+    number of lectures each week. It's easier to keep track of this in paper-
+    specific files rather than a single file for all papers. The configuration
+    for a specific paper is read from a separate file.
     
     The output of the script should be placed at the root of the tree for the
     target paper, alongside the paper_init.tex file.
@@ -99,8 +99,6 @@
 */
 require 'lecturedates_config.php';
 
-$numwords = new Numbers_Words();
-
 // Process command line arguments.
 // This only accepts paper codes in the usual form XXXX999, and will fail for
 // unusual papers like "INFO5H". However, it's extremely unlikely that such
@@ -121,6 +119,18 @@
 $period_settings = $period_config[$period_code];
 $paper_settings = $paper_config[$paper_code];
 
+        print <<<EOT
+\\newcount\\lecnum
+\\newcount\\weeknum
+
+\\newcommand{\\LectureDate}[1]{%
+    \\lecnum #1\\relax%
+    \\advance\\lecnum by -1\\relax%
+    \\ifcase\\lecnum 
+EOT;
+
+$first_lecture = true;
+
 foreach ($period_settings['start_dates'] as $period => $period_start)
 {
     $week_start = clone($period_start);
@@ -134,15 +144,13 @@
             $class_date = clone($week_start);
             $class_date->add($offset);
             
-            // Note that the toWords() method generates hyphens in the result,
-            // so we need to strip these out for LaTeX to be happy. Larger
-            // numbers may well include spaces and commas, but it's pretty
-            // unlikely that we'll ever get that high!
-            printf( "\\newcommand{\\DateWeek%sLecture%s}{%s}\n",
-                ucfirst( str_replace( '-', '', $numwords->toWords( $week_num ) ) ),
-                ucfirst( str_replace( '-', '', $numwords->toWords( $lecture_num ) ) ),
-                $class_date->format( 'j F' )
-            );
+            if ($first_lecture) {
+                $first_lecture = false;
+            }
+            else {
+                print "        \\or ";
+            }
+            printf("%s%%\n", $class_date->format('j F'));
             $lecture_num++;
         } // for every class in week
         
@@ -150,3 +158,18 @@
         $week_num++;
     } // for every week in period
 } // for every period
+
+print <<<EOT
+        \\else ????%
+    \\fi%
+}
+
+\\newcommand{\\LectureDateByWeek}[2]{%
+    \\weeknum #1\\relax%
+    \\advance\\weeknum by -1\\relax%
+    \\multiply\\weeknum by 2\\relax%
+    \\advance\\weeknum by #2\\relax%
+    \\LectureDate{\\the\\weeknum}%
+}
+
+EOT;