1 files changed, 53 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
index 298d948840b..becb278054c 100644
--- a/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
+++ b/Master/texmf-dist/tex/latex/biblatex/lbx/french.lbx
@@ -8,7 +8,6 @@
 \DeclareBibliographyExtras{%
   \protected\def\bibrangedash{%
     \textendash\penalty\hyphenpenalty}% breakable dash
-  \protected\def\bibdatedash{\bibrangedash}%
   \let\finalandcomma=\empty
   \let\finalandsemicolon=\empty
   \def\mkbibordinal{\mkbibmascord}%
@@ -27,17 +26,21 @@
       {}
       {\mkbibmonth{\thefield{#2}}%
        \iffieldundef{#1}{}{\space}}%
-    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\stripzeros{\thefield{#1}}}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\dateeraprintpre{#1}\stripzeros{\thefield{#1}}}}%
   \protected\def\mkbibdateshort#1#2#3{%
     \iffieldundef{#3}
       {}
-      {\mkdatezeros{\thefield{#3}}%
+      {\mkdayzeros{\thefield{#3}}%
        \iffieldundef{#2}{}{/}}%
     \iffieldundef{#2}
       {}
-      {\mkdatezeros{\thefield{#2}}%
+      {\mkmonthzeros{\thefield{#2}}%
        \iffieldundef{#1}{}{/}}%
-    \iffieldbibstring{#1}{\bibstring{\thefield{#1}}}{\mkdatezeros{\thefield{#1}}}}%
+    \iffieldbibstring{#1}
+      {\bibstring{\thefield{#1}}}
+      {\dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}}%
   \providecommand*{\FDP@thinspace}{\addnbthinspace}% FDP@* -> frenchb.ldf (babel)
   \providecommand*{\FDP@colonspace}{\addnbspace}%
   \def\abx@semicolon{%
@@ -63,6 +66,38 @@
     \textsc{\textnohyphenation{#1}}}%
   \def\mkbibordedition{\mkbibfemord}%
   \def\mkbibordseries{\mkbibfemord}%
+  \expandafter\protected\expandafter\def\csname mkbibtime24h\endcsname#1#2#3#4{%
+      \iffieldundef{#1}{}
+        {\printtext{\mktimezeros{\thefield{#1}}}\setunit{\bibtimesep}}%
+      \iffieldundef{#2}{}
+        {\printtext{\mktimezeros{\thefield{#2}}}\setunit{\bibtimesep}}%
+      \iffieldundef{#3}{}
+        {\printtext{\mktimezeros{\thefield{#3}}}}%
+      \setunit{}%
+      \iffieldundef{#4}{}
+        {\bibtimezonesep
+         \mkbibtimezone{\thefield{#4}}}}%
+  \expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{%
+      \stripzeros{\mktimehh{\thefield{#1}}}\bibtimesep
+      \forcezerosmdt{\thefield{#2}}%
+      \iffieldundef{#3}{}
+        {\bibtimesep
+         \forcezeros{\thefield{#3}}}%
+       \space
+       \ifnumless{\thefield{#1}}{12}
+         {\bibstring{am}}
+         {\bibstring{pm}}%
+      \iffieldundef{#4}{}
+       {\space\bibtimezonesep
+        \parentext{\mkbibtimezone{\thefield{#4}}}}}%
+  \protected\def\mkbibseasondateshort#1#2{%
+    \mkbibseason{\thefield{#2}}%
+    \iffieldundef{#1}{}{\space}%
+    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
+  \protected\def\mkbibseasondatelong#1#2{%
+    \mkbibseason{\thefield{#2}}%
+    \iffieldundef{#1}{}{\space}%
+    \dateeraprintpre{#1}\mkyearzeros{\thefield{#1}}}%
 }
 
 \UndeclareBibliographyExtras{%
@@ -426,6 +461,7 @@
   langdanish       = {{danois}{danois}},
   langdutch        = {{n\'eerlandais}{n\'eerlandais}},
   langenglish      = {{anglais}{anglais}},
+%  langestonian     = {{}{}},% FIXME: missing
   langfinnish      = {{finnois}{finnois}},
   langfrench       = {{fran\c{c}ais}{fran\c{c}ais}},
   langgerman       = {{allemand}{allemand}},
@@ -447,6 +483,7 @@
   fromdanish       = {{du danois}{du danois}},
   fromdutch        = {{du n\'eerlandais}{du n\'eerlandais}},
   fromenglish      = {{de l'anglais}{de l'anglais}},
+%  fromestonian     = {{}{}},% FIXME: missing
   fromfinnish      = {{du finnois}{du finnois}},
   fromfrench       = {{du fran\c{c}ais}{du fran\c{c}ais}},
   fromgerman       = {{de l'allemand}{de l'allemand}},
@@ -482,6 +519,17 @@
   library          = {{biblioth\`eque}{biblioth\adddot}},
   abstract         = {{r\'esum\'e}{r\'es\adddot}},
   annotation       = {{annotations}{annotations}},
+  commonera        = {{de l’\`ere commune}{EC}},
+  beforecommonera  = {{avant l’\`ere commune}{AEC}},
+  annodomini       = {{apr\`es J\'esus-Christ}{ap\adddotspace J\adddot-C\adddot}},
+  beforechrist     = {{avant J\'esus-Christ}{av\adddotspace J\adddot-C\adddot}},
+% circa            = {{}{}},% FIXME: missing
+% spring           = {{}{}},% FIXME: missing
+% summer           = {{}{}},% FIXME: missing
+% autumn           = {{}{}},% FIXME: missing
+% winter           = {{}{}},% FIXME: missing
+  am               = {{AM}{AM}},
+  pm               = {{PM}{PM}},
 }
 
 \gdef\lbx@fr@ordinal#1#2{%