isodate update (5jan10)

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

9 files changed, 795 insertions, 469 deletions

diff --git a/Master/texmf-dist/tex/latex/isodate/danish.idf b/Master/texmf-dist/tex/latex/isodate/danish.idf
index bcf1a2bc9a4..9d06fdefda7 100644
--- a/Master/texmf-dist/tex/latex/isodate/danish.idf
+++ b/Master/texmf-dist/tex/latex/isodate/danish.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,74 +18,96 @@
 %%   h.harders@tu-bs.de
 %% 
 \ProvidesFile{danish.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 Danish date format}
 \def\month@danish{\ifcase\month\or
     januar\or februar\or marts\or april\or maj\or juni\or
     juli\or august\or september\or oktober\or november\or december\fi}
-  \def\iso@printmonthday@danish#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}}{%
-            \iso@printday{#2}.~\begingroup
-            \edef\lmonth{#1}\def\month{\lmonth}%
-            \month@danish%
-            \endgroup
-            }{}}}}%
-    }
-  \def\iso@printdate@danish#1#2#3{%
-    \ifthenelse{\equal{\iso@dateformat}{iso}\or%
-      \equal{\iso@dateformat}{TeX}}{%
-      \ifiso@printyear
-        \number#1%
-      \fi}{}%
+\def\iso@printmonthday@danish#1#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}}{%
+      \ifiso@doprintday
+        \iso@printday{#2}/%
+      \fi
+      \iso@printmonth{#1}%
+    }{%
+      \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                  \equal{\iso@dateformat}{shortorig}}{%
+        \ifiso@doprintday
+          \iso@printday{#2}.\iso@monthsep
+        \fi
+        \begingroup
+        \edef\lmonth{#1}\def\month{\lmonth}%
+        \month@danish%
+        \endgroup
+      }{}%
+    }%
+  }%
+}
+\def\iso@printdate@danish#1#2#3{%
+  \ifthenelse{\equal{\iso@dateformat}{iso}\OR
+              \equal{\iso@dateformat}{TeX}}{%
+    \iso@printdate@int{#1}{#2}{#3}%
+  }{%
     \iso@printmonthday@danish{\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}{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@twodigitsign\iso@yeartwo{\number#1}}{%
+            \iso@yearsep\iso@twodigitsign\iso@yeartwo{\number#1}%
+          }{%
             \ifthenelse{\equal{\iso@dateformat}{short}}{%
-              \iso@yeartwo{\number#1}}{%
-              }}}}%
-      \fi
-    }
-  \def\iso@datedanish{%
-    \def\today{\iso@printdate@danish{\year}{\month}{\day}}}%
-  \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
-    \iso@daterange@danish}%
+              \iso@yeartwo{\number#1}%
+            }{}%
+          }%
+        }%
+      }%
+    \fi
+  }%
+}
+\def\iso@datedanish{%
+  \def\today{\iso@printdate@danish{\year}{\month}{\day}}}%
+\expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
+  \iso@daterange@danish}%
 \def\iso@daterange@danish#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@danish{#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}}{%
-          \iso@printday{#3}.}{\iso@printday{#3}}%
-        }{\iso@printmonthday@danish{#2}{#3}}}{%
-      \begingroup
-        \printyearon
-        \csname iso@printdate@\iso@languagename\endcsname{%
-          #1}{#2}{#3}%
-      \endgroup}%
-    \iso@rangesign\csname iso@printdate@\iso@languagename\endcsname{%
-      #4}{#5}{#6}%
-  }{%
+        \ifiso@doprintday
+          \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                      \equal{\iso@dateformat}{shortorig}}{%
+            \iso@printday{#3}.%
+          }{%
+            \iso@printday{#3}%
+          }%
+        \else
+          \iso@printmonthday@danish{#2}{#3}%
+        \fi
+      }{%
+        \iso@printmonthday@danish{#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{~til~}
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}%
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}%
diff --git a/Master/texmf-dist/tex/latex/isodate/german.idf b/Master/texmf-dist/tex/latex/isodate/german.idf
index a9c08a5bb41..cd9193425a7 100644
--- a/Master/texmf-dist/tex/latex/isodate/german.idf
+++ b/Master/texmf-dist/tex/latex/isodate/german.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,16 +18,21 @@
 %%   h.harders@tu-bs.de
 %% 
 \ProvidesFile{german.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 German date format (\CurrentOption)}
 \def\iso@dmsepgerman{\,}%
 \def\iso@mylongsepgerman{~}%
 \def\iso@myshortsepgerman{\,}%
+\def\iso@mylongsepnodaygerman{}%
+\def\iso@myshortsepnodaygerman{}%
 \DeclareRobustCommand*\daymonthsepgerman[1]{\def\iso@dmsepgerman{#1}}
 \DeclareRobustCommand*\monthyearsepgerman[2]{%
   \def\iso@mylongsepgerman{#1}%
   \def\iso@myshortsepgerman{#2}}
+\DeclareRobustCommand*\monthyearsepnodaygerman[2]{%
+  \def\iso@mylongsepnodaygerman{#1}%
+  \def\iso@myshortsepnodaygerman{#2}}
 \def\month@german{\ifcase\month\or
   Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or
   Juli\or August\or September\or Oktober\or November\or Dezember\fi}
@@ -36,58 +41,91 @@
   J\"anner\else \month@german\fi}
 \def\month@naustrian{\month@austrian}
 \@namedef{iso@printmonthday@\CurrentOption}#1#2{%
-  \ifthenelse{\equal{\iso@dateformat}{numeric}\or%
-              \equal{\iso@dateformat}{short}}{%
-    \iso@printday{#2}.\iso@dmsepgerman\iso@printmonth{#1}.}{%
-    \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}}{%
-          \iso@printday{#2}.~\begingroup
-          \edef\lmonth{#1}%
-          \def\month{\lmonth}\csname month@\iso@languagename\endcsname%
-          \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}.\iso@dmsepgerman
+      \fi
+      \iso@printmonth{#1}%
+    }{%
+      \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                  \equal{\iso@dateformat}{shortorig}}{%
+        \ifiso@doprintday
+          \iso@printday{#2}.\iso@monthsep\@empty
+        \fi
+        \begingroup
+        \edef\lmonth{#1}%
+        \def\month{\lmonth}\csname month@\iso@languagename\endcsname%
+        \endgroup
+      }{}%
+    }%
+  }%
 }
 \@namedef{iso@printdate@\CurrentOption}#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
-  \csname iso@printmonthday@\iso@languagename\endcsname{%
-    \number#2}{\number#3}%
-  \ifiso@printyear
-    \ifthenelse{\equal{\iso@dateformat}{numeric}}{%
-      \iso@mylongsepgerman\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@myshortsepgerman\iso@yeartwo{\number#1}}{}}}}%
-  \fi
+  \ifthenelse{\equal{\iso@dateformat}{iso}\OR
+              \equal{\iso@dateformat}{TeX}}{%
+    \iso@printdate@int{#1}{#2}{#3}%
+  }{%
+    \csname iso@printmonthday@\iso@languagename\endcsname{%
+      \number#2}{\number#3}%
+    \ifiso@printyear
+      \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                  \equal{\iso@dateformat}{shortorig}}{%
+      }{%
+        \ifiso@doprintday.\else/\fi
+      }%
+      \ifthenelse{\equal{\iso@dateformat}{numeric}}{%
+        \ifiso@doprintday
+          \iso@mylongsepgerman\@empty
+        \else
+          \iso@mylongsepnodaygerman\@empty
+        \fi
+        \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}}{%
+              \ifiso@doprintday
+                \iso@myshortsepgerman\@empty
+              \else
+                \iso@myshortsepnodaygerman\@empty
+              \fi
+              \iso@yeartwo{\number#1}%
+            }{}%
+          }%
+        }%
+      }%
+    \fi
+  }%
 }
 \@namedef{iso@daterange@\CurrentOption}#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}%
-        }{\csname iso@printmonthday@\iso@languagename\endcsname{#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}}{%
-          \iso@printday{#3}}{\iso@printday{#3}}.%
-        }{\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}%
+        \ifiso@doprintday
+          \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}%
   }%
 }
 \expandafter\def\csname iso@rangesign@\CurrentOption\endcsname{~bis~}
diff --git a/Master/texmf-dist/tex/latex/isodate/isodate.sty b/Master/texmf-dist/tex/latex/isodate/isodate.sty
index 8d631358199..b37457a8da7 100644
--- a/Master/texmf-dist/tex/latex/isodate/isodate.sty
+++ b/Master/texmf-dist/tex/latex/isodate/isodate.sty
@@ -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
@@ -19,7 +19,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{isodate}
-  [2005/04/15  v2.28  Print dates with different formats (HH)]
+  [2010/01/03  v2.30  Print dates with different formats (HH)]
 \RequirePackage{ifthen}
 \IfFileExists{substr.sty}{\RequirePackage{substr}%
  }{\PackageError{isodate.sty}{Package file substr.sty not found}
@@ -40,6 +40,8 @@
 \DeclareOption{shortroman}{\AtEndOfPackage{\shortromandate}}
 \DeclareOption{cleanlook}{\AtEndOfPackage{\cleanlookdateon}}
 \DeclareOption{nocleanlook}{\AtEndOfPackage{\cleanlookdateoff}}
+\DeclareOption{printdayoff}{\AtEndOfPackage{\printdayoff}}
+\DeclareOption{printdayon}{\AtEndOfPackage{\printdayon}}
 \DeclareOption{inputenglish}{\AtEndOfPackage{\dateinputformat{english}}}
 \DeclareOption{inputbritish}{\AtEndOfPackage{\dateinputformat{english}}}
 \DeclareOption{inputUKenglish}{\AtEndOfPackage{\dateinputformat{english}}}
@@ -73,7 +75,7 @@
       Isodate definition file \CurrentOption.idf not found}{%
       Maybe you misspelled the language option?}}%
   }
-\ExecuteOptions{orig,nocleanlook}
+\ExecuteOptions{orig,nocleanlook,printdayon}
 \ProcessOptions*
 \ifx\iso@languageloaded\@undefined
   \PackageError{isodate}{%
@@ -119,20 +121,20 @@
 \def\iso@dateformat{numeric}
 \DeclareRobustCommand*\dateinputformat[1]{%
   \ifthenelse{%
-    \equal{#1}{english}\or
-    \equal{#1}{british}\or
+    \equal{#1}{english}\OR
+    \equal{#1}{british}\OR
     \equal{#1}{UKenglish}}{%
     \def\iso@inputformat{english}%
   }{%
     \ifthenelse{%
-      \equal{#1}{american}\or
+      \equal{#1}{american}\OR
       \equal{#1}{USenglish}}{%
       \def\iso@inputformat{american}%
     }{%
       \ifthenelse{%
-        \equal{#1}{tex}\or
-        \equal{#1}{TeX}\or
-        \equal{#1}{latex}\or
+        \equal{#1}{tex}\OR
+        \equal{#1}{TeX}\OR
+        \equal{#1}{latex}\OR
         \equal{#1}{LaTeX}}{%
         \def\iso@inputformat{tex}%
       }{%
@@ -200,10 +202,20 @@
 \DeclareRobustCommand*\printyearon{\iso@printyeartrue}
 \DeclareRobustCommand*\printyearoff{\iso@printyearfalse}
 \printyearon
+\newif\ifiso@doprintday
+\DeclareRobustCommand*\printdayon{\iso@doprintdaytrue}
+\DeclareRobustCommand*\printdayoff{\iso@doprintdayfalse}
+\printdayon
 \newif\ifiso@cleanlook
 \DeclareRobustCommand*\cleanlookdateon{\iso@cleanlooktrue}
 \DeclareRobustCommand*\cleanlookdateoff{\iso@cleanlookfalse}
 \cleanlookdateoff
+\newcommand*\iso@daysep{~}
+\newcommand*\iso@monthsep{~}
+\newcommand*\iso@yearsep{~}
+\DeclareRobustCommand*\isospacebeforeday[1]{\def\iso@daysep{#1}}
+\DeclareRobustCommand*\isospacebeforemonth[1]{\def\iso@monthsep{#1}}
+\DeclareRobustCommand*\isospacebeforeyear[1]{\def\iso@yearsep{#1}}
 \newcommand*\iso@printdate[3]{%
   \begingroup%
     \@ifundefined{iso@printdate@\iso@languagename}{%
@@ -266,6 +278,65 @@
       \protect~ inside the argument.}%
     }}
 \def\iso@input@TeX#1/#2/#3\@empty{\iso@printdate{#1}{#2}{#3}}
+\def\iso@printmonthday@int#1#2{%
+  \ifthenelse{\equal{\iso@dateformat}{iso}}{%
+    \iso@printmonth{#1}%
+    \ifiso@doprintday
+      \iso@isodash\iso@printday{#2}%
+    \fi
+  }{%
+    \ifthenelse{\equal{\iso@dateformat}{TeX}}{%
+      \iso@printmonth{#1}%
+      \ifiso@doprintday
+        /\iso@printday{#2}%
+      \fi
+    }{%
+      \PackageError{isodate.sty}{\csname iso@printmonthday\endcsname:
+        Invalid date format `\iso@dateformat'}{Internal error. Please
+        report to the package author.}
+    }%
+  }%
+}
+\def\iso@printdate@int#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}/%
+      }{%
+        \PackageError{isodate.sty}{\csname iso@printmonthday\endcsname:
+          Invalid date format `\iso@dateformat'}{Internal error. Please
+          report to the package author.}
+      }%
+    }%
+  \fi
+  \csname iso@printmonthday@int\endcsname{\number#2}{\number#3}%
+}
+\def\iso@daterange@int#1#2#3#4#5#6{%
+  \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}}{%
+        \ifiso@doprintday
+          \iso@printday{#6}%
+        \else
+          \iso@printmonthday@int{#5}{#6}%
+        \fi
+      }{%
+        \iso@printmonthday@int{#5}{#6}%
+      }%
+    }{%
+      \iso@printdate@int{#4}{#5}{#6}%
+    }%
+  }{%
+    \PackageError{isodate.sty}{\csname iso@printmonthday\endcsname:
+      Invalid date format `\iso@dateformat'}{Internal error. Please
+      report to the package author.}
+  }%
+}
 \DeclareRobustCommand*\daterange[2]{%
   \edef\iso@date{#1}%
   \edef\iso@@date{#2}%
@@ -276,11 +347,11 @@
   \SubStringsToCounter{iso@@slash}{/}{\iso@@date}%
   \SubStringsToCounter{iso@@minus}{-}{\iso@@date}%
   \SubStringsToCounter{iso@@dot}{.}{\iso@@date}%
-  \ifthenelse{\equal{\theiso@dot}{2}\and\equal{\theiso@@dot}{2}}{%
+  \ifthenelse{\equal{\theiso@dot}{2}\AND\equal{\theiso@@dot}{2}}{%
     \expandafter\iso@range@input@german\iso@@@date\@empty}{%
-    \ifthenelse{\equal{\theiso@minus}{2}\and\equal{\theiso@@minus}{2}}{%
+    \ifthenelse{\equal{\theiso@minus}{2}\AND\equal{\theiso@@minus}{2}}{%
       \expandafter\iso@range@input@iso\iso@@@date\@empty}{%
-      \ifthenelse{\equal{\theiso@slash}{2}\and%
+      \ifthenelse{\equal{\theiso@slash}{2}\AND
                   \equal{\theiso@@slash}{2}}{%
         \expandafter\iso@range@input@english\iso@@@date\@empty}{%
         ????\iso@isodash ??\iso@isodash ??%
diff --git a/Master/texmf-dist/tex/latex/isodate/isodateo.sty b/Master/texmf-dist/tex/latex/isodate/isodateo.sty
index cc9b9439608..36fbde7c868 100644
--- a/Master/texmf-dist/tex/latex/isodate/isodateo.sty
+++ b/Master/texmf-dist/tex/latex/isodate/isodateo.sty
@@ -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
diff --git a/Master/texmf-dist/tex/latex/isodate/italian.idf b/Master/texmf-dist/tex/latex/isodate/italian.idf
index b010384eee2..0bd4fdd1dfc 100644
--- a/Master/texmf-dist/tex/latex/isodate/italian.idf
+++ b/Master/texmf-dist/tex/latex/isodate/italian.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{italian.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 Italian date format}
 \def\month@italian{\ifcase\month\or
@@ -26,63 +26,94 @@
   luglio\or agosto\or settembre\or ottobre\or novembre\or
   dicembre\fi}
 \def\iso@printmonthday@italian#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\textordmasculine\fi~\month@italian%
-          \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\textordmasculine\fi
+          \iso@monthsep
+        \fi
+        \month@italian
+        \endgroup
+      }{}%
+    }%
+  }%
+}
 \def\iso@printdate@italian#1#2#3{%
-  \ifthenelse{\equal{\iso@dateformat}{iso}\or%
+  \ifthenelse{\equal{\iso@dateformat}{iso}\OR
     \equal{\iso@dateformat}{TeX}}{%
-    \ifiso@printyear\iso@yearfour{\number#1}\fi}{}%
-  \iso@printmonthday@italian{\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
+    \iso@printdate@int{#1}{#2}{#3}%
+  }{%
+    \iso@printmonthday@italian{\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@dateitalian{%
   \def\today{\iso@printdate@italian{\year}{\month}{\day}}}%
-  \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
-    \iso@daterange@italian}%
+\expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
+  \iso@daterange@italian}%
 \def\iso@daterange@italian#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@italian{#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\textordmasculine\fi
-            \endgroup}{\iso@printday{#3}}%
-        }{\iso@printmonthday@italian{#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
+          \iso@printmonthday@italian{#2}{#3}%
+        \fi
+      }{%
+        \iso@printmonthday@italian{#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{~al~}
 \def\iso@languagename{italian}%
diff --git a/Master/texmf-dist/tex/latex/isodate/norsk.idf b/Master/texmf-dist/tex/latex/isodate/norsk.idf
index e41972bb4e9..f42ab156bc0 100644
--- a/Master/texmf-dist/tex/latex/isodate/norsk.idf
+++ b/Master/texmf-dist/tex/latex/isodate/norsk.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,67 +18,96 @@
 %%   h.harders@tu-bs.de
 %% 
 \ProvidesFile{norsk.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 Norwegian date format}
 \def\month@norsk{\ifcase\month\or
     januar\or februar\or mars\or april\or mai\or juni\or
     juli\or august\or september\or oktober\or november\or desember\fi}
-  \def\iso@printmonthday@norsk#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}}{%
-            \iso@printday{#2}.~\begingroup
-            \edef\lmonth{#1}\def\month{\lmonth}%
-            \month@norsk%
-            \endgroup
-            }{}}}}%
-    }
-  \def\iso@printdate@norsk#1#2#3{%
-    \ifthenelse{\equal{\iso@dateformat}{iso}\or%
-      \equal{\iso@dateformat}{TeX}}{%
-      \ifiso@printyear\iso@yearfour{\number#1}\fi}{}%
+\def\iso@printmonthday@norsk#1#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}}{%
+      \ifiso@doprintday
+        \iso@printday{#2}/%
+      \fi
+      \iso@printmonth{#1}%
+    }{%
+      \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                  \equal{\iso@dateformat}{shortorig}}{%
+        \ifiso@doprintday
+          \iso@printday{#2}.\iso@monthsep
+        \fi
+        \begingroup
+        \edef\lmonth{#1}\def\month{\lmonth}%
+        \month@norsk%
+        \endgroup
+      }{}%
+    }%
+  }%
+}
+\def\iso@printdate@norsk#1#2#3{%
+  \ifthenelse{\equal{\iso@dateformat}{iso}\OR
+              \equal{\iso@dateformat}{TeX}}{%
+    \iso@printdate@int{#1}{#2}{#3}%
+  }{%
     \iso@printmonthday@norsk{\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}{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@twodigitsign\iso@yeartwo{\number#1}}{%
+            \iso@yearsep\iso@twodigitsign\iso@yeartwo{\number#1}%
+          }{%
             \ifthenelse{\equal{\iso@dateformat}{short}}{%
-              \iso@yeartwo{\number#1}}{%
-            }}}}%
+              \iso@yeartwo{\number#1}%
+            }{}%
+          }%
+        }%
+      }%
     \fi
-  }
-  \def\iso@datenorsk{%
-    \def\today{\iso@printdate@norsk{\year}{\month}{\day}}}%
-  \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
-    \iso@daterange@norsk}%
+  }%
+}
+\def\iso@datenorsk{%
+  \def\today{\iso@printdate@norsk{\year}{\month}{\day}}}%
+\expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
+  \iso@daterange@norsk}%
 \def\iso@daterange@norsk#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@norsk{#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}}{%
-          \iso@printday{#3}.}{\iso@printday{#3}}%
-        }{\iso@printmonthday@norsk{#2}{#3}}}{%
-      \csname iso@printdate@\iso@languagename\endcsname{#1}{#2}{#3}}%
-    \iso@rangesign\csname iso@printdate@\iso@languagename\endcsname{%
-      #4}{#5}{#6}%
-  }{%
+        \ifiso@doprintday
+          \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                      \equal{\iso@dateformat}{shortorig}}{%
+            \iso@printday{#3}.%
+          }{%
+            \iso@printday{#3}%
+          }%
+        \else
+          \iso@printmonthday@norsk{#2}{#3}%
+        \fi
+      }{%
+        \iso@printmonthday@norsk{#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{~til~}
diff --git a/Master/texmf-dist/tex/latex/isodate/swedish.idf b/Master/texmf-dist/tex/latex/isodate/swedish.idf
index bbef8a82240..d1a5280a903 100644
--- a/Master/texmf-dist/tex/latex/isodate/swedish.idf
+++ b/Master/texmf-dist/tex/latex/isodate/swedish.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,69 +18,97 @@
 %%   h.harders@tu-bs.de
 %% 
 \ProvidesFile{swedish.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 Swedish date format}
 \def\month@swedish{\ifcase\month\or
     januari\or februari\or mars\or april\or maj\or juni\or
     juli\or augusti\or september\or oktober\or november\or december\fi}
-  \def\iso@printmonthday@swedish#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}}{%
-            \iso@printday{#2}.~\begingroup
-            \edef\lmonth{#1}\def\month{\lmonth}%
-            \month@swedish%
-            \endgroup
-            }{}}}}%
-    }
-  \def\iso@printdate@swedish#1#2#3{%
-    \ifthenelse{\equal{\iso@dateformat}{iso}\or%
-      \equal{\iso@dateformat}{TeX}}{%
-      \ifiso@printyear\iso@yearfour{\number#1}\fi}{}%
+\def\iso@printmonthday@swedish#1#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}}{%
+      \ifiso@doprintday
+        \iso@printday{#2}/%
+      \fi
+      \iso@printmonth{#1}%
+    }{%
+      \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                  \equal{\iso@dateformat}{shortorig}}{%
+        \ifiso@doprintday
+          \iso@printday{#2}.\iso@monthsep
+        \fi
+        \begingroup
+        \edef\lmonth{#1}\def\month{\lmonth}%
+        \month@swedish%
+        \endgroup
+      }{}%
+    }%
+  }%
+}
+\def\iso@printdate@swedish#1#2#3{%
+  \ifthenelse{\equal{\iso@dateformat}{iso}\OR
+              \equal{\iso@dateformat}{TeX}}{%
+    \iso@printdate@int{#1}{#2}{#3}%
+  }{%
     \iso@printmonthday@swedish{\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}{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@twodigitsign\iso@yeartwo{\number#1}}{%
+            \iso@yearsep\iso@twodigitsign\iso@yeartwo{\number#1}%
+          }{%
             \ifthenelse{\equal{\iso@dateformat}{short}}{%
-              \iso@yeartwo{\number#1}}{%
-              }}}}%
+              \iso@yeartwo{\number#1}%
+            }{}%
+          }%
+        }%
+      }%
     \fi
-  }
-  \def\iso@dateswedish{%
-    \def\today{\iso@printdate@swedish{\year}{\month}{\day}}}%
-  \expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
-    \iso@daterange@swedish}%
+  }%
+}
+\def\iso@dateswedish{%
+  \def\today{\iso@printdate@swedish{\year}{\month}{\day}}}%
+\expandafter\def\csname iso@daterange@\CurrentOption\endcsname{%
+  \iso@daterange@swedish}%
 \def\iso@daterange@swedish#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@swedish{#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}}{%
-          \iso@printday{#3}.}{\iso@printday{#3}}%
-        }{\iso@printmonthday@swedish{#2}{#3}}}{%
-      \csname iso@printdate@\iso@languagename\endcsname{%
-        #1}{#2}{#3}}%
-    \iso@rangesign\csname iso@printdate@\iso@languagename\endcsname{%
-      #4}{#5}{#6}%
-}{%
+        \ifiso@doprintday
+          \ifthenelse{\equal{\iso@dateformat}{orig}\OR
+                      \equal{\iso@dateformat}{shortorig}}{%
+            \iso@printday{#3}.%
+          }{%
+            \iso@printday{#3}%
+          }%
+        \else
+          \iso@printmonthday@swedish{#2}{#3}%
+        \fi
+      }{%
+        \iso@printmonthday@swedish{#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{~till~}
 \def\iso@languagename{swedish}%