beamer2thesis (28oct11)

git-svn-id: svn://tug.org/texlive/trunk@24429 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 72 insertions, 39 deletions

diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.pdf b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.pdf
index 3a555cd21b8..561e206e235 100644
--- a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.pdf
+++ b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.pdf
diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.tex b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.tex
index 4fcd2df95df..191b73a64e4 100644
--- a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.tex
+++ b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis.tex
@@ -4,7 +4,7 @@
 
 \author{Claudio Fiandrino}
 \rel{Mario Rossi}
-\title{Beamer2Thesis 2.0, thesis theme for Beamer}
+\title{Beamer2Thesis 2.1, thesis theme for Beamer}
 \ateneo{Politecnico di Torino}
 \date{\today}
 
@@ -16,6 +16,7 @@
 \item The configuration of the standard theme is:
 \begin{itemize}
 \item \verb!language=english!
+\item \verb!coding=utf8x!
 \item \verb!titlepagelogo=name-of-the-logo!
 \item \verb!bullet=circle!
 \item \verb!pageofpages=of!
diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.pdf b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.pdf
index 7d30d0df12d..2b913b9479b 100644
--- a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.pdf
+++ b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.pdf
diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.tex b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.tex
index 17fc6960ad1..5faae9cb591 100644
--- a/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.tex
+++ b/Master/texmf-dist/doc/latex/beamer2thesis/beamer2thesis_ita.tex
@@ -2,12 +2,13 @@
 \usetheme[titlepagelogo=logopolito,% Logo for the first page
 		  language=italian,
 		  bullet=triangle,
-		  color=green
+		  color=green,
+		  coding=utf8x
          ]{TorinoTh}
 
 \author{Claudio Fiandrino}
 \rel{Mario Rossi}
-\title{Beamer2Thesis 2.0, thesis theme for Beamer}
+\title{Beamer2Thesis 2.1, thesis theme for Beamer}
 \ateneo{Politecnico di Torino}
 \date{\today}
 
@@ -19,6 +20,7 @@
 \item La configurazione di questo tema è:
 \begin{itemize}
 \item \verb!language=italian!
+\item \verb!coding=utf8x!
 \item \verb!titlepagelogo=name-of-the-logo!
 \item \verb!bullet=triangle!
 \item \verb!color=green!
diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/content_end.tex b/Master/texmf-dist/doc/latex/beamer2thesis/content_end.tex
index a89ec4ec051..1f89ba26f0f 100644
--- a/Master/texmf-dist/doc/latex/beamer2thesis/content_end.tex
+++ b/Master/texmf-dist/doc/latex/beamer2thesis/content_end.tex
@@ -72,7 +72,11 @@ Here are shortly reported the main features of the releases:
 \end{itemize}
 \item release 2.0:
 \begin{itemize}
-\item third logo, assistant supervisor, new ways to highlight, new command for the titlepage, new enviroments \emph{adv} and \emph{disadv}, \XeTeX\, and \XeLaTeX\, support, block.
+\item third logo, assistant supervisor, new ways to highlight, new command for the titlepage, new enviroments \emph{adv} and \emph{disadv}, \XeTeX\, and \XeLaTeX\, support, block;
+\end{itemize}
+\item release 2.1:
+\begin{itemize}
+\item coding option.
 \end{itemize}
 \end{itemize}
 \end{tframe}
@@ -89,6 +93,6 @@ I would like to thank people that, with precious hints, help me:
 \item Nicola Tuveri
 \item Giuliana Galati
 \end{itemize}
-A special thank to Claudio Beccari for very precise comments on the previous version.
+A special thank to Claudio Beccari for very precise comments on the first version.
 \end{tframe}
 
diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/content_end_ita.tex b/Master/texmf-dist/doc/latex/beamer2thesis/content_end_ita.tex
index 52c5d56a8fe..c0905bcfa73 100644
--- a/Master/texmf-dist/doc/latex/beamer2thesis/content_end_ita.tex
+++ b/Master/texmf-dist/doc/latex/beamer2thesis/content_end_ita.tex
@@ -72,7 +72,11 @@ Di seguito sono riportate le principali caratteristiche delle versioni:
 \end{itemize}
 \item versione 2.0:
 \begin{itemize}
-\item terzo logo, correlatore, nuovi modi di evidenziazione del testo, comando per il frontespizio, nuovi ambienti \emph{adv} e \emph{disadv}, supporto a \XeTeX\, e \XeLaTeX\,, ambienti block.
+\item terzo logo, correlatore, nuovi modi di evidenziazione del testo, comando per il frontespizio, nuovi ambienti \emph{adv} e \emph{disadv}, supporto a \XeTeX\, e \XeLaTeX\,, ambienti block;
+\end{itemize}
+\item versione 2.1:
+\begin{itemize}
+\item opzione sulla codifica.
 \end{itemize}
 \end{itemize}
 \end{tframe}
@@ -91,5 +95,5 @@ Di seguito sono riportate le principali caratteristiche delle versioni:
 \item Giuliana Galati
 \end{itemize}
 \end{itemize}
-Un ringraziamento speciale è per il professor Claudio Beccari per i commenti sulla precedente versione.
+Un ringraziamento speciale è per il professor Claudio Beccari per i commenti sulla prima versione.
 \end{tframe}
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/content_initial.tex b/Master/texmf-dist/doc/latex/beamer2thesis/content_initial.tex
index 153c53559f3..964ebe8f749 100644
--- a/Master/texmf-dist/doc/latex/beamer2thesis/content_initial.tex
+++ b/Master/texmf-dist/doc/latex/beamer2thesis/content_initial.tex
@@ -179,6 +179,16 @@ do not be afraid and compile a second time: it will work!!
 \end{itemize}
 \end{frame}
 
+\begin{frame}[t,fragile]{Coding}
+To avoid forcing an user to use the \verb!utf8x! coding, this release fix the bug by introducing the \highlight{coding} option; possible choices you can exploit are:
+\begin{itemize}
+\item \verb!coding=utf8x! (default)
+\item \verb!coding=utf8! 
+\item \verb!coding=latin1! 
+\end{itemize}
+An important advise: the program does not check which string you put in input; it is your matter select the right coding to satisfy requeriments of your system.
+\end{frame}
+
 \begin{frame}[t,fragile]{Second logo}
 \begin{itemize}
 \item If, for some reasons, someone needs a second logo (a thesis performed in another institute for example) an option allows you to put it in the title page
diff --git a/Master/texmf-dist/doc/latex/beamer2thesis/content_initial_ita.tex b/Master/texmf-dist/doc/latex/beamer2thesis/content_initial_ita.tex
index 9849f2462b3..c49aaddfec2 100644
--- a/Master/texmf-dist/doc/latex/beamer2thesis/content_initial_ita.tex
+++ b/Master/texmf-dist/doc/latex/beamer2thesis/content_initial_ita.tex
@@ -166,6 +166,16 @@ non spaventatevi e compilate nuovamente: funzionerà!
 \end{itemize}
 \end{frame}
 
+\begin{frame}[t,fragile]{Codifica}
+Per non forzare l'utente ad utilizzare esclusivamente la codifica utf8x, questa versione risolve il problema introducendo l'opzione \highlight{coding}; le possibili scelte sono:
+\begin{itemize}
+\item \verb!coding=utf8x! (default)
+\item \verb!coding=utf8!
+\item \verb!coding=latin1!
+\end{itemize}
+Un avviso: il programma non controlla eventuali errori di inserimento ed è compito del lettore assicurarsi di scegliere la giusta codifica che il suo sistema richiede.
+\end{frame}
+
 \begin{frame}[t,fragile]{Secondo logo}
 \begin{itemize}
 \item Se è necessario inserire un secondo logo (ad esempio per una tesi di laurea con doppio titolo), un'opzione permette di visualizzarlo nella pagina iniziale
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
index 0fca505c11f..541a491750e 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerinnerthemetorinoth.sty
@@ -41,24 +41,6 @@
 
 \ProcessOptionsBeamer
 
-% Language
-\def\beamer@torinoth@italiantext{italian}%
-  \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
-    \def\beamer@torinoth@subject{Presentazione Tesi di Laurea}%
-    \ifxetex
-      \setmainlanguage{italian}%
-    \else
-      \RequirePackage[italian]{babel}%
-    \fi
-  \else%
-    \def\beamer@torinoth@subject{Thesis Presentation}%
-    \ifxetex
-      \setmainlanguage[variant=british]{english}%
-    \else
-      \RequirePackage[english]{babel}%
-    \fi
-\fi%
-
 % Definition of second logo if request
 \def\beamer@torinoth@secondlogotext{true}%
 \ifx\beamer@torinoth@secondlogo\beamer@torinoth@secondlogotext%
diff --git a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
index 5646ed98df2..c315209adda 100644
--- a/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
+++ b/Master/texmf-dist/tex/latex/beamer2thesis/beamerthemeTorinoTh.sty
@@ -11,6 +11,22 @@
 
 \mode<presentation>
 
+% Options
+\DeclareOptionBeamer{language}{\PassOptionsToPackage{language=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{titlepagelogo}{\PassOptionsToPackage{titlepagelogo=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{bullet}{\PassOptionsToPackage{bullet=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{pageofpages}{\PassOptionsToPackage{pageofpages=#1}{beamerouterthemetorinoth}}
+\DeclareOptionBeamer{titleline}[false]{\PassOptionsToPackage{titleline=#1}{beamerouterthemetorinoth}}
+\DeclareOptionBeamer{color}{\PassOptionsToPackage{color=#1}{beamercolorthemetorinoth}}
+\DeclareOptionBeamer{secondcandidate}[true]{\PassOptionsToPackage{secondcandidate=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{secondlogo}[true]{\PassOptionsToPackage{secondlogo=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{thirdlogo}[true]{\PassOptionsToPackage{thirdlogo=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{assistantsupervisor}[true]{\PassOptionsToPackage{assistantsupervisor=#1}{beamerinnerthemetorinoth}}
+\DeclareOptionBeamer{notshowauthor}[true]{\PassOptionsToPackage{notshowauthor=#1}{beamerouterthemetorinoth}}
+\DeclareOptionBeamer{coding}{\def\beamer@torinoth@coding{#1}}
+\ExecuteOptionsBeamer{coding=utf8x}
+\ProcessOptionsBeamer
+
 % Packages
 \RequirePackage{ifxetex}%
 \RequirePackage{pifont}%
@@ -23,22 +39,26 @@
   \RequirePackage{xkeyval}%
   \RequirePackage{polyglossia}%
 \else
-  \RequirePackage[utf8x]{inputenc}%
+  \RequirePackage[\beamer@torinoth@coding]{inputenc}%
 \fi
 
-% Options
-\DeclareOptionBeamer{language}{\PassOptionsToPackage{language=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{titlepagelogo}{\PassOptionsToPackage{titlepagelogo=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{bullet}{\PassOptionsToPackage{bullet=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{pageofpages}{\PassOptionsToPackage{pageofpages=#1}{beamerouterthemetorinoth}}
-\DeclareOptionBeamer{titleline}[false]{\PassOptionsToPackage{titleline=#1}{beamerouterthemetorinoth}}
-\DeclareOptionBeamer{color}{\PassOptionsToPackage{color=#1}{beamercolorthemetorinoth}}
-\DeclareOptionBeamer{secondcandidate}[true]{\PassOptionsToPackage{secondcandidate=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{secondlogo}[true]{\PassOptionsToPackage{secondlogo=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{thirdlogo}[true]{\PassOptionsToPackage{thirdlogo=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{assistantsupervisor}[true]{\PassOptionsToPackage{assistantsupervisor=#1}{beamerinnerthemetorinoth}}
-\DeclareOptionBeamer{notshowauthor}[true]{\PassOptionsToPackage{notshowauthor=#1}{beamerouterthemetorinoth}}
-\ProcessOptionsBeamer
+% Language
+\def\beamer@torinoth@italiantext{italian}%
+  \ifx\beamer@torinoth@language\beamer@torinoth@italiantext%
+    \def\beamer@torinoth@subject{Presentazione Tesi di Laurea}%
+    \ifxetex
+      \setmainlanguage{italian}%
+    \else
+      \RequirePackage[italian]{babel}%
+    \fi
+  \else%
+    \def\beamer@torinoth@subject{Thesis Presentation}%
+    \ifxetex
+      \setmainlanguage[variant=british]{english}%
+    \else
+      \RequirePackage[english]{babel}%
+    \fi
+\fi%
 
 % General settings
 \useinnertheme{torinoth}