isodate update (5jan10)

git-svn-id: svn://tug.org/texlive/trunk@16613 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 78 insertions, 48 deletions

diff --git a/Master/texmf-dist/tex/latex/isodate/french.idf b/Master/texmf-dist/tex/latex/isodate/french.idf
index 2a85daaf1bf..16f9108ae0b 100644
--- a/Master/texmf-dist/tex/latex/isodate/french.idf
+++ b/Master/texmf-dist/tex/latex/isodate/french.idf
@@ -8,7 +8,7 @@
 %% 
 %%   isodate package
 %% 
-%%   Copyright  2000--2005 Harald Harders
+%%   Copyright  2000--2010 Harald Harders
 %% 
 %%   This program can be redistributed and/or modified under the terms
 %%   of the LaTeX Project Public License Distributed from CTAN
@@ -18,7 +18,7 @@
 %%   h.harders@tu-bs.de
 %% 
 \ProvidesFile{french.idf}
-  [2005/04/15  v2.28  Language definitions for isodate package (HH)]
+  [2010/01/03  v2.30  Language definitions for isodate package (HH)]
 \let\iso@languageloaded\active
 \typeout{Define commands for French date format}
 \def\month@french{\ifcase\month\or
@@ -26,63 +26,93 @@
   juillet\or ao\^ut\or septembre\or octobre\or novembre\or
   d\'ecembre\fi}
 \def\iso@printmonthday@french#1#2{%
-  \ifthenelse{\equal{\iso@dateformat}{numeric}\or%
-    \equal{\iso@dateformat}{short}}{%
-    \iso@printday{#2}/\iso@printmonth{#1}\ifiso@printyear/\fi}{%
-    \ifthenelse{\equal{\iso@dateformat}{iso}}{%
-      \ifiso@printyear\iso@isodash\fi\iso@printmonth{#1}%
-      \iso@isodash\iso@printday{#2}}{%
-      \ifthenelse{\equal{\iso@dateformat}{TeX}}{%
-        \ifiso@printyear/\fi\iso@printmonth{#1}/\iso@printday{#2}}{%
-        \ifthenelse{\equal{\iso@dateformat}{orig}\or
-                    \equal{\iso@dateformat}{shortorig}}{%
-          \begingroup
-          \edef\lday{#2}\edef\day{\lday}%
-          \edef\lmonth{#1}\def\month{\lmonth}%
-          \number\day\ifnum1=\day \noexpand\ier\fi~\month@french%
-          \endgroup
-          }{}}}}%
-  }
+  \ifthenelse{\equal{\iso@dateformat}{iso}\OR
+              \equal{\iso@dateformat}{TeX}}{%
+    \iso@printmonthday@int{#1}{#2}%
+  }{%
+    \ifthenelse{\equal{\iso@dateformat}{numeric}\OR
+                \equal{\iso@dateformat}{short}}{%
+      \ifiso@doprintday
+        \iso@printday{#2}/%
+      \fi
+      \iso@printmonth{#1}%
+    }{%
+      \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                  \equal{\iso@dateformat}{shortorig}}{%
+        \begingroup
+        \edef\lday{#2}\edef\day{\lday}%
+        \edef\lmonth{#1}\def\month{\lmonth}%
+        \ifiso@doprintday
+          \number\day\ifnum1=\day \noexpand\ier\fi\iso@monthsep
+        \fi
+        \month@french
+        \endgroup
+      }{}%
+    }%
+  }%
+}
 \def\iso@printdate@french#1#2#3{%
-  \ifthenelse{\equal{\iso@dateformat}{iso}\or%
-    \equal{\iso@dateformat}{TeX}}{%
-    \ifiso@printyear\iso@yearfour{\number#1}\fi}{}%
-  \iso@printmonthday@french{\number#2}{\number#3}%
-  \ifiso@printyear
-    \ifthenelse{\equal{\iso@dateformat}{numeric}}{\iso@yearfour{\number#1}}{%
-      \ifthenelse{\equal{\iso@dateformat}{orig}}{~\iso@yearfour{\number#1}}{%
-        \ifthenelse{\equal{\iso@dateformat}{shortorig}}{%
-          ~\iso@twodigitsign\iso@yeartwo{\number#1}}{%
-          \ifthenelse{\equal{\iso@dateformat}{short}}{%
-            \iso@yeartwo{\number#1}}{}}}}%
-  \fi
+  \ifthenelse{\equal{\iso@dateformat}{iso}\OR
+              \equal{\iso@dateformat}{TeX}}{%
+    \iso@printdate@int{#1}{#2}{#3}%
+  }{%
+    \iso@printmonthday@french{\number#2}{\number#3}%
+    \ifiso@printyear
+      \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                  \equal{\iso@dateformat}{shortorig}}{%
+      }{%
+        /%
+      }%
+      \ifthenelse{\equal{\iso@dateformat}{numeric}}{%
+        \iso@yearfour{\number#1}%
+      }{%
+        \ifthenelse{\equal{\iso@dateformat}{orig}}{%
+          \iso@yearsep\iso@yearfour{\number#1}%
+        }{%
+          \ifthenelse{\equal{\iso@dateformat}{shortorig}}{%
+            \iso@yearsep\iso@twodigitsign\iso@yeartwo{\number#1}%
+          }{%
+            \ifthenelse{\equal{\iso@dateformat}{short}}{%
+              \iso@yeartwo{\number#1}%
+            }{}%
+          }%
+        }%
+      }%
+    \fi
+  }%
 }
 \def\iso@datefrench{%
   \def\today{\iso@printdate@french{\year}{\month}{\day}}}%
-  \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
-    \iso@daterange@french}%
+\expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
+  \iso@daterange@french}%
 \def\iso@daterange@french#1#2#3#4#5#6{%
-  \ifthenelse{\equal{\iso@dateformat}{iso}\or%
+  \ifthenelse{\equal{\iso@dateformat}{iso}\OR
               \equal{\iso@dateformat}{TeX}}{%
-    \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}%
-    \iso@rangesign%
-    \ifthenelse{\equal{\number#1}{\number#4}}{%
-      \ifthenelse{\equal{\number#2}{\number#5}}{\iso@printday{#6}%
-        }{\iso@printmonthday@french{#5}{#6}}}{%
-      \csname iso@printdate@\iso@languagename\endcsname{#4}{#5}{#6}}}{%
+    \iso@daterange@int{#1}{#2}{#3}{#4}{#5}{#6}%
+  }{%
     \ifthenelse{\equal{\number#1}{\number#4}}{%
       \ifthenelse{\equal{\number#2}{\number#5}}{%
-        \ifthenelse{\equal{\iso@dateformat}{orig}}{%
-          \begingroup
+        \ifiso@doprintday
+          \ifthenelse{\equal{\iso@dateformat}{orig}}{%
+            \begingroup
             \edef\lday{#3}\edef\day{\lday}%
             \number\day\ifnum1=\day \noexpand\ier\fi
-            \endgroup}{\iso@printday{#3}}%
-        }{\iso@printmonthday@french{#2}{#3}}}{%
-      \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}}%
-    \iso@rangesign\csname iso@printdate@\iso@languagename\endcsname{%
-      #4}{#5}{#6}%
-}{%
+            \endgroup
+          }{%
+            \iso@printday{#3}%
+          }%
+        \else
+          \csname iso@printmonthday@\iso@languagename\endcsname{#2}{#3}%
+        \fi
+      }{%
+        \iso@printmonthday@french{#2}{#3}%
+      }%
+    }{%
+      \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}%
     }%
+    \iso@rangesign
+    \csname iso@printdate@\iso@languagename\endcsname{#4}{#5}{#6}%
+  }%
 }
 \expandafter\def\csname iso@rangesign@\CurrentOption\endcsname{~au~}
 \def\iso@languagename{french}%