drwho.tex: Pick a single alignment for companion tracks and reformat.

Two entries need to be adjusted left to fit, but this seems preferable
to splitting them, which was the previous approach.

diff --git a/drwho.tex b/drwho.tex
index 30f427b5cd9c4352a0dd0bb3cd38c68b1afb3019..b53106776b6448e4d8299574bc44486d5bb87e95 100644 (file)
--- a/drwho.tex
+++ b/drwho.tex
@@ -321,14 +321,14 @@
 \doctor{The Fourth Doctor (1974--1981)}
   %
 \season{Season 12}
 \doctor{The Fourth Doctor (1974--1981)}
   %
 \season{Season 12}

-  Robot                                 \join{t1}{H}{Harry Sullivan}    \\
+  Robot                         \join{t1}{H}{Harry Sullivan}            \\

   The Ark in Space                                                      \\
   The Sontaran Experiment                                               \\
   Genesis of the Daleks                                                 \\
   Revenge of the Cybermen                                               \\
   %
 \season{Season 13}
   The Ark in Space                                                      \\
   The Sontaran Experiment                                               \\
   Genesis of the Daleks                                                 \\
   Revenge of the Cybermen                                               \\
   %
 \season{Season 13}

-  Terror of the Zygons                  \depart{t1}                     \\
+  Terror of the Zygons          \depart{t1}                             \\

   Planet of Evil                                                        \\
   Pyramids of Mars                                                      \\
   The Android Invasion                                                  \\
   Planet of Evil                                                        \\
   Pyramids of Mars                                                      \\
   The Android Invasion                                                  \\


@@ -337,23 +337,22 @@
   %
 \season{Season 14}
   The Masque of Mandragora                                              \\
   %
 \season{Season 14}
   The Masque of Mandragora                                              \\

-  The Hand of Fear                      \depart{t0}                     \\
+  The Hand of Fear              \depart{t0}                             \\

   The Deadly Assassin                                                   \\
   The Deadly Assassin                                                   \\

-  The Face of Evil                      \join{t0}{L}{Leela}             \\
+  The Face of Evil              \join{t0}{L}{Leela}                     \\

   The Robots of Death                                                   \\
   The Talons of Weng-Chiang                                             \\
   %
 \season{Season 15}
   Horror of Fang Rock                                                   \\
   The Robots of Death                                                   \\
   The Talons of Weng-Chiang                                             \\
   %
 \season{Season 15}
   Horror of Fang Rock                                                   \\

-  The Invisible Enemy                   \join{t1}{K}{K--9}              \\
+  The Invisible Enemy           \join{t1}{K}{K--9}                      \\

   Image of the Fendahl                                                  \\
   The Sun Makers                                                        \\
   Underworld                                                            \\
   Image of the Fendahl                                                  \\
   The Sun Makers                                                        \\
   Underworld                                                            \\

-  The Invasion of Time                  \depart{t0}                     \\
+  The Invasion of Time          \depart{t0}                             \\

   %
 \season{Season 16 (The Key to Time)}
   %
 \season{Season 16 (The Key to Time)}

-  The Ribos Operation                   \join{t0}{R}{Romanadvoratrelundar
-                                                        (`Romana')} \\
+  The Ribos Operation     \join{t0}{R}{Romanadvoratrelundar (`Romana')} \\

   The Pirate Planet                                                     \\
   The Stones of Blood                                                   \\
   The Androids of Tara                                                  \\
   The Pirate Planet                                                     \\
   The Stones of Blood                                                   \\
   The Androids of Tara                                                  \\


@@ -371,11 +370,11 @@
 \season{Season 18}
   The Leisure Hive                                                      \\
   Meglos                                                                \\
 \season{Season 18}
   The Leisure Hive                                                      \\
   Meglos                                                                \\

-  Full Circle                           \join{t2}{A}{Adric}             \\
+  Full Circle                   \join{t2}{A}{Adric}                     \\

   State of Decay                                                        \\
   State of Decay                                                        \\

-  Warriors' Gate                        \depart{t0} \depart{t1}         \\
-  The Keeper of Traken                  \join{t3}{N}{Nyssa of Traken}   \\
-  Logopolis                             \join{t0}{T}{Tegan Jovanka}     \\
+  Warriors' Gate                \depart{t0} \depart{t1}                 \\
+  The Keeper of Traken          \join{t3}{N}{Nyssa of Traken}           \\
+  Logopolis                     \join{t0}{T}{Tegan Jovanka}             \\

   %
 \pagebreak
 \doctor{The Fifth Doctor (1981--1984)}
   %
 \pagebreak
 \doctor{The Fifth Doctor (1981--1984)}


@@ -386,16 +385,16 @@
   Kinda                                                                 \\
   The Visitation                                                        \\
   Black Orchid                                                          \\
   Kinda                                                                 \\
   The Visitation                                                        \\
   Black Orchid                                                          \\

-  Earthshock                            \die{t2}                        \\
+  Earthshock                    \die{t2}                                \\

   Time-Flight                                                           \\
   %
 \season{Season 20}
   Arc of Infinity                                                       \\
   Snakedance                                                            \\
   Time-Flight                                                           \\
   %
 \season{Season 20}
   Arc of Infinity                                                       \\
   Snakedance                                                            \\

-  Mawdryn Undead                        \join{t1}{T}{Vislor Turlough}   \\
-  Terminus                              \depart{t3}                     \\
+  Mawdryn Undead                \join{t1}{T}{Vislor Turlough}           \\
+  Terminus                      \depart{t3}                             \\

   Enlightenment                                                         \\
   Enlightenment                                                         \\

-  The King's Demons                     \join{t2}{K}{Kameleon}          \\
+  The King's Demons             \join{t2}{K}{Kameleon}                  \\

   %
 \season{(Special)}
   The Five Doctors                                                      \\
   %
 \season{(Special)}
   The Five Doctors                                                      \\


@@ -404,11 +403,10 @@
   Warriors of the Deep                                                  \\
   The Awakening                                                         \\
   Frontios                                                              \\
   Warriors of the Deep                                                  \\
   The Awakening                                                         \\
   Frontios                                                              \\

-  Resurrection of the Daleks            \depart{t0}                     \\
-  Planet of Fire                        \depart{t1}
-                                        \die{t2}
-                                        \join{t3}{P}{Perpugilliam
-                                                        `Peri' Brown}   \\
+  Resurrection of the Daleks    \depart{t0}                             \\
+  Planet of Fire                \depart{t1}
+                                \die{t2}
+                                \join{t3}{P}{Perpugilliam `Peri' Brown} \\

   The Caves of Androzani                                                \\
   %
 \doctor{The Sixth Doctor (1984--1986)}
   The Caves of Androzani                                                \\
   %
 \doctor{The Sixth Doctor (1984--1986)}


@@ -426,8 +424,8 @@
   %
 \season{Season 23 (The Trial of a Time Lord)}
   The Mysterious Planet                                                 \\
   %
 \season{Season 23 (The Trial of a Time Lord)}
   The Mysterious Planet                                                 \\

-  Mindwarp                              \die{t3}                        \\
-  Terror of the Vervoids                \join{t0}{M}{Melanie Bush}      \\
+  Mindwarp                      \die{t3}                                \\
+  Terror of the Vervoids        \join{t0}{M}{Melanie Bush}              \\

   The Ultimate Foe                                                      \\
   %
 \doctor{The Seventh Doctor (1987--1989)}
   The Ultimate Foe                                                      \\
   %
 \doctor{The Seventh Doctor (1987--1989)}


@@ -436,9 +434,8 @@
   Time and the Rani                                                     \\
   Paradise Towers                                                       \\
   Delta and the Bannerman                                               \\
   Time and the Rani                                                     \\
   Paradise Towers                                                       \\
   Delta and the Bannerman                                               \\

-  Dragonfire                            \depart{t0}
-                                        \join{t1}{A}{Dorothy `Ace'
-                                                        McShane Gale}   \\
+  Dragonfire                    \depart{t0}
+                               \join{t1}{A}{Dorothy `Ace' McShane Gale} \\

   %
 \season{Season 25}
   Remembrance of the Daleks                                             \\
   %
 \season{Season 25}
   Remembrance of the Daleks                                             \\


@@ -450,7 +447,7 @@
   Battlefield                                                           \\
   Ghost Light                                                           \\
   The Curse of Fenric                                                   \\
   Battlefield                                                           \\
   Ghost Light                                                           \\
   The Curse of Fenric                                                   \\

-  Survival                              \depart{t1}                     \\
+  Survival                      \depart{t1}                             \\

   %
 }
 
   %
 }