oberdiek update (8dec06)

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

1 files changed, 49 insertions, 21 deletions

diff --git a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
index e4e8ee5a404..fe8b72d2c21 100644
--- a/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/grffile.dtx
@@ -66,7 +66,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: grffile 2006/08/17 v1.1 Extended file name support for graphics (HO)}
+\Msg{* Package: grffile 2006/11/30 v1.2 Extended file name support for graphics (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -126,7 +126,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{grffile.drv}%
-  [2006/08/17 v1.1 Extended file name support for graphics (HO)]
+  [2006/11/30 v1.2 Extended file name support for graphics (HO)]
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
@@ -135,7 +135,7 @@ and the derived files
 %</driver>
 % \fi
 %
-% \CheckSum{346}
+% \CheckSum{356}
 %
 % \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
@@ -156,7 +156,7 @@ and the derived files
 % \GetFileInfo{grffile.drv}
 %
 % \title{The \xpackage{grffile} package}
-% \date{2006/08/17 v1.1}
+% \date{2006/11/30 v1.2}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -188,6 +188,23 @@ and the derived files
 % \verb|texsys.cfg| containing definitions for \verb|\filename@parse|.
 % The author could not test that, due to a missing example.
 %
+% \subsection{Option \xoption{babel}}
+%
+% This option allows the use of shorthand characters of package
+% \xpackage{babel} inside the graphics file name. Additionally
+% the tilde `\textasciitilde' is supported. The option
+% is turned on as default. (In version v1.1 or below of this package,
+% the features of this option were part of option \xoption{extendedchars}.)
+%
+% Example:
+% \begin{quote}
+%\begin{verbatim}
+%\usepackage[frenchb]{babel}
+%\usepackage{grffile}
+%Image: \includegraphics{C:/path/image}
+%\end{verbatim}
+% \end{quote}
+%
 % \subsection{Option \xoption{extendedchars}}
 %
 % If the input encoding is the same encoding as the encoding that
@@ -195,11 +212,11 @@ and the derived files
 % then this option can be used to use file names with such characters.
 %
 % Example:
-% \begin{verbatim}
-%   \usepackage[latin1]{inputenc}
-%   \usepackage[extendedchars]{grffile}
-%   \includegraphics{Bäckerstraße}
-% \end{verbatim}
+% \begin{quote}
+%   |\usepackage[latin1]{inputenc}|\\
+%   |\usepackage[extendedchars]{grffile}|\\
+%   |\includegraphics{|\texttt{B\"ackerstra\ss e}|}|
+% \end{quote}
 %
 % If the \verb|draft| option of the graphics package is enabled, the
 % file name is printed with the current font encoding for \verb|\ttfamily|.
@@ -268,10 +285,11 @@ and the derived files
 %
 % \begin{quote}
 % \begin{tabular}{@{}lll@{}}
-%   \xoption{multidot} & \verb|true|\\
-%   \xoption{extendedchars} & \verb|false|\\
-%   \xoption{space} & \verb|true| & if \pdfTeX\ 1.30 or greater is used in PDF mode\\
-%                   & \verb|false| & otherwise
+%   \xoption{multidot} & |true|\\
+%   \xoption{babel}    & |true|\\
+%   \xoption{extendedchars} & |false|\\
+%   \xoption{space} & |true| & if \pdfTeX\ 1.30 or greater is used in PDF mode\\
+%                   & |false| & otherwise
 % \end{tabular}
 % \end{quote}
 %
@@ -286,7 +304,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{grffile}%
-  [2006/08/17 v1.1 Extended file name support for graphics (HO)]
+  [2006/11/30 v1.2 Extended file name support for graphics (HO)]
 %    \end{macrocode}
 %
 % \subsection{Catcode stuff}
@@ -324,6 +342,7 @@ and the derived files
   prefix=grffile@
 }
 \DeclareBoolOption[true]{multidot}
+\DeclareBoolOption[true]{babel}
 \DeclareBoolOption[false]{extendedchars}
 \DeclareBoolOption{space}
 \DeclareDefaultOption{%
@@ -368,23 +387,27 @@ and the derived files
 %    \begin{macrocode}
 \let\grffile@org@Ginclude@graphics\Ginclude@graphics
 \renewcommand*{\Ginclude@graphics}{%
-  \ifgrffile@extendedchars
+  \ifnum0\ifgrffile@babel 1\fi\ifgrffile@extendedchars 1\fi>\z@
     \begingroup
 %    \end{macrocode}
 %    Support of babel's shorthand characters.
 %    \begin{macrocode}
-      \csname @safe@activestrue\endcsname
+      \ifgrffile@babel
+        \csname @safe@activestrue\endcsname
 %    \end{macrocode}
 %    Support of active tilde.
 %    \begin{macrocode}
-      \edef~{\string~}%
+        \edef~{\string~}%
 %    \end{macrocode}
 %    Support of characters controlled by package \xpackage{inputenc}.
 %    \begin{macrocode}
-      \grffile@inputenc@loop\^^A\^^H%
-      \grffile@inputenc@loop\^^K\^^K%
-      \grffile@inputenc@loop\^^N\^^_%
-      \grffile@inputenc@loop\^^?\^^ff%
+      \fi
+      \ifgrffile@extendedchars
+        \grffile@inputenc@loop\^^A\^^H%
+        \grffile@inputenc@loop\^^K\^^K%
+        \grffile@inputenc@loop\^^N\^^_%
+        \grffile@inputenc@loop\^^?\^^ff%
+      \fi
       \expandafter\grffile@extchar@Ginclude@graphics
   \else
     \expandafter\grffile@Ginclude@graphics
@@ -632,6 +655,11 @@ and the derived files
 %   \item
 %     Adaptation to version 2.3 of package \xpackage{kvoptions}.
 %   \end{Version}
+%   \begin{Version}{2006/11/30 v1.2}
+%   \item
+%     New option \xoption{babel}. Before this feature was part
+%     of option \xoption{extendedchars}.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex