summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/generic/babel-french
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-08 22:00:08 +0000
committerKarl Berry <karl@freefriends.org>2013-07-08 22:00:08 +0000
commit66a08e5e60528997c9a4a1df5cf5a66a0472245c (patch)
tree871c5a37577106f61a8fe2fd49c61cfc8a92847b /Master/texmf-dist/source/generic/babel-french
parent4550b1cb3cc63b73ebca0d72cafc0e7b8c6f9397 (diff)
babel-french (8jul13)
git-svn-id: svn://tug.org/texlive/trunk@31136 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/generic/babel-french')
-rw-r--r--Master/texmf-dist/source/generic/babel-french/frenchb.dtx21
1 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
index 3938e69cc6b..24426f35db4 100644
--- a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
+++ b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{2958}
+% \CheckSum{2955}
%
%\iffalse
% Tell the \LaTeX\ system who we are and write an entry on the
@@ -13,7 +13,7 @@
%<code>\ProvidesLanguage{frenchb}
%\fi
%\ProvidesFile{frenchb.dtx}
- [2013/06/19 v2.6d French support from the babel system]
+ [2013/07/06 v2.6e French support from the babel system]
%\iffalse
%<*dtx>
%%
@@ -38,6 +38,7 @@
\documentclass[a4paper]{ltxdoc}
\usepackage{url}
\usepackage[colorlinks,urlcolor=blue]{hyperref}
+\usepackage{bookmark}
\DeclareFontEncoding{T1}{}{}
\DeclareFontSubstitution{T1}{lmr}{m}{n}
\DeclareTextCommand{\guillemotleft}{OT1}{%
@@ -1722,12 +1723,13 @@
% preceding (e.g., |45\degres|) or following character
% (e.g., |20~\degres C|).
%
+% \changes{v2.6e}{2013/07/06}{Refrain from redefining \cs{textdegree}
+% from latin1.def, applemac.def, etc. as \cs{degres} because it
+% loops in hyperref's bookmarks. Pointed out by Eddy Flas on fctt.}
+%
% If \TeX{} Companion fonts are available (\file{textcomp.sty}),
-% we pick up |\textdegree| from them instead of using emulating
-% `degrees' from the |\r{}| accent. Otherwise we overwrite the
-% (poor) definition of |\textdegree| given in \file{latin1.def},
-% \file{applemac.def} etc.\ (called by \file{inputenc.sty}) by
-% our definition of |\degres|. We also advice the user (once only)
+% we pick up |\textdegree| from them instead of emulating `degrees'
+% from the |\r{}| accent. Otherwise we advise the user (once only)
% to use TS1-encoding.
%
% \changes{v2.1c}{2008/04/29}{Provide a temporary definition (hyperref
@@ -1753,8 +1755,7 @@
{\DeclareRobustCommand*{\degres}{%
\leavevmode\hbox to 0.3em{\hss\degre\hss}%
\Warning@degree@TSone
- \global\let\Warning@degree@TSone\relax}%
- \let\textdegree\degres}%
+ \global\let\Warning@degree@TSone\relax}}%
{\DeclareRobustCommand*{\degres}{%
\hbox{\UseTextSymbol{TS1}{\textdegree}}}}%
}
@@ -3158,7 +3159,7 @@
\fi
% \end{macrocode}
%
-% \changes{v2.4b}{2010/04/30}{Warning and set flag CompactItemize=false
+% \changes{v2.4b}{2010/04/30}{Warning and set flag CompactItemize false
% when the enumitem package is loaded (ensures compatibility).}
%
% \changes{v2.5k}{2012/12/27}{No warning if flag CompactItemize already