Browse Source

* Using xspace in abbreviation macros

michael 27 years ago
parent
commit
12f233f7ad
2 changed files with 49 additions and 47 deletions
  1. 25 24
      docs/fpc.sty
  2. 24 23
      docs/fpcman.sty

+ 25 - 24
docs/fpc.sty

@@ -20,6 +20,7 @@
 %
 %
 \ProvidesPackage{fpc}[1996/12/09]
 \ProvidesPackage{fpc}[1996/12/09]
 \NeedsTeXFormat{LaTeX2e}
 \NeedsTeXFormat{LaTeX2e}
+\RequirePackage{xspace}
 \ExecuteOptions{titlepage}
 \ExecuteOptions{titlepage}
 % Some style elements
 % Some style elements
 \parindent 0pt%  
 \parindent 0pt%  
@@ -152,26 +153,26 @@
 %
 %
 % Useful references.
 % Useful references.
 %
 %
-\newcommand{\progref}{\htmladdnormallink{Programmers' guide}{../prog/prog.html}\ }
-\newcommand{\refref}{\htmladdnormallink{Reference guide}{../ref/ref.html}\ }
-\newcommand{\userref}{\htmladdnormallink{Users' guide}{../user/user.html}\ }
-\newcommand{\unitsref}{\htmladdnormallink{Unit reference}{../units/units.html}\ }
-\newcommand{\seecrt}{\htmladdnormallink{CRT}{../crt/crt.html}}
-\newcommand{\seelinux}{\htmladdnormallink{Linux}{../linux/linux.html}}
-\newcommand{\seestrings}{\htmladdnormallink{strings}{../strings/strings.html}}
-\newcommand{\seedos}{\htmladdnormallink{DOS}{../dos/dos.html}}
-\newcommand{\seegetopts}{\htmladdnormallink{getopts}{../getopts/getopts.html}}
-\newcommand{\seeobjects}{\htmladdnormallink{objects}{../objects/objects.html}}
-\newcommand{\seegraph}{\htmladdnormallink{graph}{../graph/graph.html}}
-\newcommand{\seeprinter}{\htmladdnormallink{printer}{../printer/printer.html}}
-\newcommand{\seego}{\htmladdnormallink{GO32}{../go32/go32.html}}
-\newcommand{\seec}[1]{chapter \ref{ch:#1}}
-\newcommand{\sees}[1]{section \ref{se:#1}}
+\newcommand{\progref}{\htmladdnormallink{Programmers' guide}{../prog/prog.html}\xspace}
+\newcommand{\refref}{\htmladdnormallink{Reference guide}{../ref/ref.html}\xspace}
+\newcommand{\userref}{\htmladdnormallink{Users' guide}{../user/user.html}\xspace}
+\newcommand{\unitsref}{\htmladdnormallink{Unit reference}{../units/units.html}\xspace}
+\newcommand{\seecrt}{\htmladdnormallink{CRT}{../crt/crt.html}\xspace}
+\newcommand{\seelinux}{\htmladdnormallink{Linux}{../linux/linux.html}\xspace}
+\newcommand{\seestrings}{\htmladdnormallink{strings}{../strings/strings.html}\xspace}
+\newcommand{\seedos}{\htmladdnormallink{DOS}{../dos/dos.html}\xspace}
+\newcommand{\seegetopts}{\htmladdnormallink{getopts}{../getopts/getopts.html}\xspace}
+\newcommand{\seeobjects}{\htmladdnormallink{objects}{../objects/objects.html}\xspace}
+\newcommand{\seegraph}{\htmladdnormallink{graph}{../graph/graph.html}\xspace}
+\newcommand{\seeprinter}{\htmladdnormallink{printer}{../printer/printer.html}\xspace}
+\newcommand{\seego}{\htmladdnormallink{GO32}{../go32/go32.html}\xspace}
+\newcommand{\seec}[1]{chapter \ref{ch:#1}\xspace}
+\newcommand{\sees}[1]{section \ref{se:#1}\xspace}
 %
 %
 % Nice environments
 % Nice environments
 %
 %
 % For Code examples (complete programs only)
 % For Code examples (complete programs only)
-\newenvironment{CodEx}{}{}
+\newenvironment{CodEx}{\begin{quote}}{\end{quote}}
 % For Tables.
 % For Tables.
 \newenvironment{FPCtable}[2]{\begin{table}\caption{#2}\begin{center}\begin{tabular}{#1}}{\end{tabular}\end{center}\end{table}}
 \newenvironment{FPCtable}[2]{\begin{table}\caption{#2}\begin{center}\begin{tabular}{#1}}{\end{tabular}\end{center}\end{table}}
 % The same, but with label in third argument (tab:#3)
 % The same, but with label in third argument (tab:#3)
@@ -183,14 +184,14 @@
 %
 %
 % some OSes
 % some OSes
 %
 %
-\newcommand{\linux}{\textsc{linux}\ }
-\newcommand{\dos}  {\textsc{dos}\ }
-\newcommand{\msdos}{\textsc{ms-dos}\ }
-\newcommand{\ostwo}{\textsc{os/2}\ }
-\newcommand{\windows}{\textsc{Windows}\ }
-\newcommand{\windowsnt}{\textsc{WindowsNT}\ }
-\newcommand{\fpc}{Free Pascal\ }
-\newcommand{\gnu}{\textsc{gnu}\ }
+\newcommand{\linux}{\textsc{linux}\xspace}
+\newcommand{\dos}  {\textsc{dos}\xspace}
+\newcommand{\msdos}{\textsc{ms-dos}\xspace}
+\newcommand{\ostwo}{\textsc{os/2}\xspace}
+\newcommand{\windows}{\textsc{Windows}\xspace}
+\newcommand{\windowsnt}{\textsc{WindowsNT}\xspace}
+\newcommand{\fpc}{Free Pascal\xspace}
+\newcommand{\gnu}{\textsc{gnu}\xspace}
 %
 %
 % Some versions 
 % Some versions 
 %
 %

+ 24 - 23
docs/fpcman.sty

@@ -19,6 +19,7 @@
 %   Boston, MA 02111-1307, USA. 
 %   Boston, MA 02111-1307, USA. 
 %
 %
 \ProvidesPackage{fpcman}[1997/06/25]
 \ProvidesPackage{fpcman}[1997/06/25]
+\RequirePackage{xspace}
 \NeedsTeXFormat{LaTeX2e}
 \NeedsTeXFormat{LaTeX2e}
 \ExecuteOptions{titlepage}
 \ExecuteOptions{titlepage}
 % Some style elements
 % Some style elements
@@ -120,21 +121,21 @@
 %
 %
 % Useful references.
 % Useful references.
 %
 %
-\newcommand{\progref}{\htmladdnormallink{Programmer's guide}{../prog/prog.html}\ }
-\newcommand{\refref}{\htmladdnormallink{Reference guide}{../ref/ref.html}\ }
-\newcommand{\userref}{\htmladdnormallink{Users' guide}{../user/user.html}\ }
-\newcommand{\unitsref}{\htmladdnormallink{Unit reference}{../units/units.html}\ }
-\newcommand{\seecrt}{\htmladdnormallink{CRT}{../crt/crt.html}}
-\newcommand{\seelinux}{\htmladdnormallink{Linux}{../linux/linux.html}}
-\newcommand{\seestrings}{\htmladdnormallink{strings}{../strings/strings.html}}
-\newcommand{\seedos}{\htmladdnormallink{DOS}{../dos/dos.html}}
-\newcommand{\seegetopts}{\htmladdnormallink{getopts}{../getopts/getopts.html}}
-\newcommand{\seeobjects}{\htmladdnormallink{objects}{../objects/objects.html}}
-\newcommand{\seegraph}{\htmladdnormallink{graph}{../graph/graph.html}}
-\newcommand{\seeprinter}{\htmladdnormallink{printer}{../printer/printer.html}}
-\newcommand{\seego}{\htmladdnormallink{GO32}{../go32/go32.html}}
-\newcommand{\seec}[1]{chapter \ref{ch:#1}}
-\newcommand{\sees}[1]{section \ref{se:#1}}
+\newcommand{\progref}{\htmladdnormallink{Programmer's guide}{../prog/prog.html}\xspace}
+\newcommand{\refref}{\htmladdnormallink{Reference guide}{../ref/ref.html}\xspace}
+\newcommand{\userref}{\htmladdnormallink{Users' guide}{../user/user.html}\xspace}
+\newcommand{\unitsref}{\htmladdnormallink{Unit reference}{../units/units.html}\xspace}
+\newcommand{\seecrt}{\htmladdnormallink{CRT}{../crt/crt.html}\xspace}
+\newcommand{\seelinux}{\htmladdnormallink{Linux}{../linux/linux.html}\xspace}
+\newcommand{\seestrings}{\htmladdnormallink{strings}{../strings/strings.html}\xspace}
+\newcommand{\seedos}{\htmladdnormallink{DOS}{../dos/dos.html}\xspace}
+\newcommand{\seegetopts}{\htmladdnormallink{getopts}{../getopts/getopts.html}\xspace}
+\newcommand{\seeobjects}{\htmladdnormallink{objects}{../objects/objects.html}\xspace}
+\newcommand{\seegraph}{\htmladdnormallink{graph}{../graph/graph.html}\xspace}
+\newcommand{\seeprinter}{\htmladdnormallink{printer}{../printer/printer.html}\xspace}
+\newcommand{\seego}{\htmladdnormallink{GO32}{../go32/go32.html}\xspace}
+\newcommand{\seec}[1]{chapter \ref{ch:#1}\xspace}
+\newcommand{\sees}[1]{section \ref{se:#1}\xspace}
 %
 %
 % Nice environments
 % Nice environments
 %
 %
@@ -147,14 +148,14 @@
 %
 %
 \newcommand{\seet}[1]{table (\ref{tab:#1}) }
 \newcommand{\seet}[1]{table (\ref{tab:#1}) }
 % some OSes
 % some OSes
-\newcommand{\linux}{\textsc{linux}\ }
-\newcommand{\dos}  {\textsc{dos}\ }
-\newcommand{\msdos}{\textsc{ms-dos}\ }
-\newcommand{\ostwo}{\textsc{os/2}\ }
-\newcommand{\windowsnt}{\textsc{WindowsNT}\ }
-\newcommand{\windows}{\textsc{Windows}\ }
-\newcommand{\fpc}{Free Pascal\ }
-\newcommand{\gnu}{\textsc{gnu}\ }
+\newcommand{\linux}{\textsc{linux}\xspace}
+\newcommand{\dos}  {\textsc{dos}\xspace}
+\newcommand{\msdos}{\textsc{ms-dos}\xspace}
+\newcommand{\ostwo}{\textsc{os/2}\xspace}
+\newcommand{\windowsnt}{\textsc{WindowsNT}\xspace}
+\newcommand{\windows}{\textsc{Windows}\xspace}
+\newcommand{\fpc}{Free Pascal\xspace}
+\newcommand{\gnu}{\textsc{gnu}\xspace}
 %
 %
 \newcommand{\fpcversion}{0.99.8}
 \newcommand{\fpcversion}{0.99.8}
 % end of fpcman.sty
 % end of fpcman.sty