breakurl update (19dec07)

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

1 files changed, 24 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/latex/breakurl/breakurl.sty b/Master/texmf-dist/tex/latex/breakurl/breakurl.sty
index f3ac9267e27..e9bc21522f1 100644
--- a/Master/texmf-dist/tex/latex/breakurl/breakurl.sty
+++ b/Master/texmf-dist/tex/latex/breakurl/breakurl.sty
@@ -29,19 +29,37 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{breakurl}
-    [2006/08/26 v1.20 Breakable hyperref URLs]
+    [2007/12/18 v1.21 Breakable hyperref URLs]
 
 
+\RequirePackage{xkeyval}
+\RequirePackage{ifpdf}
+
+\ifpdf
+  % Dummy package options
+  \DeclareOptionX{preserveurlmacro}{}
+  \DeclareOptionX{hyphenbreaks}{}
+  \DeclareOptionX{vertfit}{}
+  \ProcessOptionsX\relax
+
+  \PackageWarning{breakurl}{%
+  You are using breakurl while processing via pdflatex.\MessageBreak
+  \string\burl\space will be just a synonym of \string\url.\MessageBreak}
+  \DeclareRobustCommand{\burl}{\url}
+  \DeclareRobustCommand*{\burlalt}{\hyper@normalise\burl@alt}
+  \def\burl@alt#1#2{\hyper@linkurl{\Hurl{#1}}{#2}}
+  \expandafter\endinput
+\fi
+
 \@ifpackageloaded{hyperref}{}{%
   \PackageError{breakurl}{The breakurl depends on hyperref package}%
-  {I can't do anything. Please type X <return>, edit the source file^^J%
+  {I can't do anything. Please type X <return>, edit the source file%
+  \MessageBreak
   and add \string\usepackage\string{hyperref\string} before
   \string\usepackage\string{breakurl\string}.}
   \endinput
 }
 
-\RequirePackage{xkeyval}
-
 \newif\if@preserveurlmacro\@preserveurlmacrofalse
 \newif\if@burl@fitstrut\@burl@fitstrutfalse
 \newif\if@burl@fitglobal\@burl@fitglobalfalse
@@ -94,7 +112,8 @@
   \else\def\burl@opt{global}\ifx\burl@temp\burl@opt
     \@burl@fitstrutfalse\@burl@fitglobaltrue
   \else
-    \PackageWarning{breakurl}{Unrecognized vertfit option `\burl@temp'.^^J%
+    \PackageWarning{breakurl}{Unrecognized vertfit option `\burl@temp'.%
+    \MessageBreak
     Adopting default `local'}
     \@burl@fitstrutfalse\@burl@fitglobalfalse
   \fi\fi\fi
@@ -108,14 +127,6 @@
 
 \ProcessOptionsX\relax
 
-\ifx\pdfoutput\undefined\else\ifx\pdfoutput\relax\else\ifcase\pdfoutput\else
-  \PackageWarning{breakurl}{%
-  You are using breakurl while processing via pdflatex.^^J%
-  \string\burl\space will be just a synonym of \string\url.^^J}
-  \DeclareRobustCommand{\burl}{\url}
-  \endinput
-\fi\fi\fi
-
 \def\burl@hyper@linkurl#1#2{%
   \begingroup
     \hyper@chars