isodate update (5jan10)

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

1 files changed, 239 insertions, 162 deletions

diff --git a/Master/texmf-dist/tex/latex/isodate/english.idf b/Master/texmf-dist/tex/latex/isodate/english.idf
index 204600fcf11..8383824ea23 100644
--- a/Master/texmf-dist/tex/latex/isodate/english.idf
+++ b/Master/texmf-dist/tex/latex/isodate/english.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,15 +18,15 @@
 %%   h.harders@tu-bs.de
 %% 
 \ProvidesFile{english.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
 \def\month@english{\ifcase\month\or
     January\or February\or March\or April\or May\or June\or
     July\or August\or September\or October\or November\or December\fi}
-\ifthenelse{\equal{\CurrentOption}{english}\or
-            \equal{\CurrentOption}{british}\or
+\ifthenelse{\equal{\CurrentOption}{english}\OR
+            \equal{\CurrentOption}{british}\OR
             \equal{\CurrentOption}{UKenglish}}{%
-\typeout{Define commands for English date format}
+  \typeout{Define commands for English date format}
   \def\day@english{%
     \ifiso@cleanlook
       \day
@@ -43,38 +43,60 @@
     \fi
   }
   \def\iso@printmonthday@english#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}}{%
-        \iso@printmonth{#1}\iso@isodash\iso@printday{#2}}{%
-        \ifthenelse{\equal{\iso@dateformat}{TeX}}{%
-          \iso@printmonth{#1}/\iso@printday{#2}}{%
-          \ifthenelse{\equal{\iso@dateformat}{orig}\or
-                      \equal{\iso@dateformat}{shortorig}}{%
-            \begingroup
-            \edef\lday{#2}\def\day{\lday}%
-            \edef\lmonth{#1}\def\month{\lmonth}%
-            \day@english~\month@english%
-            \endgroup
-            }{}}}}%
-    }
-  \def\iso@printdate@english#1#2#3{%
-    \ifthenelse{\equal{\iso@dateformat}{iso}}{%
-      \ifiso@printyear\iso@yearfour{\number#1}\iso@isodash\fi}{%
-      \ifthenelse{\equal{\iso@dateformat}{TeX}}{%
-        \ifiso@printyear\iso@yearfour{\number#1}/\fi}{}}%
-    \iso@printmonthday@english{\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}}{%
-            }}}%
+    \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}\def\day{\lday}%
+          \edef\lmonth{#1}\def\month{\lmonth}%
+          \ifiso@doprintday
+            \day@english\iso@monthsep\@empty
+          \fi
+          \month@english
+          \endgroup
+        }{}%
       }%
-    \fi
+    }%
+  }
+  \def\iso@printdate@english#1#2#3{%
+    \ifthenelse{\equal{\iso@dateformat}{iso}\OR
+                \equal{\iso@dateformat}{TeX}}{%
+      \iso@printdate@int{#1}{#2}{#3}%
+    }{%
+      \iso@printmonthday@english{\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@printdate@UKenglish{\iso@printdate@english}
   \def\iso@printdate@british{\iso@printdate@english}
@@ -83,174 +105,229 @@
   \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
     \iso@daterange@english}%
   \def\iso@daterange@english#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@english{#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}\or
-                      \equal{\iso@dateformat}{shortorig}}{%
-            \begingroup
+          \ifiso@doprintday
+            \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                        \equal{\iso@dateformat}{shortorig}}{%
+              \begingroup
               \edef\lday{#3}\def\day{\lday}%
-              \day@english\endgroup}{\iso@printday{#3}}%
-          }{\iso@printmonthday@english{#2}{#3}}}{%
-        \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}}%
-      \iso@rangesign\csname iso@printdate@\iso@languagename\endcsname{%
-        #4}{#5}{#6}%
-    }{%
+              \day@english
+              \endgroup
+            }{%
+              \iso@printday{#3}%
+            }%
+          \else
+            \csname iso@printmonthday@\iso@languagename\endcsname{#2}{#3}%
+          \fi
+        }{%
+          \csname iso@printmonthday@\iso@languagename\endcsname{#2}{#3}%
+        }%
+      }{%
+        \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}%
+      }%
+      \iso@rangesign
+      \csname iso@printdate@\iso@languagename\endcsname{#4}{#5}{#6}%
     }%
   }
   \def\iso@languagename{english}%
 }{%
-  \ifthenelse{\equal{\CurrentOption}{australian}\or%
+  \ifthenelse{\equal{\CurrentOption}{australian}\OR
               \equal{\CurrentOption}{newzealand}}{%
-  \typeout{Define commands for Australian date format}
+    \typeout{Define commands for Australian date format}
     \def\iso@printmonthday@australian#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}}{%
-          \iso@printmonth{#1}\iso@isodash\iso@printday{#2}}{%
-          \ifthenelse{\equal{\iso@dateformat}{TeX}}{%
-            \iso@printmonth{#1}/\iso@printday{#2}}{%
-             \ifthenelse{\equal{\iso@dateformat}{orig}\or
-                        \equal{\iso@dateformat}{shortorig}}{%
-              \begingroup
-              \edef\lmonth{#1}\def\month{\lmonth}%
-              \iso@printday{#2}~\month@english%
-              \endgroup
-              }{}}}}%
-      }
-    \def\iso@printdate@australian#1#2#3{%
-      \ifiso@printyear
-        \ifthenelse{\equal{\iso@dateformat}{iso}}{%
-          \iso@yearfour{\number#1}\iso@isodash}{%
-          \ifthenelse{\equal{\iso@dateformat}{TeX}}{%
-            \iso@yearfour{\number#1}/}{}%
-        }%
-      \fi
-      \iso@printmonthday@australian{\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}}{%
-              }}}%
+      \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\lmonth{#1}\def\month{\lmonth}%
+            \ifiso@doprintday
+              \iso@printday{#2}\iso@monthsep\@empty
+            \fi
+            \month@english
+            \endgroup
+          }{}%
         }%
-      \fi
+      }%
+    }
+    \def\iso@printdate@australian#1#2#3{%
+      \ifthenelse{\equal{\iso@dateformat}{iso}\OR
+                  \equal{\iso@dateformat}{TeX}}{%
+        \iso@printdate@int{#1}{#2}{#3}%
+      }{%
+        \iso@printmonthday@australian{\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@printdate@newzealand{\iso@printdate@australian}
     \def\iso@dateaustralian{%
       \def\today{\iso@printdate@australian{\year}{\month}{\day}}}%
-  \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
-    \iso@daterange@australian}%
+    \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
+      \iso@daterange@australian}%
     \def\iso@daterange@australian#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@australian{#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
-                \iso@printday{#3}\endgroup}{\iso@printday{#3}}%
-            }{\iso@printmonthday@australian{#2}{#3}}}{%
-          \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}}%
-        \iso@rangesign\csname iso@printdate@\iso@languagename\endcsname{%
-          #4}{#5}{#6}%
-      }{%
+            \ifiso@doprintday
+              \iso@printday{#3}%
+            \else
+              \csname iso@printmonthday@\iso@languagename\endcsname{#2}{#3}%
+            \fi
+          }{%
+            \iso@printmonthday@australian{#2}{#3}%
+          }%
+        }{%
+          \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}%
+        }%
+        \iso@rangesign
+        \csname iso@printdate@\iso@languagename\endcsname{#4}{#5}{#6}%
       }%
     }
     \def\iso@languagename{australian}%
   }{%
-  \typeout{Define commands for American date format}
+    \typeout{Define commands for American date format}
     \def\iso@printmonthday@american#1#2{%
-       \ifthenelse{\equal{\iso@dateformat}{numeric}\or%
-        \equal{\iso@dateformat}{short}}{%
-        \iso@printmonth{#1}/\iso@printday{#2}\ifiso@printyear/\fi}{%
-        \ifthenelse{\equal{\iso@dateformat}{iso}}{%
-          \iso@printmonth{#1}\iso@isodash\iso@printday{#2}}{%
-          \ifthenelse{\equal{\iso@dateformat}{TeX}}{%
-            \iso@printmonth{#1}/\iso@printday{#2}}{%
-            \ifthenelse{\equal{\iso@dateformat}{orig}\or
-                        \equal{\iso@dateformat}{shortorig}}{%
-              \begingroup%
-              \edef\lmonth{#1}%
-               \def\month{\lmonth}\month@english%
-              \endgroup
-              ~\iso@printday{#2}%
-              }{}}}%
+      \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}}{%
+          \iso@printmonth{#1}%
+          \ifiso@doprintday
+            /\iso@printday{#2}%
+          \fi
+        }{%
+          \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                      \equal{\iso@dateformat}{shortorig}}{%
+            \begingroup%
+            \edef\lmonth{#1}%
+            \def\month{\lmonth}%
+            \month@english%
+            \endgroup
+            \ifiso@doprintday
+              \iso@daysep\iso@printday{#2}%
+            \fi
+          }{}%
+        }%
       }%
     }
     \def\iso@printdate@american#1#2#3{%
-      \ifiso@printyear
-        \ifthenelse{\equal{\iso@dateformat}{iso}}{%
-          \iso@yearfour{\number#1}\iso@isodash}{%
-          \ifthenelse{\equal{\iso@dateformat}{TeX}}{%
-            \iso@yearfour{\number#1}/}{}}%
-      \fi
-      \iso@printmonthday@american{\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@american{\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}}{%
+              \ifiso@doprintday,\fi
+              \iso@yearsep\iso@yearfour{\number#1}%
+            }{%
+              \ifthenelse{\equal{\iso@dateformat}{shortorig}}{%
+                \ifiso@doprintday,\fi
+                \iso@yearsep\iso@twodigitsign\iso@yeartwo{\number#1}%
+              }{%
+                \ifthenelse{\equal{\iso@dateformat}{short}}{%
+                  \iso@yeartwo{\number#1}%
+                }{}%
+              }%
+            }%
+          }%
+        \fi
+      }%
     }
     \def\iso@printdate@USenglish{\iso@printdate@american}
     \def\iso@dateamerican{%
       \def\today{\iso@printdate@american{\year}{\month}{\day}}}%
-  \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
-    \iso@daterange@american}%
+    \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
+      \iso@daterange@american}%
     \def\iso@daterange@american#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@american{#5}{#6}}}{%
-          \csname iso@printdate@\iso@languagename\endcsname{%
-            #4}{#5}{#6}}}{%
-        \ifthenelse{\equal{\iso@dateformat}{orig}\or
+        \iso@daterange@int{#1}{#2}{#3}{#4}{#5}{#6}%
+      }{%
+        \ifthenelse{\equal{\iso@dateformat}{orig}\OR
                     \equal{\iso@dateformat}{shortorig}}{%
           \ifthenelse{\equal{\number#1}{\number#4}}{%
             \ifthenelse{\equal{\number#2}{\number#5}}{%
-              \iso@printmonthday@american{#2}{#3}\iso@rangesign%
-              \iso@printday{#6},~%
+              \iso@printmonthday@american{#2}{#3}%
+              \iso@rangesign
+              \ifiso@doprintday
+                \iso@printday{#6},\iso@yearsep\@empty
+              \else
+                \iso@printmonthday@american{#5}{#6}\iso@yearsep\@empty
+              \fi
               \ifthenelse{\equal{\iso@dateformat}{orig}}{%
-                \number#4}{\iso@twodigitsign\iso@yeartwo{\number#4}}%
+                \iso@yearfour{\number#4}%
               }{%
-              \iso@printmonthday@american{#2}{#3}\iso@rangesign%
+                \iso@twodigitsign\iso@yeartwo{\number#4}%
+              }%
+            }{%
+              \iso@printmonthday@american{#2}{#3}%
+              \iso@rangesign
               \csname iso@printdate@\iso@languagename\endcsname{%
-                #4}{#5}{#6}}}{%
+                #4}{#5}{#6}%
+            }%
+          }{%
             \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}%
             \iso@rangesign%
-            \csname iso@printdate@\iso@languagename\endcsname{%
-              #4}{#5}{#6}}}{%
+            \csname iso@printdate@\iso@languagename\endcsname{#4}{#5}{#6}%
+          }%
+        }{%
           \ifthenelse{\equal{\number#1}{\number#4}}{%
-          \iso@printmonthday@american{#2}{#3}}{%
-          \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}}%
-        \iso@rangesign\csname iso@printdate@\iso@languagename\endcsname{%
-          #4}{#5}{#6}}%
+            \iso@printmonthday@american{#2}{#3}%
+          }{%
+            \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}%
+          }%
+          \iso@rangesign
+          \csname iso@printdate@\iso@languagename\endcsname{#4}{#5}{#6}%
+        }%
       }%
     }
     \def\iso@languagename{american}%