1 files changed, 95 insertions, 22 deletions
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