From 02dce538759c2d2cfd8c184f1c52c021db0b0643 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Jan 2019 23:08:02 +0000 Subject: babel-french (30jan19) git-svn-id: svn://tug.org/texlive/trunk@49875 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/generic/babel-french/frenchb.dtx | 105 ++++++++++++--------- .../source/generic/babel-french/frenchb.ins | 2 +- 2 files changed, 63 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx index f377a67f6b5..6d45a57fd25 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{3710} +%\CheckSum{3724} % %\iffalse % Tell the LaTeX system who we are and write an entry on the @@ -13,12 +13,12 @@ %\ProvidesLanguage{frenchb} %--[[ % File `frenchb.lua’ generated from frenchb.dtx - [2018/09/14 v3.5c French support from the babel system] + [2019/01/30 v3.5d French support from the babel system] %<*internal> \iffalse % %<*lua> - Copyright © 2014-2018 Daniel Flipo + Copyright © 2014-2019 Daniel Flipo License LPPL: see french.ldf. --]] @@ -32,7 +32,7 @@ %<*dtx|french> %% %% Babel package for LaTeX version 2e -%% Copyright © 1996-2018 +%% Copyright © 1996-2019 %% by Daniel Flipo %% % @@ -134,8 +134,8 @@ % Changes between version 3.0 and \fileversion{} are listed in % subsection~\ref{ssec-changes} p.~\pageref{ssec-changes}. % -% An extensive documentation is available in French here:\\ -% \url{http://daniel.flipo.free.fr/frenchb} +% An extensive documentation in French (file \file{frenchb-doc.pdf}) is +% now included in \frenchb. % % \subsection{Basic interface} % @@ -267,7 +267,7 @@ % \item |\frenchdate|\marg{year}\marg{month}\marg{day} helps % typesetting dates in French: |\frenchdate{2001}{01}{01}| % will print 1\up{er} janvier 2001 in a box without any -% linebreak. +% linebreak.\label{frenchdate} % % \item A command |\up| is provided to typeset superscripts like % |M\up{me}| (abbreviation for ``Madame’’), |1\up{er}| (for @@ -426,13 +426,21 @@ % }}\par % Default French layout% % \hspace{\fill}With \fbo{ListItemsAsPar=true}% -% \item [ReduceListSpacing=false (true*)]; \frenchb{} reduces the -% values of the vertical spaces used in the \emph{all} list -% environments in French (this includes itemize, enumerate, -% description, but also abstract, quote, quotation and verse and -% possibly others). Setting this option to \fbo{false} -% reverts to the standard settings of the \env{list} -% environment. +% \item [StandardListSpacing=true (false*)]% +% \footnote{This option should be used instead of former option +% \fbo{ReduceListSpacing} (kept for backward compatibility) which +% could be misleading: with some classes (smfart, smfbook f.i.) +% you had to set \fbo{ReduceListSpacing=false} to revert to the +% class settings which actually reduce list’s spacings even more +% than \frenchb! \fbo{StandardListSpacing=true} replaces +% \fbo{ReduceListSpacing=false}.}; \frenchb{} customises +% the vertical spaces in the \env{list} environment, this affects +% all lists, including \env{itemize} \env{enumerate}, +% \env{description}, but also \env{abstract}, \env{quote}, +% \env{quotation}, \env{verse}, etc. which are based on \env{list}. +% Setting this option to \fbo{true} reverts to the standard +% settings of the \env{list} environment as defined by the document +% class. % \item [StandardItemizeEnv=true (false*)]; \frenchb{} redefines % the \env{itemize} environment to suppress any vertical space % between items of \env{itemize} lists in French and customises @@ -466,7 +474,7 @@ % customise any kind of list. Try the option \fbo{StandardLists} % in case of conflicts with classes or packages that customise % lists too. This option is just a shorthand setting all four -% options \fbo{ReduceListSpacing=false}, +% options \fbo{StandardListSpacing=true}, % \fbo{StandardItemizeEnv=true}, \fbo{StandardEnumerateEnv=true} % and \fbo{StandardItemLabels=true}. % \item [ListOldLayout=true (false)]; starting with version~2.6a, @@ -474,9 +482,6 @@ % and default itemize label (`---’ instead of `--’ up to~2.5k). % This option, provided for backward compatibility, displays % lists as they were up to version~2.5k. -% \item [CompactItemize=false (true*)]; is kept only for backward -% compatibility), it is replaced by \fbo{StandardItemizeEnv} and -% \fbo{StandardEnumerateEnv}. % % \item [FrenchFootnotes=false (true*)] reverts to the standard % layout of footnotes. By default \frenchb{} typesets leading @@ -693,15 +698,12 @@ % perform some basic tests about hyphenation in French. % For LaTeX2e I suggest this: % \begin{itemize} -% \item run |pdfLaTeX| on the following file, with the encoding -% suitable for your machine (\textit{my-encoding} will be |latin1| -% for Unix machines, |ansinew| for PCs running~Windows, -% |applemac| or |latin1| for Macintoshs, or |utf8|\dots\\[3mm]^^A\] +% \item run |pdfLaTeX| on the following file:\\[3mm]^^A\] % |%%% Test file for French hyphenation.|\\ % |\documentclass[french]{article}|\\ -% |\usepackage[|\textit{my-encoding}|]{inputenc}|\\ -% |\usepackage[T1]{fontenc} % Use LM fonts|\\ -% |\usepackage{lmodern} % for French|\\ +% |\usepackage[utf8]{inputenc} % utf8, what else?|\\ +% |\usepackage[T1]{fontenc} % mandatory for French|\\ +% |\usepackage{lmodern} % or erewhon, palatino…|\\ % |\usepackage{babel}|\\ % |\begin{document}|\\ % |\showhyphens{signal container \'ev\'enement alg\`ebre}|\\ @@ -746,10 +748,13 @@ % |\frquote{}|; it showed up when |\frquote{}| immediately followed % a sectionning command. % +% Starting with version 3.5d, a new option \fbo{StandarListSpacing} +% has been added to supersede \fbo{ReduceListSpacing}. +% % \subsubsection*{What’s new in version 3.4?} % % Version 3.4a adds a new command |\frenchdate| (see -% p.~\pageref{sssec-date}) and slightly changes number formatting: +% p.~\pageref{frenchdate}) and slightly changes number formatting: % |\FBthousandsep| is now a \textit{kern} instead of a rubber % length. |\renewcommand*{\FBthousandsep}{~}| will switch back % to the former (wrong) behaviour. @@ -838,6 +843,7 @@ % The best way to go is to upgrade to TL2016 or equivalent asap. % Xe(La)TeX and pdf(La)TeX users can safely use \frenchb{} v.~3.2b % and later on older installations too. +% \enlargethispage*{.5\baselineskip} % % Tne internals of commands |\NoAutoSpacing|, |\ttfamilyFB|, % |\rmfamilyFB| and |\sffamilyFB| have been completely redesigned @@ -4104,6 +4110,9 @@ return french_punctuation % \changes{v3.5a}{2018/07/04}{New option ListItemsAsPar for displaying % lists’ items ``as paragraphs’’.} % +% \changes{v3.5d}{2019/01/24}{ReduceListSpacing option depreciated: see +% StandarListSpacing.} +% % \begin{macrocode} \newcommand*{\frenchsetup}[1]{% \setkeys{FB}{#1}% @@ -4124,6 +4133,7 @@ return french_punctuation \newif\ifFBStandardLayout \FBStandardLayouttrue \newif\ifFBGlobalLayoutFrench \FBGlobalLayoutFrenchtrue \newif\ifFBReduceListSpacing +\newif\ifFBStandardListSpacing \FBStandardListSpacingtrue \newif\ifFBListOldLayout \newif\ifFBListItemsAsPar \newif\ifFBCompactItemize @@ -4225,14 +4235,14 @@ return french_punctuation \MessageBreak reported}}% {\@ifpackageloaded{beamerarticle}% {\FBStandardItemLabelsfalse - \FBReduceListSpacingtrue + \FBStandardListSpacingfalse \PackageInfo{french.ldf}{% Minimal list customisation for the beamerarticle% \MessageBreak package; reported}}% % \end{macrocode} % Otherwise customise lists ``à la française’’: % \begin{macrocode} - {\FBReduceListSpacingtrue + {\FBStandardListSpacingfalse \FBStandardItemizeEnvfalse \FBStandardEnumerateEnvfalse \FBStandardItemLabelsfalse}% @@ -4256,7 +4266,7 @@ return french_punctuation \define@key{FB}{StandardLayout}[true]% {\csname FBStandardLayout#1\endcsname \ifFBStandardLayout - \FBReduceListSpacingfalse + \FBStandardListSpacingtrue \FBStandardItemizeEnvtrue \FBStandardItemLabelstrue \FBStandardEnumerateEnvtrue @@ -4265,7 +4275,7 @@ return french_punctuation \FBAutoSpaceFootnotesfalse \FBGlobalLayoutFrenchfalse \else - \FBReduceListSpacingtrue + \FBStandardListSpacingfalse \FBStandardItemizeEnvfalse \FBStandardItemLabelsfalse \FBStandardEnumerateEnvfalse @@ -4293,7 +4303,12 @@ return french_punctuation \fi \fi}% \define@key{FB}{ReduceListSpacing}[true]% - {\csname FBReduceListSpacing#1\endcsname}% + {\csname FBReduceListSpacing#1\endcsname + \ifFBReduceListSpacing \FBStandardListSpacingfalse + \else \FBStandardListSpacingtrue\fi + }% + \define@key{FB}{StandardListSpacing}[true]% + {\csname FBStandardListSpacing#1\endcsname}% \define@key{FB}{ListOldLayout}[true]% {\csname FBListOldLayout#1\endcsname \ifFBListOldLayout @@ -4328,14 +4343,12 @@ return french_punctuation \define@key{FB}{StandardLists}[true]% {\csname FBStandardLists#1\endcsname \ifFBStandardLists - \FBReduceListSpacingfalse - \FBCompactItemizefalse + \FBStandardListSpacingtrue \FBStandardItemizeEnvtrue \FBStandardEnumerateEnvtrue \FBStandardItemLabelstrue \else - \FBReduceListSpacingtrue - \FBCompactItemizetrue + \FBStandardListSpacingfalse \FBStandardItemizeEnvfalse \FBStandardEnumerateEnvfalse \FBStandardItemLabelsfalse @@ -4838,7 +4851,7 @@ return french_punctuation PartNameFull=false [true]\MessageBreak IndentFirst=false [true]\MessageBreak ListItemsAsPar=true [false]\MessageBreak - ReduceListSpacing=false [true]\MessageBreak + StandardListSpacing=true [false]\MessageBreak StandardItemizeEnv=true [false]\MessageBreak StandardEnumerateEnv=true [false]\MessageBreak StandardItemLabels=true [false]\MessageBreak @@ -4854,7 +4867,6 @@ return french_punctuation \protect\ding{43},... [\textendash]\MessageBreak StandardLists=true [false]\MessageBreak ListOldLayout=true [false]\MessageBreak - CompactItemize=false [true]\MessageBreak FrenchFootnotes=false [true]\MessageBreak AutoSpaceFootnotes=false [true]\MessageBreak AutoSpacePunctuation=false [true]\MessageBreak @@ -4906,6 +4918,9 @@ return french_punctuation % \changes{v3.2g}{2017/01/24}{Add \cs{boi} to redefinitions for % bookmarks.} % +% \changes{v3.5d}{2018/12/16}{Add \cs{frquote} to redefinitions for +% bookmarks.} +% % Let’s redefine some commands in \file{hyperref}’s bookmarks. % \begin{macrocode} \ifdefined\pdfstringdefDisableCommands @@ -4928,6 +4943,7 @@ return french_punctuation \def\nos{n\degre\space}% \def\FB@og{\guillemotleft\space}% \def\FB@fg{\space\guillemotright}% + \def\frquote#1{\FB@og #1\FB@fg}% \def\at{@}% \def\circonflexe{\string^}% \def\tild{\string~}% @@ -5159,13 +5175,14 @@ return french_punctuation % % New environment for French itemize-lists.\\ |\FB@itemizesettings| % does two things: first suppress all vertical spaces including glue -% when option \fbo{ReduceListSpacing} is set, then set horizontal +% unless option \fbo{StandardListSpacing} is set, then set horizontal % indentations according to |\FB@listHsettings| unless option -% \fbo{ListOldLayout} is \fbo{true} (compatibility with lists up to -% v.~2.5k). +% \fbo{ListOldLayout} is \fbo{true} (compatibility with lists +% up to v.~2.5k). % \begin{macrocode} \def\FB@itemizesettings{% - \ifFBReduceListSpacing + \ifFBStandardListSpacing + \else \setlength{\itemsep}{\z@}% \setlength{\parsep}{\z@}% \setlength{\topsep}{\z@}% @@ -5322,7 +5339,8 @@ return french_punctuation % \begin{macrocode} \def\update@frenchlists{% \setlistindentFB - \ifFBReduceListSpacing \let\list\listFB \fi + \ifFBStandardListSpacing + \else \let\list\listFB \fi \ifFBStandardItemizeEnv \else \let\itemize\itemizeFB \fi \ifFBStandardItemLabels @@ -5596,7 +5614,8 @@ return french_punctuation % inside \cs{@makefntext}. Needed by \cs{frquote}.} % % \changes{v3.5c}{2018/09/13}{Remove grouping inside \cs{@makefntext}, -% \cs{localleftbox} and \cs{FBeverypar@quote} reset instead.} +% \cs{localleftbox} and \cs{FBeverypar@quote} saved and restored +% instead.} % % The LuaTeX command |\localleftbox| and |\FBeverypar@quote| used % by |\frquote{}| have to be reset inside footnotes; done for LaTeX diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.ins b/Master/texmf-dist/source/generic/babel-french/frenchb.ins index 50bc429261c..203ea2a6cc8 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.ins +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.ins @@ -2,7 +2,7 @@ %% This file will generate fast loadable files and documentation driver %% files from the doc files in this package when run through LuaTeX. %% -%% Copyright 2001-2018 Daniel Flipo. All rights reserved. +%% Copyright 2001-2019 Daniel Flipo. All rights reserved. %% %% This is a generated file part of the the babel-french bundle %% to be used with the Babel system. -- cgit v1.2.3