diff options
Diffstat (limited to 'Master/texmf-dist/source')
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.dtx | 92 | ||||
| -rw-r--r-- | Master/texmf-dist/source/generic/babel-french/frenchb.ins | 2 |
2 files changed, 55 insertions, 39 deletions
diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.dtx b/Master/texmf-dist/source/generic/babel-french/frenchb.dtx index ea6c7473898..f377a67f6b5 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{3714} +%\CheckSum{3710} % %\iffalse % Tell the LaTeX system who we are and write an entry on the @@ -13,7 +13,7 @@ %<frenchb>\ProvidesLanguage{frenchb} %<lua>--[[ %<lua> File `frenchb.lua’ generated from frenchb.dtx - [2018/07/17 v3.5b French support from the babel system] + [2018/09/14 v3.5c French support from the babel system] %<*internal> \iffalse %</internal> @@ -784,7 +784,7 @@ % A new experimental option \fbo{UnicodeNoBreakSpaces} has been % added for LuaLaTeX in version~3.3c, see p.~\pageref{ucs-nbsp}. % -% According to current \babel's standards, every dialect should +% According to current \babel’s standards, every dialect should % have it’s own \file{.ldf} file; starting with version~3.3b, % the main support for French is in \file{french.ldf}, portmanteau % files \file{frenchb.ldf},\file{francais.ldf}, \file{acadian.ldf} @@ -1102,7 +1102,7 @@ % \end{macro} % \end{macro} % -% \changes{v3.3b}{2017/07/08}{New `if' \cs{ifFBfrench} to replace +% \changes{v3.3b}{2017/07/08}{New `if’ \cs{ifFBfrench} to replace % \cs{iflanguage} test which is based on patterns.} % % \begin{macro}{\ifFBfrench} @@ -1129,9 +1129,9 @@ % The macro |\noextrasfrench| is used to cancel the actions of % |\extrasfrench|. % -% In French, character ``apostrophe’’ is a letter in expressions -% like |l’ambulance| (French hyphenation patterns provide entries -% for this kind of words). This means that the |\lccode| of +% In French, character ``apostrophe’’ (U+27 or U+2019) is a letter in +% expressions like |l’ambulance| (French hyphenation patterns provide +% entries for this kind of words). This means that the |\lccode| of % ``apostrophe’’ has to be non null in French for proper hyphenation % of those expressions, and has to be reset to null when exiting % French. @@ -1140,15 +1140,17 @@ % |d’aventure|, |l’utopie|, with all TeX engines (XeTeX, LuaTeX, % pdfTeX) using \file{hyph-fr.tex} patterns. % +% \changes{v3.5c}{2018/09/11}{\cs{lccode} of quote 0x27 changed from +% 0x2019 to 0x27 for Unicode engines.} +% % \begin{macrocode} \def\extrasfrench{% \FBfrenchtrue - \babel@savevariable{\lccode`\'}% + \babel@savevariable{\lccode"27}% + \lccode"27="27 \ifFBunicode - \babel@savevariable{\lccode"2019}% - \lccode`\'="2019\lccode"2019="2019 - \else - \lccode`\'=`\' + \babel@savevariable{\lccode"2019}% + \lccode"2019="2019 \fi } \def\noextrasfrench{\FBfrenchfalse} @@ -1595,8 +1597,8 @@ % \changes{v3.1a}{2014/06/16}{Codes 0x13 and 0x14 added for French % quotes in T1-encoding.} % -% \changes{v3.3c}{2017/09/07}{Function `get\_glue' robustified. -% `french\_punctuation' can insert Unicode characters instead +% \changes{v3.3c}{2017/09/07}{Function `get\_glue’ robustified. +% `french\_punctuation’ can insert Unicode characters instead % of glues.} % % \begin{macrocode} @@ -1667,8 +1669,8 @@ local insert_node_after = node.insert_after local remove_node = node.remove % \end{macrocode} % -%\changes{v3.4a}{2018/01/26}{Global `FBsp' table added; local function -% `get\_glue' changed into global `FBget\_glue'.} +%\changes{v3.4a}{2018/01/26}{Global `FBsp’ table added; local function +% `get\_glue’ changed into global `FBget\_glue’.} % % Commands |\FBthinspace|, |\FBcolonspace| and |\FBguillspace| are % converted `AtBeginDocument’ by the next function |FBget_glue| into @@ -2758,8 +2760,9 @@ return french_punctuation % % \begin{macrocode} \ifLaTeXe - \def\bbl@frenchguillemets{\renewcommand*{\og}{\FB@og}% - \renewcommand*{\fg}{\FB@fg\xspace}} + \def\bbl@frenchguillemets{% + \renewcommand*{\og}{\FB@og}% + \renewcommand*{\fg}{\FB@fg\xspace}} \renewcommand*{\og}{\textquotedblleft} \renewcommand*{\fg}{\ifdim\lastskip>\z@\unskip\fi \textquotedblright\xspace} @@ -2879,6 +2882,9 @@ return french_punctuation % \changes{v3.1i}{2015/10/04}{\cs{luatexlocalleftbox} changed to % \cs{localleftbox} by new LaTeX release 2015/10/01.} % +% \changes{v3.5c}{2018/09/14}{\cs{FBeverypar@quote}’s value now properly +% reset across level changes.} +% % \begin{macrocode} \ifx\FBeverylineguill\FBguillopen \def\FBeveryline@quote{\guillemotleft\FB@guillspace}% @@ -2929,9 +2935,11 @@ return french_punctuation % Closing: step down |\FBguill@level| and clean on exit. % \begin{macrocode} \advance\FBguill@level by \m@ne - \let\FBeverypar@quote\relax - \let\FBeveryline@quote\empty - \ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi + \ifcase\FBguill@level \let\FBeverypar@quote\relax + \or \def\FBeverypar@quote{\FBeveryparguill\FB@guillspace}% + \let\FBeveryline@quote\empty + \ifx\FBeverylineguill\FBguillnone\else\localleftbox{}\fi + \fi } % \end{macrocode} % \end{macro} @@ -2971,7 +2979,7 @@ return french_punctuation % both language options \opt{french} and \opt{acadian} are supplied % to \babel. Note that coding |\StartBabelCommands*{french,acadian}| % would \emph{only} define |\csname date\CurrentOption\endcsname|, -% leaving the second language undefined in \babel's sens. +% leaving the second language undefined in \babel’s sens. % \begin{macrocode} \def\BabelLanguages{french,acadian} \StartBabelCommands*{\BabelLanguages}{date} @@ -4094,7 +4102,7 @@ return french_punctuation % longer delayed AtBeginDocument.} % % \changes{v3.5a}{2018/07/04}{New option ListItemsAsPar for displaying -% lists' items ``as paragraphs''.} +% lists’ items ``as paragraphs’’.} % % \begin{macrocode} \newcommand*{\frenchsetup}[1]{% @@ -4432,7 +4440,7 @@ return french_punctuation \fi}% % \end{macrocode} % -% \changes{v3.3c}{2017/07/23}{New option `UnicodeNoBreakSpaces' for +% \changes{v3.3c}{2017/07/23}{New option `UnicodeNoBreakSpaces’ for % html translators (LuaLaTeX only).} % % Option \fbo{UnicodeNoBreakSpaces} (LuaLaTeX only) is meant for @@ -5587,6 +5595,9 @@ return french_punctuation % \changes{v3.5b}{2018/07/17}{Reset \cs{FBeverypar@quote} locally % 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.} +% % The LuaTeX command |\localleftbox| and |\FBeverypar@quote| used % by |\frquote{}| have to be reset inside footnotes; done for LaTeX % based formats only. @@ -5612,25 +5623,23 @@ return french_punctuation % \begin{macrocode} \let\@@makefnmarkORI\@@makefnmark \long\def\@makefntext#1{% + \localleftbox{}% + \let\FBeverypar@save\FBeverypar@quote + \let\FBeverypar@quote\relax \ifFBFrenchFootnotes \ifx\footnote\thanks \let\@@makefnmark\@@makefnmarkTH - \begingroup\localleftbox{}\let\FBeverypar@quote\relax - \@makefntextTH{#1}\endgroup + \@makefntextTH{#1} \else \let\@@makefnmark\@@makefnmarkFB - \begingroup\localleftbox{}\let\FBeverypar@quote\relax - \@makefntextFB{#1}\endgroup + \@makefntextFB{#1} \fi \else - \localleftbox{}% - \let\FBeverypar@save\FBeverypar@quote - \let\FBeverypar@quote\relax \let\@@makefnmark\@@makefnmarkORI \@makefntextORI{#1}% - \let\FBeverypar@quote\FBeverypar@save - \localleftbox{\FBeveryline@quote}% - \fi}% + \fi + \let\FBeverypar@quote\FBeverypar@save + \localleftbox{\FBeveryline@quote}}% \else % \end{macrocode} % Special add-on for the \cls{memoir} class: |\maketitle| redefines @@ -5658,17 +5667,19 @@ return french_punctuation \fi }{}% % \end{macrocode} -% Definition of |\@makefntext| for all classes other than -% koma-script: +% Definition of |\@makefntext| for all other classes: % \begin{macrocode} - \long\def\@makefntext#1{\begingroup + \long\def\@makefntext#1{% \localleftbox{}% + \let\FBeverypar@save\FBeverypar@quote \let\FBeverypar@quote\relax \ifFBFrenchFootnotes \@makefntextFB{#1}% \else \@makefntextORI{#1}% - \fi\endgroup}% + \fi + \let\FBeverypar@quote\FBeverypar@save + \localleftbox{\FBeveryline@quote}}% \fi }% } @@ -5821,3 +5832,8 @@ return french_punctuation %</!lua> % \fi \endinput + +%%% Local Variables: +%%% fill-column: 72 +%%% coding: utf-8 +%%% End: diff --git a/Master/texmf-dist/source/generic/babel-french/frenchb.ins b/Master/texmf-dist/source/generic/babel-french/frenchb.ins index e33558d2485..50bc429261c 100644 --- a/Master/texmf-dist/source/generic/babel-french/frenchb.ins +++ b/Master/texmf-dist/source/generic/babel-french/frenchb.ins @@ -34,7 +34,7 @@ \fi} \declarepreamble\mainpreamble -This is a generated file part of the the babel-french bundle +This is a generated file part of the babel-french bundle to be used with the Babel system. ------------------------------------------------------------- |