diff options
-rw-r--r-- | manual/appendix/wps_tags.tex | 25 | ||||
-rw-r--r-- | manual/preamble.tex | 3 |
2 files changed, 16 insertions, 12 deletions
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex index cff6c5f4b8..eea94d3eeb 100644 --- a/manual/appendix/wps_tags.tex +++ b/manual/appendix/wps_tags.tex | |||
@@ -37,16 +37,19 @@ show the information for the next song to be played. | |||
37 | \section{Viewports} | 37 | \section{Viewports} |
38 | \begin{tagmap} | 38 | \begin{tagmap} |
39 | \nopt{lcd_non-mono}{% | 39 | \nopt{lcd_non-mono}{% |
40 | \config{\%V(x,y,[width],[height],[font])} | 40 | \config{\%V(x,y,[width],\tabnlindent[height],[font])} |
41 | & See section \ref{ref:Viewports}\\} | 41 | & See section \ref{ref:Viewports}\\} |
42 | 42 | ||
43 | \nopt{lcd_color}{\opt{lcd_non-mono}{% | 43 | \nopt{lcd_color}{\opt{lcd_non-mono}{% |
44 | \config{\%V(x,y,[width],[height],[font]) \%Vf([fgshade]) \%Vb([bgshade])} | 44 | \config{\%V(x,y,[width],\tabnlindent[height],[font])}\newline |
45 | \config{\%Vf([fgshade])}\newline | ||
46 | \config{\%Vb([bgshade])} | ||
45 | & See section \ref{ref:Viewports}\\}} | 47 | & See section \ref{ref:Viewports}\\}} |
46 | 48 | ||
47 | \opt{lcd_color}{% | 49 | \opt{lcd_color}{% |
48 | \config{\%V(x,y,[width],[height],[font])} | 50 | \config{\%V(x,y,[width],\tabnlindent[height],[font])}\newline |
49 | \config{\%Vf([fgcolour]) \%Vb([bgcolour])} | 51 | \config{\%Vf([fgcolour])}\newline |
52 | \config{\%Vb([bgcolour])} | ||
50 | & See section \ref{ref:Viewports}\\} | 53 | & See section \ref{ref:Viewports}\\} |
51 | 54 | ||
52 | \config{\%Vd('identifier')} & Display the `identifier' viewport. E.g. | 55 | \config{\%Vd('identifier')} & Display the `identifier' viewport. E.g. |
@@ -268,7 +271,7 @@ that, it will display the volume value. | |||
268 | 271 | ||
269 | \section{Settings} | 272 | \section{Settings} |
270 | \begin{tagmap} | 273 | \begin{tagmap} |
271 | \config{\%St(<setting name>)} & The value of the Rockbox | 274 | \config{\%St(<setting\tabnlindent{}name>)} & The value of the Rockbox |
272 | setting with the specified name. See \reference{ref:config_file_options} | 275 | setting with the specified name. See \reference{ref:config_file_options} |
273 | for the list of the available settings.\\ | 276 | for the list of the available settings.\\ |
274 | \end{tagmap} | 277 | \end{tagmap} |
@@ -294,7 +297,7 @@ Examples: | |||
294 | & \config{filename}: file name relative to \fname{/.rockbox/} and including ``.bmp''\\ | 297 | & \config{filename}: file name relative to \fname{/.rockbox/} and including ``.bmp''\\ |
295 | & \config{x}: x coordinate\\ | 298 | & \config{x}: x coordinate\\ |
296 | & \config{y}: y coordinate.\\ | 299 | & \config{y}: y coordinate.\\ |
297 | \config{\%xl(n,filename,x,y,[nimages])} | 300 | \config{\%xl(n,filename,x,y,\tabnlindent[nimages])} |
298 | & Preload an image for later display (useful for when your images are displayed conditionally)\\ | 301 | & Preload an image for later display (useful for when your images are displayed conditionally)\\ |
299 | & \config{n}: image ID (a-z and A-Z) for later referencing in \config{\%xd}\\ | 302 | & \config{n}: image ID (a-z and A-Z) for later referencing in \config{\%xd}\\ |
300 | & \config{filename}: file name relative to \fname{/.rockbox/} and including ``.bmp''\\ | 303 | & \config{filename}: file name relative to \fname{/.rockbox/} and including ``.bmp''\\ |
@@ -380,8 +383,8 @@ Once the album art files are present on your \dap, they can be displayed as | |||
380 | follows. | 383 | follows. |
381 | 384 | ||
382 | \begin{tagmap} | 385 | \begin{tagmap} |
383 | \config{\%Cl(x,y,[maxwidth],[maxheight],hor\_align,vert\_align)} | 386 | \config{\%Cl(x,y,[maxwidth],\tabnlindent[maxheight],\tabnlindent{}hor\_align,\tabnlindent{}vert\_align)} |
384 | & Define the settings for albumart\\ | 387 | & Define the settings for album art\\ |
385 | & \config{x}: x coordinate\\ | 388 | & \config{x}: x coordinate\\ |
386 | & \config{y}: y coordinate\\ | 389 | & \config{y}: y coordinate\\ |
387 | & \config{maxwidth}: Maximum height\\ | 390 | & \config{maxwidth}: Maximum height\\ |
@@ -456,14 +459,14 @@ order left -- centre -- right. If the aligned texts overlap, they are merged. | |||
456 | \begin{tagmap} | 459 | \begin{tagmap} |
457 | \config{\%?xx{\textless}true{\textbar}false{\textgreater}} | 460 | \config{\%?xx{\textless}true{\textbar}false{\textgreater}} |
458 | & If / Else: Evaluate for true or false case \\ | 461 | & If / Else: Evaluate for true or false case \\ |
459 | \config{\%?xx{\textless}alt1{\textbar}alt2{\textbar}alt3{\textbar}\dots{\textbar}else{\textgreater}} | 462 | \config{\%?xx{\textless}alt1{\textbar}alt2{\textbar}\tabnlindent{}alt3{\textbar}\dots{\textbar}else{\textgreater}} |
460 | & Enumerations: Evaluate for first / second / third / \dots / last condition \\ | 463 | & Enumerations: Evaluate for first / second / third / \dots / last condition \\ |
461 | \end{tagmap} | 464 | \end{tagmap} |
462 | 465 | ||
463 | \section{Subline Tags} | 466 | \section{Subline Tags} |
464 | 467 | ||
465 | \begin{tagmap} | 468 | \begin{tagmap} |
466 | \config{\%t{\textless}(time){\textgreater}} | 469 | \config{\%t(time)} |
467 | & Set the subline display cycle time (\%t(5) or \%t(3.4) formats) \\ | 470 | & Set the subline display cycle time (\%t(5) or \%t(3.4) formats) \\ |
468 | \config{;} | 471 | \config{;} |
469 | & Split items on a line into separate sublines \\ | 472 | & Split items on a line into separate sublines \\ |
@@ -529,7 +532,7 @@ Example: | |||
529 | \opt{touchscreen}{ | 532 | \opt{touchscreen}{ |
530 | \section{Touchscreen Areas (WPS only)} | 533 | \section{Touchscreen Areas (WPS only)} |
531 | \begin{tagmap} | 534 | \begin{tagmap} |
532 | \config{\%T(x,y,[width],[height],action)} | 535 | \config{\%T(x,y,[width],\tabnlindent[height],action)} |
533 | & Invoke the action specified when the user presses in the defined | 536 | & Invoke the action specified when the user presses in the defined |
534 | touchscreen area.\\ | 537 | touchscreen area.\\ |
535 | \end{tagmap} | 538 | \end{tagmap} |
diff --git a/manual/preamble.tex b/manual/preamble.tex index ef31dde850..90aa303528 100644 --- a/manual/preamble.tex +++ b/manual/preamble.tex | |||
@@ -246,6 +246,7 @@ | |||
246 | \endtabularx | 246 | \endtabularx |
247 | } | 247 | } |
248 | 248 | ||
249 | \newcommand{\tabnlindent}{\newline\mbox{ }\mbox{ }} | ||
249 | 250 | ||
250 | 251 | ||
251 | 252 | ||
@@ -266,7 +267,7 @@ | |||
266 | \endcenter% | 267 | \endcenter% |
267 | } | 268 | } |
268 | \center | 269 | \center |
269 | \tabularx{\textwidth}{>{\raggedright\arraybackslash}p{.42\textwidth}X}\toprule\rowcolor{tblhdrbgcolor} % here is the table width defined | 270 | \tabularx{\textwidth}{Xp{.7\textwidth}}\toprule\rowcolor{tblhdrbgcolor} % here is the table width defined |
270 | \taghead | 271 | \taghead |
271 | }{% | 272 | }{% |
272 | \endtabularx | 273 | \endtabularx |