summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranklin Wei <franklin@rockbox.org>2020-06-28 00:08:42 -0400
committerFranklin Wei <franklin@rockbox.org>2020-06-28 00:08:42 -0400
commitca673d7e9fe2cf06fa9cabf026354a2ba0e73c6f (patch)
tree75d6b24cb7e4b2e0ca7253a763151123d9ccb88b
parent140bf66b908f6c50ea87aa90cc5f314042a25eb5 (diff)
downloadrockbox-ca673d7e9fe2cf06fa9cabf026354a2ba0e73c6f.tar.gz
rockbox-ca673d7e9fe2cf06fa9cabf026354a2ba0e73c6f.zip
Partially revert the last commit.
The \if->\If replacement is a bit premature for texlive-2019, apparently. Change-Id: Iab198c2f5e2f00ecdf7e2431e2b77c423e6afc07
-rw-r--r--manual/appendix/config_file_options.tex2
-rw-r--r--manual/frontpage/frontpage.tex2
-rw-r--r--manual/getting_started/main.tex6
-rw-r--r--manual/intro/main.tex4
-rw-r--r--manual/preamble.tex22
-rw-r--r--manual/rockbox_interface/main.tex2
6 files changed, 19 insertions, 19 deletions
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index c70fa974a8..ddd41e105d 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -4,7 +4,7 @@
4% define a local version of endhead, as using the output distinction adds 4% define a local version of endhead, as using the output distinction adds
5% an unwanted newline. endhead breaks with htlatex so we need to remove it 5% an unwanted newline. endhead breaks with htlatex so we need to remove it
6% for the html output. 6% for the html output.
7\Ifpdfoutput{\newcommand{\localendhead}{\endhead}}% 7\ifpdfoutput{\newcommand{\localendhead}{\endhead}}%
8 {\newcommand{\localendhead}{}} 8 {\newcommand{\localendhead}{}}
9 \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor} 9 \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor}
10 \begin{longtable}{>{\raggedright}p{.3\textwidth}>{\raggedright}p{.4\textwidth}p{.2\textwidth}} 10 \begin{longtable}{>{\raggedright}p{.3\textwidth}>{\raggedright}p{.4\textwidth}p{.2\textwidth}}
diff --git a/manual/frontpage/frontpage.tex b/manual/frontpage/frontpage.tex
index d343d4cf0c..1b451d5cbb 100644
--- a/manual/frontpage/frontpage.tex
+++ b/manual/frontpage/frontpage.tex
@@ -1,7 +1,7 @@
1\thispagestyle{empty} 1\thispagestyle{empty}
2\vspace*{0.3cm} 2\vspace*{0.3cm}
3\begin{center} 3\begin{center}
4\Ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}} 4\ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}}
5{\includegraphics{frontpage/rockbox-web.png}}\\ 5{\includegraphics{frontpage/rockbox-web.png}}\\
6\vspace{2cm} 6\vspace{2cm}
7\huge{\textsf{\textbf{The Rockbox Manual\\for\\\playername}}}\vspace{1cm}\\ 7\huge{\textsf{\textbf{The Rockbox Manual\\for\\\playername}}}\vspace{1cm}\\
diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index 4d1798a4c7..f5eba1fae8 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -65,7 +65,7 @@ unsupported''. Manufacturer and model names are proper nouns, and
65thus are written beginning with a capital letter. 65thus are written beginning with a capital letter.
66 66
67% write a bit more about names etc. here. 67% write a bit more about names etc. here.
68\Ifpdfoutput{ 68\ifpdfoutput{
69This manual has some parts that are marked with icons on the margin to help 69This manual has some parts that are marked with icons on the margin to help
70you finding important parts or parts you could skip. The following icons 70you finding important parts or parts you could skip. The following icons
71are used: 71are used:
@@ -91,14 +91,14 @@ are used:
91 icon shown in the margin on the right. 91 icon shown in the margin on the right.
92\\ 92\\
93} 93}
94}{}% end Ifpdfoutput 94}{}% end ifpdfoutput
95 95
96Links to the wiki are abbreviated by the name of the wiki page. Those names 96Links to the wiki are abbreviated by the name of the wiki page. Those names
97are still linked so you can simply follow them like any other link in this 97are still linked so you can simply follow them like any other link in this
98manual. If you want to access a wiki page manually go to 98manual. If you want to access a wiki page manually go to
99\wikiicon{} \href{\wikibaseurl}{\wikibaseurl} 99\wikiicon{} \href{\wikibaseurl}{\wikibaseurl}
100and type the page name in the ``Go'' box at the top of the page. 100and type the page name in the ``Go'' box at the top of the page.
101\Ifpdfoutput{Links to wiki pages are also indicated by the symbol \wikiicon{} 101\ifpdfoutput{Links to wiki pages are also indicated by the symbol \wikiicon{}
102in front of the page name.}{} 102in front of the page name.}{}
103 103
104\input{getting_started/installation.tex} 104\input{getting_started/installation.tex}
diff --git a/manual/intro/main.tex b/manual/intro/main.tex
index ef091e4550..13b15a0ed5 100644
--- a/manual/intro/main.tex
+++ b/manual/intro/main.tex
@@ -18,11 +18,11 @@
18% Contributors are listed in the file docs/CREDITS-MANUAL 18% Contributors are listed in the file docs/CREDITS-MANUAL
19% 19%
20%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 20%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
21\Ifpdfoutput{ 21\ifpdfoutput{
22\newcommand{\latexbuild}{pdf\LaTeX}} 22\newcommand{\latexbuild}{pdf\LaTeX}}
23{\newcommand{\latexbuild}{\TeX4ht}} 23{\newcommand{\latexbuild}{\TeX4ht}}
24 24
25\Ifpdfoutput{\chapter*{\centering{Rockbox\\}}}% 25\ifpdfoutput{\chapter*{\centering{Rockbox\\}}}%
26{\begin{center}{\Large{Rockbox}}\end{center}} 26{\begin{center}{\Large{Rockbox}}\end{center}}
27 27
28\vspace{1cm} 28\vspace{1cm}
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 4fc5f2be10..08d1f0dc0a 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -76,7 +76,7 @@
76\usepackage{makeidx} 76\usepackage{makeidx}
77\usepackage{fancyvrb} 77\usepackage{fancyvrb}
78\usepackage{color} 78\usepackage{color}
79\Ifpdfoutput{\usepackage{booktabs}}% 79\ifpdfoutput{\usepackage{booktabs}}%
80 {\newcommand{% 80 {\newcommand{%
81 \toprule}{}\newcommand{\midrule}{\hline}\newcommand{\bottomrule}{}% 81 \toprule}{}\newcommand{\midrule}{\hline}\newcommand{\bottomrule}{}%
82 } 82 }
@@ -90,7 +90,7 @@
90% pdf output: try pdf first, then png and jpg as file format 90% pdf output: try pdf first, then png and jpg as file format
91% html output: try png first, then jpg. Ignore pdf files 91% html output: try png first, then jpg. Ignore pdf files
92% this only applies if no file extension is given! 92% this only applies if no file extension is given!
93\Ifpdfoutput{\DeclareGraphicsExtensions{.pdf,.png,.jpg}}% 93\ifpdfoutput{\DeclareGraphicsExtensions{.pdf,.png,.jpg}}%
94 {\DeclareGraphicsExtensions{.png,.jpg}} 94 {\DeclareGraphicsExtensions{.png,.jpg}}
95 95
96% fancy header style adjustments 96% fancy header style adjustments
@@ -107,7 +107,7 @@
107\setlength{\headheight}{18.5pt} 107\setlength{\headheight}{18.5pt}
108\newcounter{example}[chapter] 108\newcounter{example}[chapter]
109 109
110\Ifpdfoutput{% 110\ifpdfoutput{%
111 \renewcommand{\toprule}{\specialrule{\heavyrulewidth}{\abovetopsep}{0pt}} 111 \renewcommand{\toprule}{\specialrule{\heavyrulewidth}{\abovetopsep}{0pt}}
112 \renewcommand{\midrule}{\specialrule{\lightrulewidth}{0pt}{\belowrulesep}} 112 \renewcommand{\midrule}{\specialrule{\lightrulewidth}{0pt}{\belowrulesep}}
113 }{} 113 }{}
@@ -198,7 +198,7 @@
198% command to display a note. 198% command to display a note.
199% Usage: \note{text of your note} 199% Usage: \note{text of your note}
200% Note: do NOT use \textbf or similar to emphasize text, use \emph! 200% Note: do NOT use \textbf or similar to emphasize text, use \emph!
201\Ifpdfoutput{ 201\ifpdfoutput{
202\newcommand{\note}[1]{ 202\newcommand{\note}[1]{
203 \ifinner\else\vspace{1ex}\par\noindent\fi 203 \ifinner\else\vspace{1ex}\par\noindent\fi
204 \textbf{Note:}\ % 204 \textbf{Note:}\ %
@@ -209,7 +209,7 @@
209% command to display a warning. 209% command to display a warning.
210% Usage: \warn{text of your warning} 210% Usage: \warn{text of your warning}
211% Note: do NOT use \textbf or similar to emphasize text! 211% Note: do NOT use \textbf or similar to emphasize text!
212\Ifpdfoutput{ 212\ifpdfoutput{
213\newcommand{\warn}[1]{ 213\newcommand{\warn}[1]{
214 \ifinner\else\par\noindent\fi 214 \ifinner\else\par\noindent\fi
215 \textbf{Warning:\ }% 215 \textbf{Warning:\ }%
@@ -219,7 +219,7 @@
219 219
220% command to mark a text block as intended especially for blind people 220% command to mark a text block as intended especially for blind people
221% Usage: \blind{text} 221% Usage: \blind{text}
222\Ifpdfoutput{ 222\ifpdfoutput{
223\newcommand{\blind}[1]{\mbox{}\marginpar{\raisebox{-1ex}{\Huge{\ForwardToEnd}}}#1} 223\newcommand{\blind}[1]{\mbox{}\marginpar{\raisebox{-1ex}{\Huge{\ForwardToEnd}}}#1}
224} 224}
225{\newcommand{\blind}[1]{\ifinner\else\par\noindent\fi#1}} 225{\newcommand{\blind}[1]{\ifinner\else\par\noindent\fi#1}}
@@ -299,7 +299,7 @@
299% When creating HTML, use the soul package. 299% When creating HTML, use the soul package.
300% This produces much nicer HTML code (textsc results in each character being 300% This produces much nicer HTML code (textsc results in each character being
301% put in a separate <span>). 301% put in a separate <span>).
302\Ifpdfoutput{\newcommand{\caps}[1]{\textsc{#1}}}{\usepackage{soul}} 302\ifpdfoutput{\newcommand{\caps}[1]{\textsc{#1}}}{\usepackage{soul}}
303\newcommand{\setting}[1]{\caps{#1}} 303\newcommand{\setting}[1]{\caps{#1}}
304 304
305\newcommand{\config}[1]{\texttt{#1}} 305\newcommand{\config}[1]{\texttt{#1}}
@@ -314,7 +314,7 @@
314% Usage: \wikilink{WebHome} 314% Usage: \wikilink{WebHome}
315% with "WebHome" being the wiki page name 315% with "WebHome" being the wiki page name
316\newcommand{\wikibaseurl}{http://www.rockbox.org/wiki/} 316\newcommand{\wikibaseurl}{http://www.rockbox.org/wiki/}
317\Ifpdfoutput{\newcommand{\wikiicon}{\Pointinghand}} 317\ifpdfoutput{\newcommand{\wikiicon}{\Pointinghand}}
318 {\newcommand{\wikiicon}{}} 318 {\newcommand{\wikiicon}{}}
319\newcommand{\wikilink}[1]{\wikiicon{}\href{\wikibaseurl#1}{#1}} 319\newcommand{\wikilink}[1]{\wikiicon{}\href{\wikibaseurl#1}{#1}}
320%\newcommand{\wikilink}[1]{\url{http://www.rockbox.org/wiki/#1}} 320%\newcommand{\wikilink}[1]{\url{http://www.rockbox.org/wiki/#1}}
@@ -355,15 +355,15 @@
355 355
356% Use the reference to handle get a flexible reference command 356% Use the reference to handle get a flexible reference command
357% usage \reference{ref_section} 357% usage \reference{ref_section}
358\Ifpdfoutput{% 358\ifpdfoutput{%
359 \newcommand{\reference}[1]{% 359 \newcommand{\reference}[1]{%
360 section~\ref{#1} (page~\pageref{#1})% 360 section~\ref{#1} (page~\pageref{#1})%
361}} 361}}
362{\newcommand{\reference}[1]{section~\ref{#1}}} 362{\newcommand{\reference}[1]{section~\ref{#1}}}
363 363
364% special HTML output adjustments 364% special HTML output adjustments
365\Ifpdfoutput{}{\setlength{\parindent}{0mm}} 365\ifpdfoutput{}{\setlength{\parindent}{0mm}}
366\Ifpdfoutput{}{\renewcommand{\Forward}[1]{$\triangleright${}#1}} 366\ifpdfoutput{}{\renewcommand{\Forward}[1]{$\triangleright${}#1}}
367 367
368\newcommand{\btnfnt}[1]{\textbf{#1}} 368\newcommand{\btnfnt}[1]{\textbf{#1}}
369%\hfuzz=2pt 369%\hfuzz=2pt
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index cbd24ea085..f11246f162 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -5,7 +5,7 @@
5 5
6% include the front image. Using \specimg makes this fairly easy, 6% include the front image. Using \specimg makes this fairly easy,
7% but requires to use the exact value of \specimg in the filename! 7% but requires to use the exact value of \specimg in the filename!
8% The extension is selected in the preamble, so no further \Ifpdfoutput 8% The extension is selected in the preamble, so no further \ifpdfoutput
9% is necessary. 9% is necessary.
10% 10%
11% The check looks for a png file -- we use png for the HTML manual, so that 11% The check looks for a png file -- we use png for the HTML manual, so that