From f78a0e52306951f8e4031bf6db9fbfba83982fcf Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Wed, 8 Dec 2021 14:01:39 +0100 Subject: [PATCH] Manual (HTML): fix image aspect ratio and size Change-Id: If7c680badcb1a493e2a2059d84ea5b154382bad2 --- manual/appendix/file_formats.tex | 39 ++++++++++--------- manual/configure_rockbox/playback_options.tex | 3 +- manual/configure_rockbox/sound_settings.tex | 3 +- manual/preamble.tex | 10 +++-- manual/rockbox_interface/main.tex | 8 ++-- 5 files changed, 35 insertions(+), 28 deletions(-) diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex index 0e77676305..f7335e20d4 100644 --- a/manual/appendix/file_formats.tex +++ b/manual/appendix/file_formats.tex @@ -1,12 +1,13 @@ % $Id$ % +\newcommand{\includeicon}{\Ifpdfoutput{\includegraphics[width=0.37cm]}{\includegraphics}} \chapter{File formats} \section{\label{ref:Supportedfileformats}Supported file formats} \begin{rbtabular}{\textwidth}{cl>{\raggedright}p{7em}X}% {\textbf{Icon} & \textbf{File Type} & \textbf{Extension} & \textbf{Action when selected}}{}{} -\includegraphics[width=0.37cm]{appendix/images/icon-directory.png} +\includeicon{appendix/images/icon-directory.png} & Directory & \emph{none} & Enter the directory \tabularnewline - \includegraphics[width=0.37cm]{appendix/images/icon-audio-file.png} + \includeicon{appendix/images/icon-audio-file.png} & Audio file & \emph{various}\newline% (see \ref{ref:Supportedaudioformats})% % do NOT use \reference{} here as that will break the table. @@ -14,62 +15,62 @@ & Bookmark & \fname{.bmark} & Display all bookmarks for an audio file\tabularnewline & Game of Life & \fname{.cells} & Show the configuration with the ``Rocklife'' plugin\tabularnewline -\includegraphics[width=0.37cm]{appendix/images/icon-config.png} +\includeicon{appendix/images/icon-config.png} & Configuration File & \fname{.cfg} & Load the settings file\tabularnewline -\includegraphics[width=0.37cm]{appendix/images/icon-chip8.png} +\includeicon{appendix/images/icon-chip8.png} & Chip8 game & \fname{.ch8} & Play the Chip8 game \tabularnewline \opt{lcd_color}{ & Colours & \fname{.colours} & Open the colours file for editing. See \reference{ref:ChangingFiletypeColours}.\tabularnewline } -\includegraphics[width=0.37cm]{appendix/images/icon-cuesheet.png} +\includeicon{appendix/images/icon-cuesheet.png} & Cuesheet & \fname{.cue} & View the cuesheet file \tabularnewline \opt{radio}{ & FM Presets & \fname{.fmr} & Load the FM Presets (previous are discarded)\tabularnewline } -\includegraphics[width=0.37cm]{appendix/images/icon-font.png} +\includeicon{appendix/images/icon-font.png} & Font & \fname{.fnt} & Change the user interface font to this one\tabularnewline \opt{gigabeat}{ - \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} + \includeicon{appendix/images/icon-rolo.png} & Rockbox firmware & \fname{.gigabeat} & Load the new firmware with ROLO \tabularnewline } \opt{iaudio}{ - \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} + \includeicon{appendix/images/icon-rolo.png} & Rockbox firmware & \fname{.iaudio} & Load the new firmware with ROLO \tabularnewline } \opt{ipod}{ - \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} + \includeicon{appendix/images/icon-rolo.png} & Rockbox firmware & \fname{.ipod} & Load the new firmware with ROLO \tabularnewline } \opt{iriverh100,iriverh300}{ - \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} + \includeicon{appendix/images/icon-rolo.png} & Rockbox firmware & \fname{.iriver} & Load the new firmware with ROLO \tabularnewline } -\includegraphics[width=0.37cm]{appendix/images/icon-image-file.png} +\includeicon{appendix/images/icon-image-file.png} & Image & \fname{.jpg} & View the JPEG image \tabularnewline & Link & \fname{.link} & Display list of target files and directories; selecting one jumps to the target. See \reference{ref:Shortcutsplugin}.\tabularnewline -\includegraphics[width=0.37cm]{appendix/images/icon-lang.png} +\includeicon{appendix/images/icon-lang.png} & Language File & \fname{.lng} & Load the language file \tabularnewline -\includegraphics[width=0.37cm]{appendix/images/icon-playlist.png} +\includeicon{appendix/images/icon-playlist.png} & Playlist & \fname{.m3u}, \fname{.m3u8} & Load the playlist and start playing the first file \tabularnewline \opt{iriverh10,iriverh10_5gb,sansa,mrobe100,vibe500,samsungyh}{ - \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} + \includeicon{appendix/images/icon-rolo.png} & Rockbox firmware & \fname{.mi4} & Load the new firmware with ROLO \tabularnewline } - \includegraphics[width=0.37cm]{appendix/images/icon-movie-file.png} + \includeicon{appendix/images/icon-movie-file.png} & Video & \fname{.mpg}, \fname{.mpeg}, \fname{.mpv}, \fname{.m2v} & Play the MPEG1/2 video \tabularnewline -\includegraphics[width=0.37cm]{appendix/images/icon-rock.png} +\includeicon{appendix/images/icon-rock.png} & Plugin & \fname{.rock} & Start the plugin\tabularnewline \opt{sansaAMS}{ - \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} + \includeicon{appendix/images/icon-rolo.png} & Rockbox firmware & \fname{.sansa} & Load the new firmware with ROLO \tabularnewline } -\includegraphics[width=0.37cm]{appendix/images/icon-text.png} +\includeicon{appendix/images/icon-text.png} & Text File & \fname{.txt} & Display the text file using the text viewer plugin\tabularnewline & Voice file & \fname{.voice} & Allow Rockbox to speak menus\tabularnewline -\includegraphics[width=0.37cm]{appendix/images/icon-wps.png} +\includeicon{appendix/images/icon-wps.png} & While Playing Screen & \fname{.wps} & Load the new WPS display configuration\tabularnewline \end{rbtabular} diff --git a/manual/configure_rockbox/playback_options.tex b/manual/configure_rockbox/playback_options.tex index aa2cfff1d5..f9f50593e6 100644 --- a/manual/configure_rockbox/playback_options.tex +++ b/manual/configure_rockbox/playback_options.tex @@ -146,7 +146,8 @@ you to configure settings related to audio playback. The graphic below illustrates how the different settings work in practice. - \includegraphics[width=14cm]{configure_rockbox/images/crossfade_graphic.png} + \Ifpdfoutput{\includegraphics[width=14cm]{configure_rockbox/images/crossfade_graphic.png}} + {\includegraphics{configure_rockbox/images/crossfade_graphic.png}} }%\opt{crossfade} \section{\label{ref:ReplayGain}Replaygain} diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex index 73885c27aa..d91ffec989 100644 --- a/manual/configure_rockbox/sound_settings.tex +++ b/manual/configure_rockbox/sound_settings.tex @@ -263,7 +263,8 @@ change to customise your listening experience. The graphic below illustrates how the width of 10kHz band can be adjusted to cover a wider (lower Q) or narrower (higher Q) range of frequencies. - \includegraphics[width=14cm]{configure_rockbox/images/Q_factor.png} + \Ifpdfoutput{\includegraphics[width=14cm]{configure_rockbox/images/Q_factor.png}} + {\includegraphics{configure_rockbox/images/Q_factor.png}} \nopt{gigabeats}{In some ways the EQ is similar to the \setting{Bass} and \setting{Treble} settings described earlier, but the EQ diff --git a/manual/preamble.tex b/manual/preamble.tex index 2d49623a57..187f7c1f3a 100644 --- a/manual/preamble.tex +++ b/manual/preamble.tex @@ -178,19 +178,21 @@ \newcommand{\seriesimg}{\specimg} \fi +\newcommand{\includescreenshot}{\Ifpdfoutput{\includegraphics[width=\screenshotsize]}{\includegraphics}} + \newcommand{\screenshot}[3]{ \begin{figure}[H] \begin{center} \IfFileExists{#1-\genericimg-\specimg.png} - {\includegraphics[width=\screenshotsize]{#1-\genericimg-\specimg.png} + {\includescreenshot{#1-\genericimg-\specimg.png} \typeout{Note: device specific image used}} {\IfFileExists{#1-\genericimg-\seriesimg.png} - {\includegraphics[width=\screenshotsize]{#1-\genericimg-\seriesimg.png} + {\includescreenshot{#1-\genericimg-\seriesimg.png} \typeout{Note: series specific image used}} {\IfFileExists{#1-\genericimg.png} - {\includegraphics[width=\screenshotsize]{#1-\genericimg.png}} + {\includescreenshot{#1-\genericimg.png}} {\IfFileExists{#1} - {\includegraphics[width=\screenshotsize]{#1} + {\includescreenshot{#1} \typeout{Warning: deprecated plain image name used}}% {\typeout{Missing image: #1 (\genericimg) (\specimg)}% \color{red}{\textbf{WARNING!} Image not found}% diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex index 45da828143..ccc6e25ae6 100644 --- a/manual/rockbox_interface/main.tex +++ b/manual/rockbox_interface/main.tex @@ -15,8 +15,9 @@ % specify the extension. \begin{center} \IfFileExists{rockbox_interface/images/\specimg-front.png} - {\includegraphics[height=8cm,width=10cm,keepaspectratio=true]% - {rockbox_interface/images/\specimg-front} + {\Ifpdfoutput{\includegraphics[height=8cm,width=10cm,keepaspectratio=true]% + {rockbox_interface/images/\specimg-front}} + {\includegraphics{rockbox_interface/images/\specimg-front}} } {\color{red}{\textbf{WARNING!} Image not found}% \typeout{Warning: missing front image} @@ -26,7 +27,8 @@ % spacing between the two pictures, could possibly be improved \begin{center} \IfFileExists{rockbox_interface/images/\specimg-remote.png} - {\includegraphics[height=5.6cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-remote} + {\Ifpdfoutput{\includegraphics[height=5.6cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-remote}} + {\includegraphics{rockbox_interface/images/\specimg-remote}} } {\color{red}{\textbf{WARNING!} Image not found}% \typeout{Warning: missing remote image}