summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-ascii.ldf133
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-utf8.ldf133
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-french/datetime2-french.ldf117
3 files changed, 355 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-ascii.ldf b/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-ascii.ldf
index e70848a9735..623f548d0e7 100644
--- a/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-ascii.ldf
+++ b/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-ascii.ldf
@@ -8,16 +8,19 @@
%%
%% datetime2-french.dtx
%% Copyright 2015 Nicola Talbot
+%% Copyright 2017 Paul A. Patience <pap@papatience.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license of (at your option) any later version.
+%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `inactive'.
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Paul A. Patience.
%%
%% This work consists of the files datetime2-french.dtx and
%% datetime2-french.ins and the derived files
@@ -39,7 +42,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{french-ascii}[2015/03/27 v1.0]
+\ProvidesDateTimeModule{french-ascii}[2017/04/08 v1.02]
\ifdef\ier
{%
\newcommand*{\DTMfrenchordinal}[1]{%
@@ -109,6 +112,62 @@
D\protect\'ecembre%
\fi
}
+\newcommand*{\DTMfrenchshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ janv.%
+ \or
+ f\protect\'evr.%
+ \or
+ mars%
+ \or
+ avr.%
+ \or
+ mai%
+ \or
+ juin%
+ \or
+ juill.%
+ \or
+ ao\protect\^ut%
+ \or
+ sept.%
+ \or
+ oct.%
+ \or
+ nov.%
+ \or
+ d\protect\'ec.%
+ \fi
+}
+\newcommand*{\DTMfrenchshortMonthname}[1]{%
+ \ifcase#1
+ \or
+ Janv.%
+ \or
+ F\protect\'evr.%
+ \or
+ Mars%
+ \or
+ Avr.%
+ \or
+ Mai%
+ \or
+ Juin%
+ \or
+ Juill.%
+ \or
+ Ao\protect\^ut%
+ \or
+ Sept.%
+ \or
+ Oct.%
+ \or
+ Nov.%
+ \or
+ D\protect\'ec.%
+ \fi
+}
\newcommand*{\DTMfrenchweekdayname}[1]{%
\ifcase#1
lundi%
@@ -143,6 +202,74 @@
Dimanche%
\fi
}
+\newcommand*{\DTMfrenchshortweekdayname}[1]{%
+ \ifcase#1
+ lun.%
+ \or
+ mar.%
+ \or
+ mer.%
+ \or
+ jeu.%
+ \or
+ ven.%
+ \or
+ sam.%
+ \or
+ dim.%
+ \fi
+}
+\newcommand*{\DTMfrenchshortWeekdayname}[1]{%
+ \ifcase#1
+ Lun.%
+ \or
+ Mar.%
+ \or
+ Mer.%
+ \or
+ Jeu.%
+ \or
+ Ven.%
+ \or
+ Sam.%
+ \or
+ Dim.%
+ \fi
+}
+\newcommand*\DTMfrenchmidnight{minuit}%
+\newcommand*\DTMfrenchnoon{midi}%
+\newcommand*\DTMfrenchtimesymsep{\,}%
+\newcommand*\DTMfrenchhoursym{h}%
+\DTMnewtimestyle
+ {frenchalpha}% label
+ {%
+ \renewcommand*\DTMdisplaytime[3]{%
+ \ifnum##2=0
+ \ifnum##1=12
+ \DTMfrenchnoon
+ \else
+ \ifnum##1=0
+ \DTMfrenchmidnight
+ \else
+ \ifnum##1=24
+ \DTMfrenchmidnight
+ \else
+ \number##1
+ \DTMfrenchtimesymsep\DTMfrenchhoursym
+ \fi
+ \fi
+ \fi
+ \else
+ \ifnum##1=24
+ 0%
+ \else
+ \number##1
+ \fi
+ \DTMfrenchtimesymsep\DTMfrenchhoursym
+ \DTMfrenchtimesymsep\DTMtwodigits{##2}%
+ \fi
+ }%
+ }%
\endinput
%%
%% End of file `datetime2-french-ascii.ldf'.
diff --git a/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-utf8.ldf b/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-utf8.ldf
index 8d68d1ff60e..7059e81af21 100644
--- a/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-utf8.ldf
+++ b/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french-utf8.ldf
@@ -8,16 +8,19 @@
%%
%% datetime2-french.dtx
%% Copyright 2015 Nicola Talbot
+%% Copyright 2017 Paul A. Patience <pap@papatience.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license of (at your option) any later version.
+%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `inactive'.
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Paul A. Patience.
%%
%% This work consists of the files datetime2-french.dtx and
%% datetime2-french.ins and the derived files
@@ -39,7 +42,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{french-utf8}[2015/03/27 v1.0]
+\ProvidesDateTimeModule{french-utf8}[2017/04/08 v1.02]
\ifdef\ier
{%
\newcommand*{\DTMfrenchordinal}[1]{%
@@ -109,6 +112,62 @@
Décembre%
\fi
}
+\newcommand*{\DTMfrenchshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ janv.%
+ \or
+ févr.%
+ \or
+ mars%
+ \or
+ avr.%
+ \or
+ mai%
+ \or
+ juin%
+ \or
+ juill.%
+ \or
+ août%
+ \or
+ sept.%
+ \or
+ oct.%
+ \or
+ nov.%
+ \or
+ déc.%
+ \fi
+}
+\newcommand*{\DTMfrenchshortMonthname}[1]{%
+ \ifcase#1
+ \or
+ Janv.%
+ \or
+ Févr.%
+ \or
+ Mars%
+ \or
+ Avr.%
+ \or
+ Mai%
+ \or
+ Juin%
+ \or
+ Juill.%
+ \or
+ Août%
+ \or
+ Sept.%
+ \or
+ Oct.%
+ \or
+ Nov.%
+ \or
+ Déc.%
+ \fi
+}
\newcommand*{\DTMfrenchweekdayname}[1]{%
\ifcase#1
lundi%
@@ -143,6 +202,74 @@
Dimanche%
\fi
}
+\newcommand*{\DTMfrenchshortweekdayname}[1]{%
+ \ifcase#1
+ lun.%
+ \or
+ mar.%
+ \or
+ mer.%
+ \or
+ jeu.%
+ \or
+ ven.%
+ \or
+ sam.%
+ \or
+ dim.%
+ \fi
+}
+\newcommand*{\DTMfrenchshortWeekdayname}[1]{%
+ \ifcase#1
+ Lun.%
+ \or
+ Mar.%
+ \or
+ Mer.%
+ \or
+ Jeu.%
+ \or
+ Ven.%
+ \or
+ Sam.%
+ \or
+ Dim.%
+ \fi
+}
+\newcommand*\DTMfrenchmidnight{minuit}%
+\newcommand*\DTMfrenchnoon{midi}%
+\newcommand*\DTMfrenchtimesymsep{\,}%
+\newcommand*\DTMfrenchhoursym{h}%
+\DTMnewtimestyle
+ {frenchalpha}% label
+ {%
+ \renewcommand*\DTMdisplaytime[3]{%
+ \ifnum##2=0
+ \ifnum##1=12
+ \DTMfrenchnoon
+ \else
+ \ifnum##1=0
+ \DTMfrenchmidnight
+ \else
+ \ifnum##1=24
+ \DTMfrenchmidnight
+ \else
+ \number##1
+ \DTMfrenchtimesymsep\DTMfrenchhoursym
+ \fi
+ \fi
+ \fi
+ \else
+ \ifnum##1=24
+ 0%
+ \else
+ \number##1
+ \fi
+ \DTMfrenchtimesymsep\DTMfrenchhoursym
+ \DTMfrenchtimesymsep\DTMtwodigits{##2}%
+ \fi
+ }%
+ }%
\endinput
%%
%% End of file `datetime2-french-utf8.ldf'.
diff --git a/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french.ldf b/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french.ldf
index f2eecc9d57a..34ff9ed6bfe 100644
--- a/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french.ldf
+++ b/Master/texmf-dist/tex/latex/datetime2-french/datetime2-french.ldf
@@ -8,16 +8,19 @@
%%
%% datetime2-french.dtx
%% Copyright 2015 Nicola Talbot
+%% Copyright 2017 Paul A. Patience <pap@papatience.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license of (at your option) any later version.
+%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `inactive'.
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Paul A. Patience.
%%
%% This work consists of the files datetime2-french.dtx and
%% datetime2-french.ins and the derived files
@@ -39,7 +42,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{french}[2015/03/27 v1.0]
+\ProvidesDateTimeModule{french}[2017/04/08 v1.02]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{french-utf8}
@@ -50,18 +53,24 @@
\RequireDateTimeModule{french-ascii}
\fi
\fi
-\newcommand*{\DTMfrenchdaymonthsep}{\space}
+\newcommand*{\DTMfrenchdowdaysep}{\space}
+\newcommand*{\DTMfrenchdaymonthsep}{%
+ \DTMtexorpdfstring{\protect~}{\space}%
+}
\newcommand*{\DTMfrenchmonthyearsep}{\space}
-\newcommand*{\DTMfrenchdatetimesep}{\space}
+\newcommand*{\DTMfrenchdatetimesep}{,\space}
\newcommand*{\DTMfrenchtimezonesep}{\space}
\newcommand*{\DTMfrenchdatesep}{/}
\newcommand*{\DTMfrenchtimesep}{:}
+\DTMdefkey{french}{dowdaysep}{\renewcommand*{\DTMfrenchdowdaysep}{#1}}
\DTMdefkey{french}{daymonthsep}{\renewcommand*{\DTMfrenchdaymonthsep}{#1}}
\DTMdefkey{french}{monthyearsep}{\renewcommand*{\DTMfrenchmonthyearsep}{#1}}
\DTMdefkey{french}{datetimesep}{\renewcommand*{\DTMfrenchdatetimesep}{#1}}
\DTMdefkey{french}{timezonesep}{\renewcommand*{\DTMfrenchtimezonesep}{#1}}
\DTMdefkey{french}{datesep}{\renewcommand*{\DTMfrenchdatesep}{#1}}
\DTMdefkey{french}{timesep}{\renewcommand*{\DTMfrenchtimesep}{#1}}
+\DTMdefboolkey{french}{abbr}[true]{}
+\DTMsetbool{french}{abbr}{false}
\DTMdefboolkey{french}{mapzone}[true]{}
\DTMsetbool{french}{mapzone}{true}
\DTMdefboolkey{french}{showdayofmonth}[true]{}
@@ -72,24 +81,23 @@
{french}% label
{% date style
\renewcommand*\DTMdisplaydate[4]{%
- \DTMifbool{french}{showdayofmonth}
- {\DTMfrenchordinal{##3}\DTMfrenchdaymonthsep}%
- {}%
- \DTMfrenchmonthname{##2}%
- \DTMifbool{french}{showyear}%
+ \ifDTMshowdow
+ \ifnum##4>-1
+ \DTMifbool{french}{abbr}%
+ {\DTMfrenchshortweekdayname{##4}}%
+ {\DTMfrenchweekdayname{##4}}%
+ \DTMfrenchdowdaysep
+ \fi
+ \fi
+ \DTMifbool{french}{showdayofmonth}%
{%
- \DTMfrenchmonthyearsep
- \number##1 % space intended
+ \DTMfrenchordinal{##3}%
+ \DTMfrenchdaymonthsep
}%
{}%
- }%
- \renewcommand*\DTMDisplaydate[4]{%
- \DTMifbool{french}{showdayofmonth}
- {%
- \DTMfrenchordinal{##3}\DTMfrenchdaymonthsep
- \DTMfrenchmonthname{##2}%
- }%
- {\DTMfrenchMonthname{##2}}%
+ \DTMifbool{french}{abbr}%
+ {\DTMfrenchshortmonthname{##2}}%
+ {\DTMfrenchmonthname{##2}}%
\DTMifbool{french}{showyear}%
{%
\DTMfrenchmonthyearsep
@@ -97,9 +105,74 @@
}%
{}%
}%
+ \renewcommand*\DTMDisplaydate[4]{%
+ \ifDTMshowdow
+ \ifnum##4>-1
+ \DTMifbool{french}{abbr}%
+ {\DTMfrenchshortWeekdayname{##4}}%
+ {\DTMfrenchWeekdayname{##4}}%
+ \DTMfrenchdowdaysep
+ \DTMifbool{french}{showdayofmonth}%
+ {%
+ \DTMfrenchordinal{##3}%
+ \DTMfrenchdaymonthsep
+ }%
+ {}%
+ \DTMifbool{french}{abbr}%
+ {\DTMfrenchshortmonthname{##2}}%
+ {\DTMfrenchmonthname{##2}}%
+ \DTMifbool{french}{showyear}%
+ {%
+ \DTMfrenchmonthyearsep
+ \number##1 % space intended
+ }%
+ {}%
+ \else
+ \DTMifbool{french}{showdayofmonth}
+ {%
+ \DTMfrenchordinal{##3}%
+ \DTMfrenchdaymonthsep
+ \DTMifbool{french}{abbr}%
+ {\DTMfrenchshortmonthname{##2}}%
+ {\DTMfrenchmonthname{##2}}%
+ }%
+ {%
+ \DTMifbool{french}{abbr}%
+ {\DTMfrenchshortMonthname{##2}}%
+ {\DTMfrenchMonthname{##2}}%
+ }%
+ \DTMifbool{french}{showyear}%
+ {%
+ \DTMfrenchmonthyearsep
+ \number##1 % space intended
+ }%
+ {}%
+ \fi
+ \else
+ \DTMifbool{french}{showdayofmonth}
+ {%
+ \DTMfrenchordinal{##3}%
+ \DTMfrenchdaymonthsep
+ \DTMifbool{french}{abbr}%
+ {\DTMfrenchshortmonthname{##2}}%
+ {\DTMfrenchmonthname{##2}}%
+ }%
+ {%
+ \DTMifbool{french}{abbr}%
+ {\DTMfrenchshortMonthname{##2}}%
+ {\DTMfrenchMonthname{##2}}%
+ }%
+ \DTMifbool{french}{showyear}%
+ {%
+ \DTMfrenchmonthyearsep
+ \number##1 % space intended
+ }%
+ {}%
+ \fi
+ }%
}%
- {% time style (use default)
- \DTMsettimestyle{default}%
+ {% time style
+ \DTMsettimestyle{frenchalpha}%
}%
{% zone style
\DTMresetzones