From 0c4f89370d05056faa789aa9cabcccc4e509fb9f Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sun, 19 Jul 2020 19:38:45 -0400
Subject: [2/4]  get rid of HAVE_LCD_CHARCELLS

HAVE_LCD_BITMAP is now redundant.

lcd_bitmap is always-on in features.txt so manual and lang strings
don't have to change

Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794
---
 manual/advanced_topics/main.tex | 54 +++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

(limited to 'manual/advanced_topics/main.tex')

diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 786c109772..00b1688e11 100755
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -168,32 +168,30 @@ file find the instructions on the Rockbox website:
   the \fname{/.rockbox/backdrops} directory.
 }%
 
-\nopt{lcd_charcell}{
-  \subsection{UI Viewport}
-  By default, the UI is drawn on the whole screen. This can be changed so that
-  the UI is confined to a specific area of the screen, by use of a UI
-  viewport. This is done by adding the following line to the
-  \fname{.cfg} file for a theme:\\*
-
-  \nopt{lcd_non-mono}{\config{ui viewport: X,Y,[width],[height],[font]}}
+\subsection{UI Viewport}
+By default, the UI is drawn on the whole screen. This can be changed so that
+the UI is confined to a specific area of the screen, by use of a UI
+viewport. This is done by adding the following line to the
+\fname{.cfg} file for a theme:\\*
+
+\nopt{lcd_non-mono}{\config{ui viewport: X,Y,[width],[height],[font]}}
+\nopt{lcd_color}{\opt{lcd_non-mono}{
+    \config{ui viewport: X,Y,[width],[height],[font],[fgshade],[bgshade]}}}
+\opt{lcd_color}{
+    \config{ui viewport: X,Y,[width],[height],[font],[fgcolour],[bgcolour]}}
+\\*
+
+\opt{HAVE_REMOTE_LCD}{
+  The dimensions of the menu that is displayed on the remote control of your
+  \dap\ can be set in the same way.  The line to be added to the theme
+  \fname{.cfg} is the following:\\*
+
+  \nopt{lcd_non-mono}{\config{remote ui viewport: X,Y,[width],[height],[font]}}
   \nopt{lcd_color}{\opt{lcd_non-mono}{
-      \config{ui viewport: X,Y,[width],[height],[font],[fgshade],[bgshade]}}}
+    \config{remote ui viewport: X,Y,[width],[height],[font],[fgshade],[bgshade]}}}
   \opt{lcd_color}{
-      \config{ui viewport: X,Y,[width],[height],[font],[fgcolour],[bgcolour]}}
-  \\*
-
-  \opt{HAVE_REMOTE_LCD}{
-    The dimensions of the menu that is displayed on the remote control of your
-    \dap\ can be set in the same way.  The line to be added to the theme
-    \fname{.cfg} is the following:\\*
-
-    \nopt{lcd_non-mono}{\config{remote ui viewport: X,Y,[width],[height],[font]}}
-    \nopt{lcd_color}{\opt{lcd_non-mono}{
-      \config{remote ui viewport: X,Y,[width],[height],[font],[fgshade],[bgshade]}}}
-    \opt{lcd_color}{
-      \config{remote ui viewport: X,Y,[width],[height],[font],[fgcolour],[bgcolour]}}
-  \\*
-  }
+    \config{remote ui viewport: X,Y,[width],[height],[font],[fgcolour],[bgcolour]}}
+\\*
 
   Only the first two parameters \emph{have} to be specified, the others can
   be omitted using `$-$' as a placeholder. The syntax is very similar to WPS
@@ -202,7 +200,6 @@ file find the instructions on the Rockbox website:
   \nopt{lcd_non-mono}{\input{advanced_topics/viewports/mono-uivp-syntax.tex}}
   \nopt{lcd_color}{\opt{lcd_non-mono}{\input{advanced_topics/viewports/grayscale-uivp-syntax.tex}}}
   \opt{lcd_color}{\input{advanced_topics/viewports/colour-uivp-syntax.tex}}
-}
 
 \section{\label{ref:ConfiguringtheWPS}Configuring the Theme}
 
@@ -265,7 +262,6 @@ are discussed below.
   }
 }
 
-\nopt{lcd_charcell}{
 \subsubsection{\label{ref:Viewports}Viewports}
 
 By default, a viewport filling the whole screen contains all the elements
@@ -279,7 +275,7 @@ be defined. A viewport is a rectangular window on the screen%
 \opt{lcd_non-mono}{ with its own foreground/background
 \opt{lcd_color}{colours}\nopt{lcd_color}{shades}}.
 This window also has variable dimensions. To
-define a viewport a line starting \config{{\%V(\dots}} has to be
+define a viewport a line starting \config{{\%V(\dots)}} has to be
 present in the theme file. The full syntax will be explained later in
 this section. All elements placed before the
 line defining a viewport are displayed in the default viewport. Elements
@@ -293,6 +289,7 @@ cannot be layered \emph{transparently} over one another. Subsequent viewports
 will be drawn over any other viewports already drawn onto that
 area of the screen.
 
+
 \nopt{lcd_non-mono}{\input{advanced_topics/viewports/mono-vp-syntax.tex}}
 \nopt{lcd_color}{\opt{lcd_non-mono}{\input{advanced_topics/viewports/grayscale-vp-syntax.tex}}}
 \opt{lcd_color}{\input{advanced_topics/viewports/colour-vp-syntax.tex}}
@@ -318,11 +315,10 @@ Mode can be the following:
     the end colour\\}
 \end{rbtabular}
 }
-
 \subsubsection{Conditional Viewports}
 
 Any viewport can be displayed either permanently or conditionally.
-Defining a viewport as \config{{\%V(\dots}}
+Defining a viewport as \config{{\%V(\dots)}}
 will display it permanently.
 
 \begin{itemize}
-- 
cgit v1.2.3