Fix newspaper header issues

fixes #168
rrthomas · Jun 15, 2024 · a21daaf · a21daaf
1 parent a4ad53f
commit a21daaf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -7,7 +7,7 @@ on:
       version_number:
         description: "Version number"
         required: true
-        default: "v1.2.9"
+        default: "v1.2.12"
       version_text:
         description: "Description"
         required: true
@@ -77,6 +77,7 @@ jobs:
           prerelease: false
           files: |
             ./hpmor*.pdf
+            ./hpmor.html
             ./hpmor.epub
             ./hpmor.mobi
             ./hpmor.fb2
diff --git a/chapters/hpmor-chapter-086.tex b/chapters/hpmor-chapter-086.tex
@@ -3,9 +3,9 @@ \chapter{Multiple Hypothesis Testing}
 
 \begin{headlines}
 
-\header{(International news headlines of April 7th, 1992:)}
+\newspaperHeader{(International news headlines of April 7th, 1992:)}
 
-\label{Toronto Magical Tribune:}
+\newspaperName{Toronto Magical Tribune:}
 
 \headline{Entire British Wizengamot\\
 Reports Seeing ‘Boy-Who-Lived’\\
@@ -17,25 +17,25 @@ \chapter{Multiple Hypothesis Testing}
 \headline{France, Germany Accuse Britain\\
 of Making the Whole Thing Up}
 
-\label{New Zealand Spellcrafter’s Diurnal Notice:}
+\newspaperName{New Zealand Spellcrafter’s Diurnal Notice:}
 
 \headline{What Drove British Legislature Insane?\\
 Could Our Government Be Next?}
 
 \headline{Experts List Top 28 Reasons\\
 To Believe It’s Already Happened}
 
-\label{American Mage:}
+\newspaperName{American Mage:}
 
 \headline{Werewolf Clan to Become\\
 First Inhabitants of Wyoming}
 
-\label{The Quibbler:}
+\newspaperName{The Quibbler:}
 
 \headline{Malfoy Flees Hogwarts\\
 As Veela Powers Awaken}
 
-\label{Daily Prophet:}
+\newspaperName{Daily Prophet:}
 
 \headline{Legal Tricks Free\\
 “Mad Muggle-born”\\

diff --git a/layout/hp-markup.tex b/layout/hp-markup.tex
@@ -73,18 +73,17 @@
 \textsc{#1}%
 }
 
+\newcommand{\newspaperHeader}[1]{\begin{SingleSpace}\upshape #1\end{SingleSpace}}
+\newcommand{\newspaperName}[1]{\upshape\itshape #1}
+
 \newenvironment{headlines}{%
-  \newcommand{\header}[1]{\begin{SingleSpace}\upshape ##1\end{SingleSpace}}
-  \let\hmorSavedLabel\label
-  \renewcommand{\label}[1]{{\upshape\itshape ##1}}%
   \begin{Spacing}{0.75}
   \begin{center}
   \scshape
   \nonzeroparskip
 }{
   \end{center}
   \end{Spacing}
-  \let\label\hmorSavedLabel
 }
 
 

diff --git a/scripts/ebook/hpmor-ebook.tex b/scripts/ebook/hpmor-ebook.tex
@@ -16,6 +16,7 @@
 \renewcommand{\McGonagallWhiteBoard}[1]{\textcolor{McGonagallWhiteBoard}{\par#1}}
 \renewcommand{\headline}[1]{\begin{center}\textcolor{headline}{#1}\end{center}}
 \renewcommand{\inlineheadline}[1]{\textcolor{headline}{#1}}
+\renewcommand{\newspaperHeader}[1]{#1}
 
 \include{chapters/hpmor-chapter-000}
 \part{Harry James Potter-Evans-Verres and the Methods of Rationality}

diff --git a/scripts/ebook/step_6.py b/scripts/ebook/step_6.py
@@ -92,9 +92,6 @@ def fix_ellipsis(s: str) -> str:
     # fix spaces around ellipsis
     cont = fix_ellipsis(cont)
 
-    # remove bad span ids (containing spaces) from newspaper spans
-    cont = re.sub(r'<span id="[^"]+" label="[^"]+">', r"<span>", cont, count=5)
-
     # doc structure (not needed any more, using calibi --level1-toc flag instead)
     # sed -i 's/<h1 /<h1 class="part"/g' $target_file
     # sed -i 's/<h2 /<h2 class="chapter"/g' $target_file