[Gpg4win-commits] r1439 - in trunk/doc: . manual

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2010-05-25 15:22:19 +0200 (Tue, 25 May 2010)
New Revision: 1439

Modified:
   trunk/doc/ChangeLog
   trunk/doc/manual/gpg4win-compendium-de.tex
Log:
Set pdf meta information. Some minor fixes.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2010-05-25 08:09:33 UTC (rev 1438)
+++ trunk/doc/ChangeLog	2010-05-25 13:22:19 UTC (rev 1439)
@@ -10,6 +10,10 @@
 	* manual/gpg4win-compendium-de.tex: Repair link to index (add
 	phantomsection command).
 
+	* manual/gpg4win-compendium-de.tex: Set pdf meta information as
+	option in hperref package. Centering A5 title page. Fix html image
+	centering. And some minor format fixes.
+
 2010-05-21  Emanuel Schuetze <emanuel at intevation.de>
 
 	* manual/gpg4win-compendium-de.tex: Switch from dvips to pdflatex. 

Modified: trunk/doc/manual/gpg4win-compendium-de.tex
===================================================================
--- trunk/doc/manual/gpg4win-compendium-de.tex	2010-05-25 08:09:33 UTC (rev 1438)
+++ trunk/doc/manual/gpg4win-compendium-de.tex	2010-05-25 13:22:19 UTC (rev 1439)
@@ -45,7 +45,15 @@
 %\W\htmldirectory{./compendium-de-html}
 
 % Hyperref should be among the last packages loaded
-\usepackage[breaklinks]{hyperref}
+\usepackage[breaklinks,
+    pdftitle={Das Gpg4win-Kompendium},
+    pdfauthor={Emanuel Schütze et al.},
+    pdfsubject={E-Mail-Sicherheit mit GnuPG für Windows},
+    pdfkeywords={Gpg4win, E-Mail, Datei, verschlüsseln, entschlüsseln,
+    signieren, OpenPGP, S/MIME, X.509, Zertifikat, Kleopatra, GpgOL,
+    GpgEX, GnuPG, sicher, E-Mail-Sicherheit, Kryptografie, Public-Key,
+    Freie Software} 
+]{hyperref}
 
 % set graphic extension
 \begin{latexonly}
@@ -90,16 +98,15 @@
 \newcommand\margin[1]{\marginline {\sffamily\scriptsize #1}}
 \newcommand{\marginOpenpgp}{\marginline{\vspace{10pt}\includegraphics[width=1.5cm]{openpgp-icon}}}
 \newcommand{\marginSmime}{\marginline{\vspace{10pt}\includegraphics[width=1.5cm]{smime-icon}}}
-\newcommand{\IncludeImage}[2][]{\texorhtml{%
-\begin{center}%
+\newcommand{\IncludeImage}[2][]{
+\begin{center}
+\texorhtml{%
   \includegraphics[#1]{#2}%
-\end{center}%
 }{%
-  \htmlattributes*{DIV}{align=center}
-  \html{DIV}%
-  \htmlimage{#2.png}%
-  \html{/DIV}%
-}}
+  \htmlimg{#2.png}%
+}
+\end{center}
+}
 
 % custom colors
 \definecolor{gray}{rgb}{0.4,0.4,0.4}
@@ -123,15 +130,6 @@
 {\texorhtml{\href{#2}{\Filename{#2}}}{\xlink{#2}{#2}}}
 {\texorhtml{\href{#2}{\Filename{#1}}}{\xlink{#1}{#2}}}}
 
-%%% PDFINFO
-\begin{latexonly}
-\pdfinfo{
-   /Author (Emanuel Schütze et al.)
-   /Title  (Das Gpg4win-Kompendium)
-   /Subject (Gpg4win)
-}
-\end{latexonly}
-
 %%% HYPERLATEX %%%
 \begin{ifhtml}
     % HTML title
@@ -237,8 +235,16 @@
 %%% BEGIN DOCUMENT %%%
 
 \begin{document}
-\maketitle
 
+% set title page
+\texorhtml{
+    \ifthenelse{\boolean{DIN-A5}}
+    {\noindent\hspace*{7mm}\parbox{\textwidth}{\centering\maketitle}\cleardoublepage}
+    {\maketitle}
+}
+{\maketitle}
+
+
 % improved handling of long (outstanding) lines
 \T\setlength\emergencystretch{3em} \tolerance=1000
 
@@ -1069,9 +1075,12 @@
 \begin{latexonly} %no hyperlatex
 Im weiteren Verlauf dieses Kompendiums weisen wir mit diesen beiden 
 Symbolen auf die beiden Alternativen hin:
-\IncludeImage[width=2.5cm]{openpgp-icon}
+
+\begin{center}
+\includegraphics[width=2.5cm]{openpgp-icon}
 \hspace{1cm}
-\IncludeImage[width=2.5cm]{smime-icon}
+\includegraphics[width=2.5cm]{smime-icon}
+\end{center}
 \end{latexonly}
 
 
@@ -5844,14 +5853,13 @@
 Ein entsprechender Aufruf zur automatischen Installation mit einer
 Steuerungsdatei \Filename{gpg4win.ini} und einem Installationspfad
 \Filename{D:\back{}Programme\back{}Gpg4win} könnte also wie folgt
-aussehen:
+aussehen:\\
+\Filename{
+  \T\ifthenelse{\boolean{DIN-A5}}{\scriptsize}{}
+  gpg4win.exe /S /C=C:\back{}TEMP\back{}gpg4win.ini  /D=D:\back{}Programme\back{}Gpg4win
+  \T\ifthenelse{\boolean{DIN-A5}}{\normalsize}{}
+}
 
-\T\ifthenelse{\boolean{DIN-A5}}{\scriptsize}{}
-\begin{verbatim}
-  gpg4win.exe /S /C=C:\TEMP\gpg4win.ini /D=D:\Programme\Gpg4win
-\end{verbatim}
-\T\ifthenelse{\boolean{DIN-A5}}{\normalsize}{}
-
 \clearpage
 \T\chapter{Umstieg von anderen Programmen}
 \W\chapter*{D Umstieg von anderen Programmen}