From 1b0c77fd28ab1b1238b372e7be88209777dc3e3e Mon Sep 17 00:00:00 2001
From: Alex Parker <rockbox@aeparker.com>
Date: Sun, 20 Jun 2010 12:58:09 +0000
Subject: Add multifont to the manual.  Closes FS#11294.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26987 a1c6a512-1295-4272-9138-f99709370657
---
 manual/advanced_topics/main.tex                    | 23 +++++++++++++++++++---
 .../advanced_topics/viewports/colour-vp-syntax.tex |  3 ++-
 .../viewports/grayscale-vp-syntax.tex              |  3 ++-
 .../advanced_topics/viewports/mono-vp-syntax.tex   |  3 ++-
 manual/appendix/wps_tags.tex                       |  7 +++++++
 5 files changed, 33 insertions(+), 6 deletions(-)

(limited to 'manual')

diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index f96eb2d0c1..8580fc54b8 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -193,9 +193,9 @@ file find the instructions on the Rockbox website:
 \subsection{\label{ref:CreateYourOwnWPS}Themes -- Create Your Own}
 The theme files are simple text files, and can be created (or edited) in your
 favourite text editor. To make sure non-English characters 
-display correctly in your WPS you must save the .wps file with UTF-8 character 
-encoding. This can be done in most editors, for example Notepad in Windows 2000
-or XP (but not in 9x/ME) can do this.
+display correctly in your theme you must save the theme files with UTF-8
+character encoding. This can be done in most editors, for example Notepad in
+Windows 2000 or XP (but not in 9x/ME) can do this.
 
 \begin{description}
 \item [Files Locations: ] Each different ``themeable'' aspect requires its own file --
@@ -303,6 +303,23 @@ file, and to conditionally select different UI viewports.
     \item {\config{\%VI'label'}} Set the Info Viewport to use the viewport called
     label, as declared with the previous tag.
   \end{itemize}
+
+\subsection{\label{ref:multifont}Additional Fonts}
+Additional fonts can be loaded within each screen file to be used in that
+screen. In this way not only can you have different fonts between e.g. the menu
+and the WPS, but you can use multiple fonts in each of the individual screens.\\
+
+\config{\%F{\textbar}id{\textbar}filename{\textbar}}
+
+  \begin{itemize}
+    \item `id' is the number you want to use in viewport declerations, 0 and 1
+       are reserved and so can't be used.
+    \item `filename' is the font filename to load. Fonts should be stored in
+       \fname{/.rockbox/fonts/}
+  \end{itemize}
+
+  An example would be: \config{\%F{\textbar}2{\textbar}12-Nimbus.fnt{\textbar}}
+
 }
 
 \subsubsection{Conditional Tags}
diff --git a/manual/advanced_topics/viewports/colour-vp-syntax.tex b/manual/advanced_topics/viewports/colour-vp-syntax.tex
index bdcc5a11a6..10b879241b 100644
--- a/manual/advanced_topics/viewports/colour-vp-syntax.tex
+++ b/manual/advanced_topics/viewports/colour-vp-syntax.tex
@@ -5,7 +5,8 @@
     \begin{itemize}
       \item `fgcolour' and `bgcolour' are 6-digit RGB888 colours, e.g. FF00FF.
       \item `font' is a number: 0 is the built-in system font, 1 is the
-      user-selected font.
+      current menu font, and 2-9 are additional are skin loaded fonts (see 
+      \reference{ref:multifont}).
       \item Only the coordinates \emph{have} to be specified. Leaving the other
       definitions blank will set them to their default values.
     \end{itemize}
diff --git a/manual/advanced_topics/viewports/grayscale-vp-syntax.tex b/manual/advanced_topics/viewports/grayscale-vp-syntax.tex
index fdcdabb50e..a8460703a9 100644
--- a/manual/advanced_topics/viewports/grayscale-vp-syntax.tex
+++ b/manual/advanced_topics/viewports/grayscale-vp-syntax.tex
@@ -6,7 +6,8 @@
       \item `fgshade' and `bgshade' are numbers in the range 0 (= black) to 3
       (= white).
       \item `font' is a number: 0 is the built-in system font, 1 is the
-      user-selected font.
+      current menu font, and 2-9 are additional are skin loaded fonts (see 
+      \reference{ref:multifont}).
       \item Only the coordinates \emph{have} to be specified. Leaving the other
       definitions blank will set them to their default values.
     \end{itemize}
diff --git a/manual/advanced_topics/viewports/mono-vp-syntax.tex b/manual/advanced_topics/viewports/mono-vp-syntax.tex
index c1ff04622e..8c84607499 100644
--- a/manual/advanced_topics/viewports/mono-vp-syntax.tex
+++ b/manual/advanced_topics/viewports/mono-vp-syntax.tex
@@ -4,7 +4,8 @@
 
     \begin{itemize}
       \item `font' is a number: 0 is the built-in system font, 1 is the
-      user-selected font.
+      current menu font, and 2-9 are additional are skin loaded fonts (see 
+      \reference{ref:multifont}).
       \item Only the coordinates \emph{have} to be specified. Leaving the other
       definitions blank will set them to their default values.
     \end{itemize}
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 5459f7da3c..0707d14b5c 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -62,6 +62,13 @@ show the information for the next song to be played.
       \config{\%VI'label'} & Set the Info Viewport to use the viewport called
       label, as declared with the previous tag.\\
     \end{tagmap}
+
+  \section{Additional Fonts}
+    \begin{tagmap}
+      \config{\%F{\textbar}id{\textbar}filename{\textbar}} &
+      See section \ref{ref:multifont}.\\
+    \end{tagmap}
+
 }
 
 \section{Power Related Information}
-- 
cgit