hp-markup.tex: reorg and \SPHEW{} without {}

Author: entorb

chapters/hpmor-chapter-070.tex

@@ -94,7 +94,7 @@
 
 “Professor Quirrell,” said Professor Vector, “what exactly are you implying?”
 
-The Defence Professor raised the button so that the golden-lettered \SPHEW{} faced them, and said, “Heroes,” then turned the button to show its silver backside and said, “Dark Wizards. They are similar career paths followed by similar people, and one can hardly ask why young witches are turning away from one course without considering its reflection.”
+The Defence Professor raised the button so that the golden-lettered \SPHEW faced them, and said, “Heroes,” then turned the button to show its silver backside and said, “Dark Wizards. They are similar career paths followed by similar people, and one can hardly ask why young witches are turning away from one course without considering its reflection.”
 
 “Oh, \emph{now} I see!” said Tracey Davis, speaking up so suddenly that Hermione gave a small start. “You’re joining our protest because you’re worried that not enough girls are becoming Dark Witches!” Then Tracey giggled, which Hermione couldn’t have managed at this point if you paid her a million pounds sterling.
 

chapters/hpmor-chapter-071.tex

@@ -136,7 +136,7 @@
 
 “Besides,” said Parvati, sounding puzzled, “isn’t the whole point that we’re trying to be heroes even though that isn’t feminine?”
 
-The ensuing discussion would not be remembered by Hermione Granger as one of her most successful forays into the realms of political education. She tried to explain, and then after the resulting argument tried to explain again, while the other seven girls looked at her more and more skeptically. Afterwards Daphne declared in the imperious tones of the future Lady Greengrass that if this feminism business meant girls weren’t allowed to pursue boys in whichever way they pleased, then feminism could stay in the Muggle lands where it belonged. Lavender suggested that maybe witchism could say that witches got to do anything they wanted, which sounded like more fun than feminism. And finally Padma closed off further discussion by observing wearily that she didn’t see much point to going on arguing, since \SPHEW{} wasn’t \emph{about} anything to do with feminism in the first place, it was just about more girls becoming heroes.
+The ensuing discussion would not be remembered by Hermione Granger as one of her most successful forays into the realms of political education. She tried to explain, and then after the resulting argument tried to explain again, while the other seven girls looked at her more and more skeptically. Afterwards Daphne declared in the imperious tones of the future Lady Greengrass that if this feminism business meant girls weren’t allowed to pursue boys in whichever way they pleased, then feminism could stay in the Muggle lands where it belonged. Lavender suggested that maybe witchism could say that witches got to do anything they wanted, which sounded like more fun than feminism. And finally Padma closed off further discussion by observing wearily that she didn’t see much point to going on arguing, since \SPHEW wasn’t \emph{about} anything to do with feminism in the first place, it was just about more girls becoming heroes.
 
 Hermione had given up at that point.
 
@@ -232,7 +232,7 @@
 
 Daphne finished her final inch of Transfiguration and looked up across the Slytherin common room, at where Millicent Bulstrode was still working on her own homework. It was time to come to a Decision.
 
-If \SPHEW{} did go around trying to stun bullies, the bullies wouldn’t like it, that was certain. And they’d try to do something unpleasant about it, which was also certain. On the other hand, if the bullies got really nasty then Hermione could ask Harry Potter for help, or they could pool their combined Quirrell points and ask the Defence Professor for a favour…No, the thing that Daphne was \emph{really} worried about was if this business got them in bad with Professor Snape. You didn’t want to \emph{ever} end up on the wrong side of Professor Snape.
+If \SPHEW did go around trying to stun bullies, the bullies wouldn’t like it, that was certain. And they’d try to do something unpleasant about it, which was also certain. On the other hand, if the bullies got really nasty then Hermione could ask Harry Potter for help, or they could pool their combined Quirrell points and ask the Defence Professor for a favour…No, the thing that Daphne was \emph{really} worried about was if this business got them in bad with Professor Snape. You didn’t want to \emph{ever} end up on the wrong side of Professor Snape.
 
 But since the day she’d challenged Neville to a Most Ancient Duel, she’d noticed people looking at her differently. Even the Slytherins who’d made fun of her were looking at her differently. It was dawning on Daphne that being the daughter of the Noble and Most Ancient House of Greengrass brought in a \emph{lot} more respect if you were a beautiful \emph{heroine} born to a Most Ancient House, and not just a pretty noble girl. It was the difference between having your role played by the lead actress and having your role played by a two-Galleon extra with a screechy laugh.
 

chapters/hpmor-chapter-072.tex

@@ -228,7 +228,7 @@
 
 Someone \emph{did} gasp then, though fortunately very very quietly. If they couldn’t get in even a single shot—
 
-The bullies were learning \emph{already}, Susan realized, she hadn’t expected \SPHEW{} to be able to do this very often before the bullies caught on—but—Hermione had already defeated three bullies—and the school had been buzzing with speculation about Salazar Slytherin’s ghost, yesterday—
+The bullies were learning \emph{already}, Susan realized, she hadn’t expected \SPHEW to be able to do this very often before the bullies caught on—but—Hermione had already defeated three bullies—and the school had been buzzing with speculation about Salazar Slytherin’s ghost, yesterday—
 
 \emph{He’s expecting us!}
 

chapters/hpmor-chapter-073.tex

@@ -18,7 +18,7 @@
 
 \emph{Hermione reached out a trembling hand to grasp her copy of \emph{Hogwarts: A History} from where it had fallen, the ever-comforting book only a pace distant from where she herself had ended up on the floor, after the red-robed upper-year girl had “bumped” her into a wall. And then the older Gryffindor witch had walked away without a look back, only a whispered \mbox{“Salazar’s—”} and a word that hurt her more than anything the Slytherins said about mudbloods, ‘mudblood’ was just a strange wizarding word but Hermione knew the word the Gryffindor had said. She couldn’t get used to it, she just couldn’t get used to being hated. It still hurt just as much every time it happened, and somehow it hurt even more coming from the Gryffindors who were \emph{supposed} to be the good ones.}
 
-Harry had divided up eight of his soldiers among the other armies, as ordered; he’d voluntarily given up \emph{two} Chaotic Lieutenants, sending Dean Thomas to Dragon Army and then trading Seamus Finnigan to her for Blaise Zabini, who Harry had said was being “underutilized” in Sunshine. Lavender had elected to join most of \SPHEW{} in Sunshine; Tracey had decided to stay with Chaos.
+Harry had divided up eight of his soldiers among the other armies, as ordered; he’d voluntarily given up \emph{two} Chaotic Lieutenants, sending Dean Thomas to Dragon Army and then trading Seamus Finnigan to her for Blaise Zabini, who Harry had said was being “underutilized” in Sunshine. Lavender had elected to join most of \SPHEW in Sunshine; Tracey had decided to stay with Chaos.
 
 \emph{“So you can work your charms on General Potter?” said Lavender, as Hermione ignored both of them as hard as she could. “I’ve got to say, Traces, I think our Sunshine General has him pretty well sewn up by now—you’d have better luck convincing Hermione that the three of you should have one of those, you know, arrangements—”}
 

chapters/hpmor-chapter-075.tex

@@ -170,7 +170,7 @@
 
 “\emph{Why?}” The frustration burst out into her voice. “\emph{Why is it so awful? All you have to do is ask!}”
 
-Harry’s eyes were very serious. “Who in \SPHEW{} do you try hardest to defend, Hermione? Who are you most afraid for, when you fight?”
+Harry’s eyes were very serious. “Who in \SPHEW do you try hardest to defend, Hermione? Who are you most afraid for, when you fight?”
 
 “Hannah Abbott,” Hermione said without having to think about it, and then felt a little bad, because Hannah \emph{was} trying hard and she \emph{had} improved a lot—
 
@@ -244,7 +244,7 @@
 
 “What is it?” said Hermione.
 
-“I predict \SPHEW{} is about to retire.”
+“I predict \SPHEW is about to retire.”
 
 “\emph{Retire?}” Hermione said, almost stumbling on one of the stairs.
 

chapters/hpmor-chapter-084.tex

@@ -392,7 +392,7 @@
 
 Su Li and Lisa Turpin and Michael Corner, all sitting at a table together, all of whom she’d helped with their homework at one time or another, all looked away, their faces suddenly nervous, the moment she tried to catch their eyes.
 
-A third-year witch named Latisha Randle, whom \SPHEW{} had twice saved from Slytherin bullies, quickly bent back over her desk and started doing homework again.
+A third-year witch named Latisha Randle, whom \SPHEW had twice saved from Slytherin bullies, quickly bent back over her desk and started doing homework again.
 
 Mandy Brocklehurst looked away from her.
 

layout/hp-markup.tex

@@ -8,24 +8,26 @@
 \newcommand{\shout}[1]{\textsc{#1}}
 \newcommand{\scream}[1]{\MakeUppercase{#1}}
 \newcommand{\prophesy}[1]{\shout{#1}}
+
+% parsel
 \newcommand{\parselify}[1]{%
   \StrSubstitute{#1}{ss}{ß}[\parselstring]%
   \StrSubstitute{\parselstring}{s}{ss}[\parsselstring]%
   \StrSubstitute{\parsselstring}{ß}{sss}[\parssselstring]%
 }
 % N.B. Other commands, such as \emph, cannot be used inside \parsel
-\newcommand\parsel[1]{\parselify{\fontspec[ExternalLocation]{Parseltongue.ttf}#1}{\ptsansi\parssselstring}}
+\newcommand{\parsel}[1]{\parselify{\fontspec[ExternalLocation]{Parseltongue.ttf}#1}{\ptsansi\parssselstring}}
 
 % Special types of text
 \newcommand{\abbrev}[1]{\textsc{\MakeLowercase{#1}}\xspace}
-\newcommand{\headline}[1]{\begin{center}\textsc{#1}\end{center}}
 
 % Common abbreviations
 \newcommand{\am}{~a.m.\xspace}
 \renewcommand{\pm}{~p.m.\xspace}
-\newcommand{\SPHEW}{{\abbrev{SPHEW}}}
+\newcommand{\SPHEW}{\abbrev{SPHEW}}
 
 % Newspaper headlines
+\newcommand{\headline}[1]{\begin{center}\textsc{#1}\end{center}}
 \newcommand{\inlineheadline}[1]{\textsc{#1}}
 \newenvironment{headlines}{
   \newcommand{\header}[1]{\begin{SingleSpace}\upshape ##1\end{SingleSpace}}