Include the credits file. This adds a build dependency to iconv for now, but we should consider converting the manual to utf8 completely. Also sorted the screen sizes table.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10058 a1c6a512-1295-4272-9138-f99709370657
diff --git a/manual/Makefile b/manual/Makefile
index cc30a74..95dfbb6 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -6,6 +6,7 @@
@if [ "$(OBJDIR)" = "" ]; then echo Run make in you build diriectory!; false; fi
@mkdir -p $(OBJDIR)
@cp -R * $(OBJDIR)
+ @perl credits.pl < ../docs/CREDITS | iconv -f utf-8 -t iso-8859-1 > $(OBJDIR)/CREDITS.tex
@echo "\newcommand{\platform}{${ARCHOS}}" > $(OBJDIR)/rockbox-build.tex
@echo "\newcommand{\buildversion}{$(VERSION)}" >> $(OBJDIR)/rockbox-build.tex
@echo "\input{rockbox.tex}" >> $(OBJDIR)/rockbox-build.tex
diff --git a/manual/appendix/appendix.tex b/manual/appendix/appendix.tex
index 349ba36..dff43e2 100644
--- a/manual/appendix/appendix.tex
+++ b/manual/appendix/appendix.tex
@@ -47,17 +47,17 @@
\begin{center}
\begin{tabularx}{.8\textwidth}{lXX}\toprule
\textbf{Player} & \textbf{Main LCD Size} & \textbf{Remote LCD Size}\\\midrule
- Iriver H1x0 & 160x128 & 128x64\\
- Iriver H3x0 & 220x176 & 128x64\\
Archos Players & 11x2 characters & (none)\\
Archos Recorders & 112x64 & (none)\\
Archos Ondio & 112x64 & (none)\\
- Ipod Nano & 176x132 & (none)\\
+ Iaudio X5 & 160x128 & 128x96\\
Ipod 4G Gray & 160x128 & (none)\\
Ipod 4G Color & 220x176 & (none)\\
Ipod 5G Video & 320x240 & (none)\\
- Iaudio X5 & 160x128 & 128x96\\
- Ipod Mini &138x110 & (none) \\\bottomrule
+ Ipod Mini &138x110 & (none) \\
+ Ipod Nano & 176x132 & (none)\\
+ Iriver H1x0 & 160x128 & 128x64\\
+ Iriver H3x0 & 220x176 & 128x64\\\bottomrule
\end{tabularx}
\end{center}
@@ -170,10 +170,11 @@
Changes in version 2.5
\chapter{Credits}
-People that have contributed to the project, one way or another.Friends!
-\begin{verbatim}
-/* Include the CREDITS file */
-\end{verbatim}
+People that have contributed to the project, one way or another. Friends!
+%
+\begin{multicols}{2}
+\noindent\textsc{\small{\input{CREDITS.tex}}}
+\end{multicols}
\chapter{GNU Free Documentation Licence}
\input{appendix/fdl.tex}
diff --git a/manual/credits.pl b/manual/credits.pl
new file mode 100644
index 0000000..46035f5
--- /dev/null
+++ b/manual/credits.pl
@@ -0,0 +1,14 @@
+# __________ __ ___.
+# Open \______ \ ____ ____ | | _\_ |__ _______ ___
+# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+# \/ \/ \/ \/ \/
+# $Id$
+#
+while (<STDIN>) {
+ if(($_ =~ /^([A-Z]+[\S ]+)/) && ($_ !~ /^People/)) {
+ print "\\Forward{} $1\n";
+ }
+}
+
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 100fac1..6cf5bef 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -1,10 +1,10 @@
\documentclass[a4paper,11pt]{scrreprt}
\usepackage[latin1]{inputenc}
\usepackage{palatino}
-%\renewcommand{\familydefault}{\sfdefault}
\usepackage{tabularx}
\usepackage{multirow}
+\usepackage{multicol}
\usepackage{float}
\floatstyle{ruled}