Fix vertical whitespace around grammar definitions and bullets.

zygoloid · zygoloid · commit 3650ebb51c7c · 2014-06-26T12:10:24.000-07:00
diff --git a/source/layout.tex b/source/layout.tex
@@ -30,7 +30,7 @@
 \counterwithin{Paras}{paragraph}
 \counterwithin{Paras}{subparagraph}
 \makeatletter
-\def\pnum{\vspace{1ex}\addtocounter{Paras}{1}\noindent\llap{{%
+\def\pnum{\addtocounter{Paras}{1}\noindent\llap{{%
   \scriptsize\raisebox{.7ex}{\arabic{Paras}}}\hspace{\@totalleftmargin}\quad}}
 \makeatother
 
diff --git a/source/macros.tex b/source/macros.tex
@@ -315,7 +315,7 @@
 
 \newenvironment{bnfbase}
  {
- \newcommand{\nontermdef}[1]{\indexgrammar{\idxgram{##1}}\nonterminal{##1}:}
+ \newcommand{\nontermdef}[1]{\nonterminal{##1}\indexgrammar{\idxgram{##1}}:}
  \newcommand{\terminal}[1]{{\BnfTermshape ##1}\xspace}
  \newcommand{\descr}[1]{\normalfont{##1}}
  \newcommand{\bnfindentfirst}{\BnfIndent}
diff --git a/source/styles.tex b/source/styles.tex
@@ -97,6 +97,8 @@
 %%--------------------------------------------------
 % set style for main text
 \setlength{\parindent}{0pt}
+\setlength{\parskip}{1ex}
+\setlength{\partopsep}{-1.5ex}
 
 %%--------------------------------------------------
 %%  set caption style and delimiter

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@`
`315`	`315`
`316`	`316`	`\newenvironment{bnfbase}`
`317`	`317`	`{`
`318`		`- \newcommand{\nontermdef}[1]{\indexgrammar{\idxgram{##1}}\nonterminal{##1}:}`
	`318`	`+ \newcommand{\nontermdef}[1]{\nonterminal{##1}\indexgrammar{\idxgram{##1}}:}`
`319`	`319`	`\newcommand{\terminal}[1]{{\BnfTermshape ##1}\xspace}`
`320`	`320`	`\newcommand{\descr}[1]{\normalfont{##1}}`
`321`	`321`	`\newcommand{\bnfindentfirst}{\BnfIndent}`