summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Parker <rockbox@aeparker.com>2009-08-29 18:28:50 +0000
committerAlex Parker <rockbox@aeparker.com>2009-08-29 18:28:50 +0000
commit7550c9db3ba235f8671eeac254b8627d6915b513 (patch)
tree78697fab26fcade0ca999f74caae1402ddd73e28
parent1a28d403351afb29b43480018e011dfc6bd980ab (diff)
downloadrockbox-7550c9db3ba235f8671eeac254b8627d6915b513.tar.gz
rockbox-7550c9db3ba235f8671eeac254b8627d6915b513.tar.bz2
rockbox-7550c9db3ba235f8671eeac254b8627d6915b513.zip
Revert r22516 and r22522 - the former breaks html on linux and evrything on cygwin, the latter fixes html but breaks pdf on linux. Revert and find a different way to do this.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22541 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--manual/preamble.tex52
1 files changed, 18 insertions, 34 deletions
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 5177616ddd..4a4ac98ee8 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -65,20 +65,6 @@
\colorlet{tbloddrowbgcolor}{blue!10} % Background color for odd rows (headers not included)
\colorlet{tblevenrowbgcolor}{white} % Background color for even rows (headers not included)
-% We use or own rules to typeset tables since we want the headers to
-% be fully filled with colors
-\newcommand{\rbtoprule}{\specialrule{\heavyrulewidth}{\abovetopsep}{0pt}%
- \arrayrulecolor{tblhdrbgcolor}\specialrule{\belowrulesep}{0pt}{0pt}%
- \arrayrulecolor{black}}
-\newcommand{\rbmidrule}{\arrayrulecolor{tblhdrbgcolor}\specialrule{\aboverulesep}{0pt}{0pt}%
- \arrayrulecolor{black}\specialrule{\lightrulewidth}{0pt}{0pt}%
- \arrayrulecolor{tblevenrowbgcolor}\specialrule{\belowrulesep}{0pt}{0pt}%
- \arrayrulecolor{black}}
-\newcommand{\rbbottomrule}{\specialrule{\heavyrulewidth}{\aboverulesep}{0pt}%
- \arrayrulecolor{white}\specialrule{\belowbottomsep}{0pt}{0pt}%
- \arrayrulecolor{black}}
-
-
\usepackage{fancyhdr}
\usepackage{graphicx}
\usepackage{verbatim}
@@ -116,6 +102,11 @@
\setlength{\headheight}{18.5pt}
\newcounter{example}[chapter]
+\ifpdfoutput{%
+ \setlength{\belowrulesep}{0pt}
+ \setlength{\aboverulesep}{0pt}
+ }{}
+
%% \newenvironment{example}
%% {\stepcounter{example}\paragraph{Example \theexample:}}
%% {\hfill$\Box$
@@ -239,17 +230,15 @@
\rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor}
\expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname
\expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{%
- \ifpdfoutput{\rbbottomrule}{\bottomrule}
+ \bottomrule
\SavedEndTab%
\if\given{#4}\caption{#4}\fi%
\if\given{#5}\label{#5}\fi%
\endcenter%
}
\center
- \ifpdfoutput{\tabularx{#1}{#2}\rbtoprule\rowcolor{tblhdrbgcolor}
- #3\\\rbmidrule}
- {\tabularx{#1}{#2}\toprule\rowcolor{tblhdrbgcolor}
- \rule{0pt}{2.9ex}#3\\\midrule}
+ \tabularx{#1}{#2}\toprule\rowcolor{tblhdrbgcolor}
+ \rule{0pt}{2.9ex}#3\\\midrule
}{%
\endtabularx
}
@@ -258,8 +247,7 @@
% command to set the default table heading for button lists
-\ifpdfoutput{\newcommand{\taghead}{\textbf{Tag} & \textbf{Description} \\\rbmidrule}}
- {\newcommand{\taghead}{\rule{0pt}{2.9ex}\textbf{Tag} & \textbf{Description} \\\midrule}}
+\newcommand{\taghead}{\rule{0pt}{2.9ex}\textbf{Tag} & \textbf{Description} \\\midrule}
% environment intended to be used with tag maps (for wps)
% usage: \begin{tagmap}{caption}{label} Tag & Description \\ \end{tagmap}
@@ -271,15 +259,14 @@
\rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor}
\expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname
\expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{%
- \ifpdfoutput{\rbbottomrule}{\bottomrule}%
+ \bottomrule
\SavedEndTab%
\if\given{#1}\caption{#1}\fi%
\if\given{#2}\label{#2}\fi%
\endcenter%
}
\center
-\ifpdfoutput{\tabularx{\textwidth}{lX}\rbtoprule\rowcolor{tblhdrbgcolor}} % here is the table width defined
- {\tabularx{\textwidth}{lX}\toprule\rowcolor{tblhdrbgcolor}} % here is the table width defined
+\tabularx{\textwidth}{lX}\toprule\rowcolor{tblhdrbgcolor} % here is the table width defined
\taghead
}{%
\endtabularx
@@ -362,11 +349,10 @@
\usepackage{makeidx}
\makeindex
+
% command to set the default table heading for button lists
-\ifpdfoutput{\newcommand{\btnhead}{\textbf{Key} \opt{HAVEREMOTEKEYMAP}{%
- & \textbf{Remote Key}} & \textbf{Action} \\\rbmidrule}}
- {\newcommand{\btnhead}{\textbf{Key} \opt{HAVEREMOTEKEYMAP}{%
- & \textbf{Remote Key}} & \textbf{Action} \\\midrule}}
+\newcommand{\btnhead}{\textbf{Key} \opt{HAVEREMOTEKEYMAP}{%
+ & \textbf{Remote Key}} & \textbf{Action} \\\midrule}
% environment intended to be used with button maps
% usage: \begin{btnmap}{caption}{label} Button & ButtonAction \\ \end{btnmap}
% Note: this automatically sets the table lines.
@@ -383,7 +369,7 @@
\rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor}
\expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname
\expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{%
- \ifpdfoutput{\rbbottomrule}{\bottomrule}%
+ \bottomrule
\SavedEndTab%
\if\given{#1}\caption{#1}\fi%
\if\given{#2}\label{#2}\fi%
@@ -392,15 +378,13 @@
\center
\opt{HAVEREMOTEKEYMAP}{
% here is the table width defined for 3 columns
- \ifpdfoutput{\tabularx{.95\textwidth}{>{\raggedright\arraybackslash}p{.2\textwidth}>{\raggedright\arraybackslash}p{.2\textwidth}X}\rbtoprule\rowcolor{tblhdrbgcolor}}
- {\tabularx{.95\textwidth}{>{\raggedright\arraybackslash}p{.2\textwidth}>{\raggedright\arraybackslash}p{.2\textwidth}X}\toprule\rowcolor{tblhdrbgcolor}}
+ \tabularx{.95\textwidth}{>{\raggedright\arraybackslash}p{.2\textwidth}>{\raggedright\arraybackslash}p{.2\textwidth}X}\toprule\rowcolor{tblhdrbgcolor}
}
\nopt{HAVEREMOTEKEYMAP}{
% here is the table width defined for 2 columns
- \ifpdfoutput{\tabularx{.75\textwidth}{>{\raggedright\arraybackslash}p{.22\textwidth}X}\rbtoprule\rowcolor{tblhdrbgcolor}}
- {\tabularx{.75\textwidth}{>{\raggedright\arraybackslash}p{.22\textwidth}X}\toprule\rowcolor{tblhdrbgcolor}}
+ \tabularx{.75\textwidth}{>{\raggedright\arraybackslash}p{.22\textwidth}X}\toprule\rowcolor{tblhdrbgcolor}
}
- \ifpdfoutput{\btnhead}{\rule{0pt}{2.9ex}\btnhead}
+ \rule{0pt}{2.9ex}\btnhead
}{%
\endtabularx
}