diff options
author | Alex Parker <rockbox@aeparker.com> | 2009-08-29 18:28:50 +0000 |
---|---|---|
committer | Alex Parker <rockbox@aeparker.com> | 2009-08-29 18:28:50 +0000 |
commit | 7550c9db3ba235f8671eeac254b8627d6915b513 (patch) | |
tree | 78697fab26fcade0ca999f74caae1402ddd73e28 /manual | |
parent | 1a28d403351afb29b43480018e011dfc6bd980ab (diff) | |
download | rockbox-7550c9db3ba235f8671eeac254b8627d6915b513.tar.gz 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
Diffstat (limited to 'manual')
-rw-r--r-- | manual/preamble.tex | 52 |
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 @@ | |||
65 | \colorlet{tbloddrowbgcolor}{blue!10} % Background color for odd rows (headers not included) | 65 | \colorlet{tbloddrowbgcolor}{blue!10} % Background color for odd rows (headers not included) |
66 | \colorlet{tblevenrowbgcolor}{white} % Background color for even rows (headers not included) | 66 | \colorlet{tblevenrowbgcolor}{white} % Background color for even rows (headers not included) |
67 | 67 | ||
68 | % We use or own rules to typeset tables since we want the headers to | ||
69 | % be fully filled with colors | ||
70 | \newcommand{\rbtoprule}{\specialrule{\heavyrulewidth}{\abovetopsep}{0pt}% | ||
71 | \arrayrulecolor{tblhdrbgcolor}\specialrule{\belowrulesep}{0pt}{0pt}% | ||
72 | \arrayrulecolor{black}} | ||
73 | \newcommand{\rbmidrule}{\arrayrulecolor{tblhdrbgcolor}\specialrule{\aboverulesep}{0pt}{0pt}% | ||
74 | \arrayrulecolor{black}\specialrule{\lightrulewidth}{0pt}{0pt}% | ||
75 | \arrayrulecolor{tblevenrowbgcolor}\specialrule{\belowrulesep}{0pt}{0pt}% | ||
76 | \arrayrulecolor{black}} | ||
77 | \newcommand{\rbbottomrule}{\specialrule{\heavyrulewidth}{\aboverulesep}{0pt}% | ||
78 | \arrayrulecolor{white}\specialrule{\belowbottomsep}{0pt}{0pt}% | ||
79 | \arrayrulecolor{black}} | ||
80 | |||
81 | |||
82 | \usepackage{fancyhdr} | 68 | \usepackage{fancyhdr} |
83 | \usepackage{graphicx} | 69 | \usepackage{graphicx} |
84 | \usepackage{verbatim} | 70 | \usepackage{verbatim} |
@@ -116,6 +102,11 @@ | |||
116 | \setlength{\headheight}{18.5pt} | 102 | \setlength{\headheight}{18.5pt} |
117 | \newcounter{example}[chapter] | 103 | \newcounter{example}[chapter] |
118 | 104 | ||
105 | \ifpdfoutput{% | ||
106 | \setlength{\belowrulesep}{0pt} | ||
107 | \setlength{\aboverulesep}{0pt} | ||
108 | }{} | ||
109 | |||
119 | %% \newenvironment{example} | 110 | %% \newenvironment{example} |
120 | %% {\stepcounter{example}\paragraph{Example \theexample:}} | 111 | %% {\stepcounter{example}\paragraph{Example \theexample:}} |
121 | %% {\hfill$\Box$ | 112 | %% {\hfill$\Box$ |
@@ -239,17 +230,15 @@ | |||
239 | \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor} | 230 | \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor} |
240 | \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname | 231 | \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname |
241 | \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{% | 232 | \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{% |
242 | \ifpdfoutput{\rbbottomrule}{\bottomrule} | 233 | \bottomrule |
243 | \SavedEndTab% | 234 | \SavedEndTab% |
244 | \if\given{#4}\caption{#4}\fi% | 235 | \if\given{#4}\caption{#4}\fi% |
245 | \if\given{#5}\label{#5}\fi% | 236 | \if\given{#5}\label{#5}\fi% |
246 | \endcenter% | 237 | \endcenter% |
247 | } | 238 | } |
248 | \center | 239 | \center |
249 | \ifpdfoutput{\tabularx{#1}{#2}\rbtoprule\rowcolor{tblhdrbgcolor} | 240 | \tabularx{#1}{#2}\toprule\rowcolor{tblhdrbgcolor} |
250 | #3\\\rbmidrule} | 241 | \rule{0pt}{2.9ex}#3\\\midrule |
251 | {\tabularx{#1}{#2}\toprule\rowcolor{tblhdrbgcolor} | ||
252 | \rule{0pt}{2.9ex}#3\\\midrule} | ||
253 | }{% | 242 | }{% |
254 | \endtabularx | 243 | \endtabularx |
255 | } | 244 | } |
@@ -258,8 +247,7 @@ | |||
258 | 247 | ||
259 | 248 | ||
260 | % command to set the default table heading for button lists | 249 | % command to set the default table heading for button lists |
261 | \ifpdfoutput{\newcommand{\taghead}{\textbf{Tag} & \textbf{Description} \\\rbmidrule}} | 250 | \newcommand{\taghead}{\rule{0pt}{2.9ex}\textbf{Tag} & \textbf{Description} \\\midrule} |
262 | {\newcommand{\taghead}{\rule{0pt}{2.9ex}\textbf{Tag} & \textbf{Description} \\\midrule}} | ||
263 | 251 | ||
264 | % environment intended to be used with tag maps (for wps) | 252 | % environment intended to be used with tag maps (for wps) |
265 | % usage: \begin{tagmap}{caption}{label} Tag & Description \\ \end{tagmap} | 253 | % usage: \begin{tagmap}{caption}{label} Tag & Description \\ \end{tagmap} |
@@ -271,15 +259,14 @@ | |||
271 | \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor} | 259 | \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor} |
272 | \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname | 260 | \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname |
273 | \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{% | 261 | \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{% |
274 | \ifpdfoutput{\rbbottomrule}{\bottomrule}% | 262 | \bottomrule |
275 | \SavedEndTab% | 263 | \SavedEndTab% |
276 | \if\given{#1}\caption{#1}\fi% | 264 | \if\given{#1}\caption{#1}\fi% |
277 | \if\given{#2}\label{#2}\fi% | 265 | \if\given{#2}\label{#2}\fi% |
278 | \endcenter% | 266 | \endcenter% |
279 | } | 267 | } |
280 | \center | 268 | \center |
281 | \ifpdfoutput{\tabularx{\textwidth}{lX}\rbtoprule\rowcolor{tblhdrbgcolor}} % here is the table width defined | 269 | \tabularx{\textwidth}{lX}\toprule\rowcolor{tblhdrbgcolor} % here is the table width defined |
282 | {\tabularx{\textwidth}{lX}\toprule\rowcolor{tblhdrbgcolor}} % here is the table width defined | ||
283 | \taghead | 270 | \taghead |
284 | }{% | 271 | }{% |
285 | \endtabularx | 272 | \endtabularx |
@@ -362,11 +349,10 @@ | |||
362 | \usepackage{makeidx} | 349 | \usepackage{makeidx} |
363 | \makeindex | 350 | \makeindex |
364 | 351 | ||
352 | |||
365 | % command to set the default table heading for button lists | 353 | % command to set the default table heading for button lists |
366 | \ifpdfoutput{\newcommand{\btnhead}{\textbf{Key} \opt{HAVEREMOTEKEYMAP}{% | 354 | \newcommand{\btnhead}{\textbf{Key} \opt{HAVEREMOTEKEYMAP}{% |
367 | & \textbf{Remote Key}} & \textbf{Action} \\\rbmidrule}} | 355 | & \textbf{Remote Key}} & \textbf{Action} \\\midrule} |
368 | {\newcommand{\btnhead}{\textbf{Key} \opt{HAVEREMOTEKEYMAP}{% | ||
369 | & \textbf{Remote Key}} & \textbf{Action} \\\midrule}} | ||
370 | % environment intended to be used with button maps | 356 | % environment intended to be used with button maps |
371 | % usage: \begin{btnmap}{caption}{label} Button & ButtonAction \\ \end{btnmap} | 357 | % usage: \begin{btnmap}{caption}{label} Button & ButtonAction \\ \end{btnmap} |
372 | % Note: this automatically sets the table lines. | 358 | % Note: this automatically sets the table lines. |
@@ -383,7 +369,7 @@ | |||
383 | \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor} | 369 | \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor} |
384 | \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname | 370 | \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname |
385 | \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{% | 371 | \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{% |
386 | \ifpdfoutput{\rbbottomrule}{\bottomrule}% | 372 | \bottomrule |
387 | \SavedEndTab% | 373 | \SavedEndTab% |
388 | \if\given{#1}\caption{#1}\fi% | 374 | \if\given{#1}\caption{#1}\fi% |
389 | \if\given{#2}\label{#2}\fi% | 375 | \if\given{#2}\label{#2}\fi% |
@@ -392,15 +378,13 @@ | |||
392 | \center | 378 | \center |
393 | \opt{HAVEREMOTEKEYMAP}{ | 379 | \opt{HAVEREMOTEKEYMAP}{ |
394 | % here is the table width defined for 3 columns | 380 | % here is the table width defined for 3 columns |
395 | \ifpdfoutput{\tabularx{.95\textwidth}{>{\raggedright\arraybackslash}p{.2\textwidth}>{\raggedright\arraybackslash}p{.2\textwidth}X}\rbtoprule\rowcolor{tblhdrbgcolor}} | 381 | \tabularx{.95\textwidth}{>{\raggedright\arraybackslash}p{.2\textwidth}>{\raggedright\arraybackslash}p{.2\textwidth}X}\toprule\rowcolor{tblhdrbgcolor} |
396 | {\tabularx{.95\textwidth}{>{\raggedright\arraybackslash}p{.2\textwidth}>{\raggedright\arraybackslash}p{.2\textwidth}X}\toprule\rowcolor{tblhdrbgcolor}} | ||
397 | } | 382 | } |
398 | \nopt{HAVEREMOTEKEYMAP}{ | 383 | \nopt{HAVEREMOTEKEYMAP}{ |
399 | % here is the table width defined for 2 columns | 384 | % here is the table width defined for 2 columns |
400 | \ifpdfoutput{\tabularx{.75\textwidth}{>{\raggedright\arraybackslash}p{.22\textwidth}X}\rbtoprule\rowcolor{tblhdrbgcolor}} | 385 | \tabularx{.75\textwidth}{>{\raggedright\arraybackslash}p{.22\textwidth}X}\toprule\rowcolor{tblhdrbgcolor} |
401 | {\tabularx{.75\textwidth}{>{\raggedright\arraybackslash}p{.22\textwidth}X}\toprule\rowcolor{tblhdrbgcolor}} | ||
402 | } | 386 | } |
403 | \ifpdfoutput{\btnhead}{\rule{0pt}{2.9ex}\btnhead} | 387 | \rule{0pt}{2.9ex}\btnhead |
404 | }{% | 388 | }{% |
405 | \endtabularx | 389 | \endtabularx |
406 | } | 390 | } |