xurl (9dec18)

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

4 files changed, 60 insertions, 4 deletions

diff --git a/Master/texmf-dist/doc/latex/xurl/Changes b/Master/texmf-dist/doc/latex/xurl/Changes
index f577f9c44a1..2228bee824a 100644
--- a/Master/texmf-dist/doc/latex/xurl/Changes
+++ b/Master/texmf-dist/doc/latex/xurl/Changes
@@ -1,3 +1,4 @@
+0.05  2018-12-08  - added support for biblatex
 0.04  2018-06-02  - change \Urlmuskip to allow stretchability
 0.03  2018-01-09  - added UrlOrd characters
 0.02  2017-12-20  - first CTAN version
diff --git a/Master/texmf-dist/doc/latex/xurl/xurl.pdf b/Master/texmf-dist/doc/latex/xurl/xurl.pdf
index 8e389d9426f..c84bb84a0de 100644
--- a/Master/texmf-dist/doc/latex/xurl/xurl.pdf
+++ b/Master/texmf-dist/doc/latex/xurl/xurl.pdf
diff --git a/Master/texmf-dist/doc/latex/xurl/xurl.tex b/Master/texmf-dist/doc/latex/xurl/xurl.tex
index 760867911a7..a2ec6766147 100644
--- a/Master/texmf-dist/doc/latex/xurl/xurl.tex
+++ b/Master/texmf-dist/doc/latex/xurl/xurl.tex
@@ -1,7 +1,17 @@
 %% $Id: xltabular-doc.tex 635 2017-10-24 18:22:59Z herbert $
 %
 \listfiles\setcounter{errorcontextlines}{100}
-\documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-,
+\RequirePackage{filecontents}
+\begin{filecontents*}{\jobname.bib}
+@online{asdf,
+  sortname={BSI},label={BSI},
+  organization={BSI (Bundesamt für Sicherheit in der Informationstechnik)},
+  title={Angaben des BSI für die Algorithmenkataloge der Vorjahre, Empfehlungen zur Wahl der Schlüssellängen},
+  date={2016},
+  url={https://www.bundesnetzagentur.de/DE/Service-Funktionen/ElektronischeVertrauensdienste/HinweiseEmpfehlungen/Empfehlungen/Empfehlungen_node.html},
+}
+\end{filecontents*}
+\documentclass[paper=a4,fontsize=11pt,DIV=14,parskip=half-,
                captions=tableabove,twoside=on]{scrartcl}
 \usepackage{fontspec}
 %\usepackage[%usefilenames,
@@ -31,6 +41,9 @@
 \automark*[subsection]{}
 \pagestyle{scrheadings}
 
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+
 %\usepackage{selnolig}
 %\nolig{oe}{o|e}
 
@@ -40,6 +53,7 @@
 \begin{document}
 \maketitle
 
+\section{How it works}
 Package xurl loads package url by default and defines
 possible url breaks for all alphanumerical characters
 and \verb|= / . : * - ~ ' "| 
@@ -73,7 +87,35 @@ some text \url{iszv://dsf.tqsdatmdtdls.ctm/cudfsdvqfqll-ocd/bdcbcfqlf-lcclldh/cb
 and another url: \url{koff://osb.ccdngagkkg.raa/qrkxzvi/dxfsiaa/xidf-lata-dgdqmhp-uoxdl-vst-vcsbhl-aisdsasih-skl-aezb-fhixvyy-qqlachd-achhfc-koe-xgfqp-iyplcu-1.696884}
 \end{minipage}}
 
+\section{Using \texttt{biblatex}}
+Package \texttt{biblatex} has it's own url handling. If you want the the same behaviour as \texttt{xurl} has, you have to
+set 
+
+\begin{verbatim}
+\setcounter{biburllcpenalty}{1}
+\setcounter{biburlucpenalty}{1}
+\setcounter{biburlnumpenalty}{1}
+\end{verbatim}
+
+However, if you load \texttt{xurl} \emph{after} \texttt{biblatex} then it is done
+by default. Compare the following bibliographies. IF you do not want that \texttt{xurl}
+should set these counters, then load the package \emph{before} \texttt{biblatex} or
+use the optional argument \texttt{nobiblatex}:
+
+\begin{verbatim}
+\usepackage[...]{biblatex}
+\usepackage[nobiblatex]{xurl}
+\end{verbatim}
+
+\nocite{*}
+
+\printbibliography[title={With urlbreaks}]
+
+\setcounter{biburllcpenalty}{0}
+\setcounter{biburlucpenalty}{0}
+\setcounter{biburlnumpenalty}{0}
 
+\printbibliography[title={xurl with option nobiblatex}]
 
 \end{document}
 
diff --git a/Master/texmf-dist/tex/latex/xurl/xurl.sty b/Master/texmf-dist/tex/latex/xurl/xurl.sty
index 098e59b3529..0724dc27b71 100644
--- a/Master/texmf-dist/tex/latex/xurl/xurl.sty
+++ b/Master/texmf-dist/tex/latex/xurl/xurl.sty
@@ -1,4 +1,4 @@
-%% $Id: xurl.sty 705 2018-01-09 08:16:14Z herbert $
+%% $Id: xurl.sty 849 2018-12-08 09:00:57Z herbert $
 %%
 %% This is file `xurl.sty',
 %%
@@ -16,13 +16,24 @@
 %%   `xurl' is a package for extended URL breaks
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xurl}[2018/06/02 v 0.04 modify URL breaks]
+\ProvidesPackage{xurl}[2018/12/08 v 0.05 modify URL breaks]
+
+\newif\if@no@biblatex \@no@biblatexfalse
+\DeclareOption{nobiblatex}{\@no@biblatextrue}
 
 \DeclareOption*{\PassOptionsToPackage\CurrentOption{url}}
 \ProcessOptions\relax
 %
 \RequirePackage{url}
 %
+\if@no@biblatex\else
+  \@ifpackageloaded{biblatex}{%
+    \setcounter{biburllcpenalty}{1}%
+    \setcounter{biburlucpenalty}{1}%
+    \setcounter{biburlnumpenalty}{1}%
+  }{}       % biblatex has it's own url handling
+\fi
+%
 \def\UrlBreaks{%
   \do\/%
   \do\a\do\b\do\c\do\d\do\e\do\f\do\g\do\h\do\i\do\j\do\k\do\l%
@@ -34,6 +45,8 @@
 %
 \Urlmuskip=0mu plus 0.1mu
 %
+%
+
 \endinput
 
 \def\UrlSpecials{%
@@ -101,7 +114,7 @@
   \do\'{'\penalty\UrlBreakPenalty}%
   \do\"{"\penalty\UrlBreakPenalty}%
 }
-\fi
+%\fi
 %