oberdiek update (17apr10)

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

1 files changed, 507 insertions, 65 deletions

diff --git a/Master/texmf-dist/source/latex/oberdiek/hologo.dtx b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
index e73b149cf5f..69e8569b6fc 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hologo.dtx
@@ -75,7 +75,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: hologo 2010/04/08 v1.0 Logo collection (HO)}
+\Msg{* Package: hologo 2010/04/16 v1.1 Logo collection (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -149,10 +149,10 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hologo.drv}%
-  [2010/04/08 v1.0 Logo collection (HO)]%
+  [2010/04/16 v1.1 Logo collection (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2008/08/11]
-\usepackage{hologo}[2010/04/08]
+\usepackage{hologo}[2010/04/16]
 \usepackage{longtable}
 \usepackage{array}
 \begin{document}
@@ -161,7 +161,7 @@ and the derived files
 %</driver>
 % \fi
 %
-% \CheckSum{810}
+% \CheckSum{1145}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -182,7 +182,7 @@ and the derived files
 % \GetFileInfo{hologo.drv}
 %
 % \title{The \xpackage{hologo} package}
-% \date{2010/04/08 v1.0}
+% \date{2010/04/16 v1.1}
 % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
 %
 % \maketitle
@@ -196,32 +196,96 @@ and the derived files
 %
 % \section{Documentation}
 %
+% \subsection{Logo macros}
+%
 % \begin{declcs}{hologo} \M{name}
 % \end{declcs}
 % Macro \cs{hologo} sets the logo with name \meta{name}.
 % The following table shows the supported names.
 %
-% \tracingmacros=1
 % \newcommand*{\entry}{}
-% \def\entry#1[#2]{#1&\hologo{#1}&#2\tabularnewline}
-% \begin{longtable}{>{\ttfamily}lll}
-% \rmfamily\bfseries{name} & \bfseries logo & \bfseries since\\
+% \def\entry#1#2[#3]{^^A
+%   #1&#2&\hologoLogoSetup{#1}{variant=#2}\hologo{#1}&#3\tabularnewline
+% }
+% \begin{longtable}{>{\ttfamily}l>{\ttfamily}lll}
+% \rmfamily\bfseries{name} & \rmfamily\bfseries variant
+% & \bfseries logo & \bfseries since\\
 % \hline
 % \endhead
-% \entry{eTeX}[2010/04/08]
-% \entry{LaTeX}[2010/04/08]
-% \entry{LaTeX2e}[2010/04/08]
-% \entry{LaTeXe}[2010/04/08]
-% \entry{LuaLaTeX}[2010/04/08]
-% \entry{LuaTeX}[2010/04/08]
-% \entry{pdfTeX}[2010/04/08]
-% \entry{pdfLaTeX}[2010/04/08]
-% \entry{plainTeX}[2010/04/08]
-% \entry{TeX}[2010/04/08]
-% \entry{XeLaTeX}[2010/04/08]
-% \entry{XeTeX}[2010/04/08]
+% \entry{AmSLaTeX}{}[2010/04/16]
+% \entry{AmSTeX}{}[2010/04/16]
+% \entry{eTeX}{}[2010/04/08]
+% \entry{LaTeX}{}[2010/04/08]
+% \entry{LaTeX2e}{}[2010/04/08]
+% \entry{LaTeXe}{}[2010/04/08]
+% \entry{LuaLaTeX}{}[2010/04/08]
+% \entry{LuaTeX}{}[2010/04/08]
+% \entry{pdfTeX}{}[2010/04/08]
+% \entry{pdfLaTeX}{}[2010/04/08]
+% \entry{plainTeX}{}[2010/04/08]
+% \entry{plainTeX}{space}[2010/04/16]
+% \entry{plainTeX}{hyphen}[2010/04/16]
+% \entry{plainTeX}{runtogether}[2010/04/16]
+% \entry{TeX}{}[2010/04/08]
+% \entry{XeLaTeX}{}[2010/04/08]
+% \entry{XeTeX}{}[2010/04/08]
 % \end{longtable}
 %
+% \begin{declcs}{Hologo} \M{name}
+% \end{declcs}
+% Macro \cs{Hologo} starts the logo \meta{name} with an uppercase
+% letter.
+%
+% \subsection{Setup macros}
+%
+% The package does not support package options, but the following
+% setup macros can be used to set options.
+%
+% \begin{declcs}{hologoSetup} \M{key value list}
+% \end{declcs}
+% Macro \cs{hologoSetup} sets global options.
+%
+% \begin{declcs}{hologoLogoSetup} \M{logo} \M{key value list}
+% \end{declcs}
+% Some options can also be used to configure a logo.
+% These settings take precedence over global option settings.
+%
+% \subsection{Options}\label{sec:options}
+%
+% There are boolean and string options:
+% \begin{description}
+% \item[Boolean option:]
+% It takes |true| or |false|
+% as value. If the value is omitted, then |true| is used.
+% \item[String option:]
+% A value must be given as string. (But the string might be empty.)
+% \end{description}
+% The following options can be used both in \cs{hologoSetup}
+% and \cs{hologoLogoSetup}:
+% \begin{description}
+% \def\entry#1{\item[\xoption{#1}:]}
+% \entry{break}
+%   enables or disables line breaks inside the logo. This setting is
+%   refined by options \xoption{hyphenbreak} or \xoption{spacebreak}.
+%   Default is |false|.
+% \entry{hyphenbreak}
+%   enables or disables the line break right after the hyphen character.
+% \entry{spacebreak}
+%   enables or disables line breaks at space characters.
+% \end{description}
+% Macro \cs{hologoLogoSetup} also knows:
+% \begin{description}
+% \item[\xoption{variant}:]
+%   This is a string option. It specifies a variant of a logo that
+%   must exist. An empty string selects the package default variant.
+% \end{description}
+% Example:
+% \begin{quote}
+%   |\hologoSetup{break=false}|\\
+%   |\hologoLogoSetup{plainTeX}{variant=hyphen,hyphenbreak}|\\
+%   Then ``plain-\TeX'' contains one break point after the hyphen.
+% \end{quote}
+%
 % \StopEventually{
 % }
 %
@@ -294,7 +358,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@hologo.sty\endcsname
 \ProvidesPackage{hologo}%
-  [2010/04/08 v1.0 Logo collection (HO)]
+  [2010/04/16 v1.1 Logo collection (HO)]
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -361,15 +425,17 @@ and the derived files
   \input ltxcmds.sty\relax
   \input infwarerr.sty\relax
   \input kvsetkeys.sty\relax
+  \input kvdefinekeys.sty\relax
   \input pdftexcmds.sty\relax
   \input ifpdf.sty\relax
   \input ifluatex.sty\relax
   \input ifxetex.sty\relax
   \input ifvtex.sty\relax
 \else
-  \RequirePackage{ltxcmds}[2010/04/08]%
+  \RequirePackage{ltxcmds}[2010/04/16]%
   \RequirePackage{infwarerr}[2010/04/08]%
   \RequirePackage{kvsetkeys}[2010/03/01]%
+  \RequirePackage{kvdefinekeys}[2010/03/01]%
   \RequirePackage{pdftexcmds}[2010/04/01]%
   \RequirePackage{ifpdf}[2010/01/28]%
   \RequirePackage{ifluatex}[2010/03/01]%
@@ -394,6 +460,226 @@ and the derived files
 %    \end{macrocode}
 %    \end{macro}
 %
+% \subsection{Setup macros}
+%
+%    \begin{macro}{\hologoSetup}
+%    \begin{macrocode}
+\def\hologoSetup{%
+  \let\HOLOGO@name\relax
+  \HOLOGO@Setup
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\hologoLogoSetup}
+%    \begin{macrocode}
+\def\hologoLogoSetup#1{%
+  \edef\HOLOGO@name{#1}%
+  \ltx@IfUndefined{HoLogo@\HOLOGO@name}{%
+    \@PackageError{hologo}{%
+      Unknown logo `\HOLOGO@name'%
+    }\@ehc
+    \@gobble
+  }{%
+    \HOLOGO@Setup
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HOLOGO@Setup}
+%    \begin{macrocode}
+\def\HOLOGO@Setup{%
+  \kvsetkeys{HoLogo}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Options}
+%
+%    \begin{macro}{\HOLOGO@DefineBoolOption}
+%    \begin{macrocode}
+\def\HOLOGO@DeclareBoolOption#1{%
+  \expandafter\chardef\csname HOLOGOOPT@#1\endcsname\ltx@zero
+  \kv@define@key{HoLogo}{#1}[true]{%
+    \def\HOLOGO@temp{##1}%
+    \ifx\HOLOGO@temp\HOLOGO@true
+      \ifx\HOLOGO@name\relax
+        \expandafter\chardef\csname HOLOGOOPT@#1\endcsname=\ltx@one
+      \else
+        \expandafter\chardef\csname
+        HoLogoOpt@#1@\HOLOGO@name\endcsname\ltx@one
+      \fi
+      \HOLOGO@SetBreakAll{#1}%
+    \else
+      \ifx\HOLOGO@temp\HOLOGO@false
+        \ifx\HOLOGO@name\relax
+          \expandafter\chardef\csname HOLOGOOPT@#1\endcsname=\ltx@zero
+        \else
+          \expandafter\chardef\csname
+          HoLogoOpt@#1@\HOLOGO@name\endcsname=\ltx@zero
+        \fi
+        \HOLOGO@SetBreakAll{#1}%
+      \else
+        \@PackageError{hologo}{%
+          Unknown value `##1' for boolean option `#1'.\MessageBreak
+          Known values are `true' and `false'%
+        }\@ehc
+      \fi
+    \fi
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HOLOGO@SetBreakAll}
+%    \begin{macrocode}
+\def\HOLOGO@SetBreakAll#1{%
+  \def\HOLOGO@temp{#1}%
+  \ifx\HOLOGO@temp\HOLOGO@break
+    \ifx\HOLOGO@name\relax
+      \chardef\HOLOGOOPT@hyphenbreak=\HOLOGOOPT@break
+      \chardef\HOLOGOOPT@spacebreak=\HOLOGOOPT@break
+    \else
+      \expandafter\chardef
+         \csname HoLogoOpt@hyphenbreak@\HOLOGO@name\endcsname=%
+         \csname HoLogoOpt@break@\HOLOGO@name\endcsname
+      \expandafter\chardef
+         \csname HoLogoOpt@spacebreak@\HOLOGO@name\endcsname=%
+         \csname HoLogoOpt@break@\HOLOGO@name\endcsname
+    \fi
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HOLOGO@true}
+%    \begin{macrocode}
+\def\HOLOGO@true{true}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\HOLOGO@false}
+%    \begin{macrocode}
+\def\HOLOGO@false{false}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\HOLOGO@break}
+%    \begin{macrocode}
+\def\HOLOGO@break{break}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macrocode}
+\HOLOGO@DeclareBoolOption{break}
+\HOLOGO@DeclareBoolOption{hyphenbreak}
+\HOLOGO@DeclareBoolOption{spacebreak}
+%    \end{macrocode}
+%
+%    \begin{macrocode}
+\kv@define@key{HoLogo}{variant}{%
+  \ifx\HOLOGO@name\relax
+    \@PackageError{hologo}{%
+      Option `variant' is not available in \string\hologoSetup,%
+      \MessageBreak
+      Use \string\hologoLogoSetup\space instead%
+    }\@ehc
+  \else
+    \edef\HOLOGO@temp{#1}%
+    \ifx\HOLOGO@temp\ltx@empty
+      \expandafter
+      \let\csname HoLogoOpt@variant@\HOLOGO@name\endcsname\@undefined
+    \else
+      \ltx@IfUndefined{HoLogo@\HOLOGO@name @\HOLOGO@temp}{%
+        \@PackageError{hologo}{%
+          Unknown variant `\HOLOGO@temp' of logo `\HOLOGO@name'%
+        }\@ehc
+      }{%
+        \expandafter
+        \let\csname HoLogoOpt@variant@\HOLOGO@name\endcsname
+            \HOLOGO@temp
+      }%
+    \fi
+  \fi
+}
+%    \end{macrocode}
+%
+%    \begin{macro}{\HOLOGO@Variant}
+%    \begin{macrocode}
+\def\HOLOGO@Variant#1{%
+  #1%
+  \ltx@ifundefined{HoLogoOpt@variant@#1}{%
+  }{%
+    @\csname HoLogoOpt@variant@#1\endcsname
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsection{Break/no-break support}
+%
+%    \begin{macro}{\HOLOGO@space}
+%    \begin{macrocode}
+\def\HOLOGO@space{%
+  \ltx@ifundefined{HoLogoOpt@spacebreak@\HOLOGO@name}{%
+    \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{%
+      \chardef\HOLOGO@temp=\HOLOGOOPT@spacebreak
+    }{%
+      \chardef\HOLOGO@temp=%
+        \csname HoLogoOpt@break@\HOLOGO@name\endcsname
+    }%
+  }{%
+    \chardef\HOLOGO@temp=%
+      \csname HoLogoOpt@spacebreak@\HOLOGO@name\endcsname
+  }%
+  \ifcase\HOLOGO@temp
+    \penalty10000 %
+  \fi
+  \ltx@space
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HOLOGO@hyphen}
+%    \begin{macrocode}
+\def\HOLOGO@hyphen{%
+  \ltx@ifundefined{HoLogoOpt@hyphenbreak@\HOLOGO@name}{%
+    \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{%
+      \chardef\HOLOGO@temp=\HOLOGOOPT@hyphenbreak
+    }{%
+      \chardef\HOLOGO@temp=%
+        \csname HoLogoOpt@break@\HOLOGO@name\endcsname
+    }%
+  }{%
+    \chardef\HOLOGO@temp=%
+      \csname HoLogoOpt@hyphenbreak@\HOLOGO@name\endcsname
+  }%
+  \ifcase\HOLOGO@temp
+    \ltx@mbox{-}%
+  \else
+    -%
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HOLOGO@mbox}
+%    \begin{macrocode}
+\def\HOLOGO@mbox#1{%
+  \ltx@ifundefined{HoLogoOpt@break@\HOLOGO@name}{%
+    \chardef\HOLOGO@temp=\HOLOGOOPT@hyphenbreak
+  }{%
+    \chardef\HOLOGO@temp=%
+      \csname HoLogoOpt@break@\HOLOGO@name\endcsname
+  }%
+  \ifcase\HOLOGO@temp
+    \ltx@mbox{#1}%
+  \else
+    #1%
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
 % \subsection{\cs{hologo}}
 %
 %    \begin{macrocode}
@@ -425,13 +711,14 @@ and the derived files
   \protected\def\hologorobust#1%
 }%
 {%
-  \ltx@ifundefined{HoLogo@#1}{%
+  \edef\HOLOGO@name{#1}%
+  \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{%
     \@PackageError{hologo}{%
-      Unknown logo `#1'%
+      Unknown logo `\HOLOGO@name'%
     }\@ehc
-    ?#1?%
+    ?\HOLOGO@name?%
   }{%
-    \csname HoLogo@#1\endcsname
+    \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@firstoftwo
   }%
 }
 %    \end{macrocode}
@@ -443,10 +730,51 @@ and the derived files
   {%
     \hologorobust{#1}%
   }{%
-    \ltx@ifundefined{HoLogoBkm@#1}{%
+    \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{%
+      \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
+    }{%
+      \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@firstoftwo
+    }%
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\Hologorobust}
+%    \begin{macrocode}
+\ltx@IfUndefined{protected}{%
+  \ltx@IfUndefined{DeclareRobustCommand}{%
+    \def\Hologorobust#1%
+  }{%
+    \DeclareRobustCommand*\Hologorobust[1]%
+  }%
+}{%
+  \protected\def\Hologorobust#1%
+}%
+{%
+  \edef\HOLOGO@name{#1}%
+  \ltx@ifundefined{HoLogo@\HOLOGO@Variant\HOLOGO@name}{%
+    \@PackageError{hologo}{%
+      Unknown logo `\HOLOGO@name'%
+    }\@ehc
+    ?\HOLOGO@name?%
+  }{%
+    \csname HoLogo@\HOLOGO@Variant\HOLOGO@name\endcsname\ltx@secondoftwo
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\Hologo}
+%    \begin{macrocode}
+\def\Hologo#1{%
+  \HOLOGO@IfExists\texorpdfstring\texorpdfstring\ltx@firstoftwo
+  {%
+    \Hologorobust{#1}%
+  }{%
+    \ltx@ifundefined{HoLogoBkm@\HOLOGO@Variant{#1}}{%
       \ltx@ifundefined{HoLogo@#1}{?#1?}{#1}%
     }{%
-      \csname HoLogoBkm@#1\endcsname
+      \csname HoLogoBkm@\HOLOGO@Variant{#1}\endcsname\ltx@secondoftwo
     }%
   }%
 }
@@ -514,7 +842,6 @@ and the derived files
 %    \end{macrocode}
 %    \end{macro}
 %
-%
 % \subsection{\hologo{TeX} and friends}
 %
 % \subsubsection{\hologo{TeX}}
@@ -522,7 +849,7 @@ and the derived files
 %    \begin{macro}{\HoLogo@TeX}
 %    Source: \hologo{LaTeX} kernel.
 %    \begin{macrocode}
-\def\HoLogo@TeX{%
+\def\HoLogo@TeX#1{%
   T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000 %
 }
 %    \end{macrocode}
@@ -530,28 +857,69 @@ and the derived files
 %
 % \subsubsection{\hologo{plainTeX}}
 %
-%    \begin{macro}{\HoLogo@plainTeX}
+%    \begin{macro}{\HoLogo@plainTeX@space}
 %    Source: ``The \hologo{TeX}book''
 %    \begin{macrocode}
-\def\HoLogo@plainTeX{%
-  plain \hologo{TeX}%
+\def\HoLogo@plainTeX@space#1{%
+  \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@space\hologo{TeX}%
 }
 %    \end{macrocode}
 %    \end{macro}
-%    \begin{macro}{\HoLogoBkm@plainTeX}
+%    \begin{macro}{\HoLogoBkm@plainTeX@space}
+%    \begin{macrocode}
+\def\HoLogoBkm@plainTeX@space#1{%
+  #1{p}{P}lain \hologo{TeX}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HoLogo@plainTeX@hyphen}
+%    \begin{macrocode}
+\def\HoLogo@plainTeX@hyphen#1{%
+  \HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@hyphen\hologo{TeX}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\HoLogoBkm@plainTeX@hyphen}
+%    \begin{macrocode}
+\def\HoLogoBkm@plainTeX@hyphen#1{%
+  #1{p}{P}lain-\hologo{TeX}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HoLogo@plainTeX@runtogether}
+%    \begin{macrocode}
+\def\HoLogo@plainTeX@runtogether#1{%
+  \HOLOGO@mbox{#1{p}{P}lain\hologo{TeX}}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\HoLogoBkm@plainTeX@runtogether}
 %    \begin{macrocode}
-\def\HoLogoBkm@plainTeX{%
-  plain \hologo{TeX}%
+\def\HoLogoBkm@plainTeX@runtogether#1{%
+  #1{p}{P}lain\hologo{TeX}%
 }
 %    \end{macrocode}
 %    \end{macro}
 %
+%    \begin{macro}{\HoLogo@plainTeX}
+%    \begin{macrocode}
+\def\HoLogo@plainTeX{\HoLogo@plainTeX@space}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\HoLogoBkm@plainTeX}
+%    \begin{macrocode}
+\def\HoLogoBkm@plainTeX{\HoLogoBkm@plainTeX@space}
+%    \end{macrocode}
+%    \end{macro}
+%
 % \subsubsection{\hologo{LaTeX}}
 %
 %    \begin{macro}{\HoLogo@LaTeX}
 %    Source: \hologo{LaTeX} kernel.
 %    \begin{macrocode}
-\def\HoLogo@LaTeX{%
+\def\HoLogo@LaTeX#1{%
   L%
   \kern-.36em%
   \begingroup
@@ -581,7 +949,7 @@ and the derived files
 %    \begin{macro}{\HoLogo@LaTeXe}
 %    Source: \hologo{LaTeX} kernel
 %    \begin{macrocode}
-\def\HoLogo@LaTeXe{%
+\def\HoLogo@LaTeXe#1{%
   \hologo{LaTeX}%
   \kern.15em%
   \hbox{%
@@ -595,7 +963,7 @@ and the derived files
 %
 %    \begin{macro}{\HoLogoBkm@LaTeXe}
 %    \begin{macrocode}
-\def\HoLogoBkm@LaTeXe{%
+\def\HoLogoBkm@LaTeXe#1{%
   \hologo{LaTeX}%
   2%
   \HOLOGO@PdfdocUnicode{e}{\textepsilon}%
@@ -619,22 +987,23 @@ and the derived files
 %    \begin{macro}{\HoLogo@eTeX}
 %    Source: package \xpackage{etex}
 %    \begin{macrocode}
-\def\HoLogo@eTeX{%
-  \leavevmode
-  \hbox{%
-    \HOLOGO@MathSetup
-    $\varepsilon$%
-    -%
-    \HOLOGO@NegativeKerning{-T,T-,To}%
-    \hologo{TeX}%
+\def\HoLogo@eTeX#1{%
+  \ltx@mbox{%
+    \hbox{%
+      \HOLOGO@MathSetup
+      $\varepsilon$%
+      -%
+      \HOLOGO@NegativeKerning{-T,T-,To}%
+      \hologo{TeX}%
+    }%
   }%
 }
 %    \end{macrocode}
 %    \end{macro}
 %    \begin{macro}{\HoLogoBkm@eTeX}
 %    \begin{macrocode}
-\def\HoLogoBkm@eTeX{%
-  \HOLOGO@PdfdocUnicode{e}{\textepsilon}%
+\def\HoLogoBkm@eTeX#1{%
+  \HOLOGO@PdfdocUnicode{#1{e}{E}}{\textepsilon}%
   -%
   \hologo{TeX}%
 }
@@ -647,10 +1016,12 @@ and the derived files
 %    The kerning is an idea of Hans Hagen, see mailing list
 %    `luatex at tug dot org' in March 2010.
 %    \begin{macrocode}
-\def\HoLogo@LuaTeX{%
-  Lua%
-  \HOLOGO@NegativeKerning{aT,oT,To}%
-  \hologo{TeX}%
+\def\HoLogo@LuaTeX#1{%
+  \HOLOGO@mbox{%
+    Lua%
+    \HOLOGO@NegativeKerning{aT,oT,To}%
+    \hologo{TeX}%
+  }%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -659,9 +1030,11 @@ and the derived files
 %
 %    \begin{macro}{\HoLogo@LuaLaTeX}
 %    \begin{macrocode}
-\def\HoLogo@LuaLaTeX{%
-  Lua%
-  \hologo{LaTeX}%
+\def\HoLogo@LuaLaTeX#1{%
+  \HOLOGO@mbox{%
+    Lua%
+    \hologo{LaTeX}%
+  }%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -671,7 +1044,7 @@ and the derived files
 %    \begin{macro}{\HoLogo@Xe}
 %    Source: package \xpackage{dtklogos}
 %    \begin{macrocode}
-\def\HoLogo@Xe{%
+\def\HoLogo@Xe#1{%
   X%
   \kern-.1em\relax
   \ltx@IfUndefined{HOLOGO@ReflectBox}\ltx@firstoftwo{%
@@ -689,7 +1062,7 @@ and the derived files
 %
 %    \begin{macro}{\HoLogo@XeTeX}
 %    \begin{macrocode}
-\def\HoLogo@XeTeX{%
+\def\HoLogo@XeTeX#1{%
   \hologo{Xe}%
   \kern-.15em\relax
   \hologo{TeX}%
@@ -699,13 +1072,13 @@ and the derived files
 %
 %    \begin{macro}{\HoLogoBkm@XeTeX}
 %    \begin{macrocode}
-\def\HoLogoBkm@XeTeX{XeTeX}
+\def\HoLogoBkm@XeTeX#1{XeTeX}
 %    \end{macrocode}
 %    \end{macro}
 %
 %    \begin{macro}{\HoLogo@XeLaTeX}
 %    \begin{macrocode}
-\def\HoLogo@XeLaTeX{%
+\def\HoLogo@XeLaTeX#1{%
   \hologo{Xe}%
   \hologo{LaTeX}%
 }
@@ -716,19 +1089,77 @@ and the derived files
 %
 %    \begin{macro}{\HoLogo@pdfTeX}
 %    \begin{macrocode}
-\def\HoLogo@pdfTeX{%
-  pdf\hologo{TeX}%
+\def\HoLogo@pdfTeX#1{%
+  \HOLOGO@mbox{%
+    #1{p}{P}df\hologo{TeX}%
+  }%
 }
 %    \end{macrocode}
 %    \end{macro}
 %
 %    \begin{macro}{\HoLogo@pdfLaTeX}
 %    \begin{macrocode}
-\def\HoLogo@pdfLaTeX{%
-  pdf\hologo{LaTeX}%
+\def\HoLogo@pdfLaTeX#1{%
+  \HOLOGO@mbox{%
+    #1{p}{P}df\hologo{LaTeX}%
+  }%
+}
+%    \end{macrocode}
+%    \end{macro}
+%
+% \subsubsection{\hologo{AmS}, \dots}
+%
+%    Source: class \xclass{amsdtx}
+%
+%    \begin{macro}{\HoLogo@AmS}
+%    \begin{macrocode}
+\def\HoLogo@AmS#1{%
+  \begingroup
+    \usefont{OMS}{cmsy}{m}{n}%
+    A%
+    \kern-.1667em%
+    \lower.5ex\hbox{M}%
+    \kern-.125em%
+    S%
+  \endgroup
 }
 %    \end{macrocode}
 %    \end{macro}
+%    \begin{macro}{\HoLogoBkm@AmS}
+%    \begin{macrocode}
+\def\HoLogoBkm@AmS#1{AmS}
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HoLogo@AmSTeX}
+%    \begin{macrocode}
+\def\HoLogo@AmSTeX#1{%
+  \hologo{AmS}%
+  \HOLOGO@hyphen
+  \hologo{TeX}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\HoLogoBkm@AmSTeX}
+%    \begin{macrocode}
+\def\HoLogoBkm@AmSLaTeX#1{AmS-TeX}%
+%    \end{macrocode}
+%    \end{macro}
+%
+%    \begin{macro}{\HoLogo@AmSLaTeX}
+%    \begin{macrocode}
+\def\HoLogo@AmSLaTeX#1{%
+  \hologo{AmS}%
+  \HOLOGO@hyphen
+  \hologo{LaTeX}%
+}
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{\HoLogoBkm@AmSLaTeX}
+%    \begin{macrocode}
+\def\HoLogoBkm@AmSLaTeX#1{AmS-LaTeX}%
+%    \end{macrocode}
+%    \end{macro}
 %
 % \subsection{Driver detection}
 %
@@ -1254,6 +1685,17 @@ and the derived files
 %   \item
 %     The first version.
 %   \end{Version}
+%   \begin{Version}{2010/04/16 v1.1}
+%   \item
+%     \cs{Hologo} added for support of logos at start of a sentence.
+%   \item
+%     \cs{hologoSetup} and \cs{hologoLogoSetup} added.
+%   \item
+%     Options \xoption{break}, \xoption{hyphenbreak}, \xoption{spacebreak}
+%     added.
+%   \item
+%     Variant support added by option \xoption{variant}.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex