summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/datetime2-finnish/datetime2-finnish.ldf
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/datetime2-finnish/datetime2-finnish.ldf')
-rw-r--r--Master/texmf-dist/tex/latex/datetime2-finnish/datetime2-finnish.ldf85
1 files changed, 68 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/datetime2-finnish/datetime2-finnish.ldf b/Master/texmf-dist/tex/latex/datetime2-finnish/datetime2-finnish.ldf
index 60cddbc5bbc..bc469517139 100644
--- a/Master/texmf-dist/tex/latex/datetime2-finnish/datetime2-finnish.ldf
+++ b/Master/texmf-dist/tex/latex/datetime2-finnish/datetime2-finnish.ldf
@@ -17,7 +17,9 @@
%% and version 1.3 or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
-%% This work has the LPPL maintenance status `inactive'.
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Tuomas Välimäki.
%%
%% This work consists of the files datetime2-finnish.dtx and
%% datetime2-finnish.ins and the derived files
@@ -39,7 +41,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{finnish}[2015/03/30 v1.0]
+\ProvidesDateTimeModule{finnish}[2016/03/29 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{finnish-utf8}
@@ -50,6 +52,7 @@
\RequireDateTimeModule{finnish-ascii}
\fi
\fi
+\newcommand*{\DTMfinnishdowdaysep}{\space}
\newcommand*{\DTMfinnishdaymonthsep}{%
\DTMtexorpdfstring{\protect~}{\space}%
}
@@ -58,12 +61,15 @@
\newcommand*{\DTMfinnishtimezonesep}{\space}
\newcommand*{\DTMfinnishdatesep}{.}
\newcommand*{\DTMfinnishtimesep}{.}
+\DTMdefkey{finnish}{dowdaysep}{\renewcommand*{\DTMfinnishdowdaysep}{#1}}
\DTMdefkey{finnish}{daymonthsep}{\renewcommand*{\DTMfinnishdaymonthsep}{#1}}
\DTMdefkey{finnish}{monthyearsep}{\renewcommand*{\DTMfinnishmonthyearsep}{#1}}
\DTMdefkey{finnish}{datetimesep}{\renewcommand*{\DTMfinnishdatetimesep}{#1}}
\DTMdefkey{finnish}{timezonesep}{\renewcommand*{\DTMfinnishtimezonesep}{#1}}
\DTMdefkey{finnish}{datesep}{\renewcommand*{\DTMfinnishdatesep}{#1}}
\DTMdefkey{finnish}{timesep}{\renewcommand*{\DTMfinnishtimesep}{#1}}
+\DTMdefboolkey{finnish}{abbr}[true]{}
+\DTMsetbool{finnish}{abbr}{false}
\DTMdefboolkey{finnish}{mapzone}[true]{}
\DTMsetbool{finnish}{mapzone}{true}
\DTMdefboolkey{finnish}{showdayofmonth}[true]{}
@@ -74,36 +80,81 @@
{finnish}% label
{% date style
\renewcommand*\DTMdisplaydate[4]{%
+ \ifDTMshowdow
+ \ifnum##4>-1
+ \DTMifbool{finnish}{abbr}%
+ {\DTMfinnishshortweekdayname{##4}}%
+ {\DTMfinnishweekdayname{##4}}%
+ \DTMfinnishdowdaysep
+ \fi
+ \fi
\DTMifbool{finnish}{showdayofmonth}
- {\DTMfinnishordinal{##3}\DTMfinnishdaymonthsep}%
- {}%
- \DTMfinnishmonthname{##2}%
+ {%
+ \DTMfinnishordinal{##3}\DTMfinnishdaymonthsep
+ \DTMifbool{finnish}{abbr}%
+ {\DTMfinnishshortmonthname{##2}}%
+ {\DTMfinnishmonthname{##2}ta}%
+ }%
+ {%
+ \DTMifbool{finnish}{abbr}%
+ {\DTMfinnishshortmonthname{##2}}%
+ {\DTMfinnishmonthname{##2}}%
+ }%
\DTMifbool{finnish}{showyear}%
{%
\DTMfinnishmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
\renewcommand*\DTMDisplaydate[4]{%
- \DTMifbool{finnish}{showdayofmonth}
- {%
- \DTMfinnishordinal{##3}\DTMfinnishdaymonthsep
- \DTMfinnishmonthname{##2}%
- }%
- {%
- \DTMfinnishMonthname{##2}%
- }%
+ \ifDTMshowdow
+ \ifnum##4>-1
+ \DTMifbool{finnish}{abbr}%
+ {\DTMfinnishshortWeekdayname{##4}}%
+ {\DTMfinnishWeekdayname{##4}}%
+ \DTMfinnishdowdaysep
+ \fi
+ \DTMifbool{finnish}{showdayofmonth}
+ {%
+ \DTMfinnishordinal{##3}\DTMfinnishdaymonthsep
+ \DTMifbool{finnish}{abbr}%
+ {\DTMfinnishshortmonthname{##2}}%
+ {\DTMfinnishmonthname{##2}ta}%
+ }%
+ {%
+ \DTMifbool{finnish}{abbr}%
+ {\DTMfinnishshortmonthname{##2}}%
+ {\DTMfinnishmonthname{##2}}%
+ }%
+ \else
+ \DTMifbool{finnish}{showdayofmonth}
+ {%
+ \DTMfinnishordinal{##3}\DTMfinnishdaymonthsep
+ \DTMifbool{finnish}{abbr}%
+ {\DTMfinnishshortmonthname{##2}}%
+ {\DTMfinnishmonthname{##2}ta}%
+ }%
+ {%
+ \DTMifbool{finnish}{abbr}%
+ {\DTMfinnishshortMonthname{##2}}%
+ {\DTMfinnishMonthname{##2}}%
+ }%
+ \fi
\DTMifbool{finnish}{showyear}%
{%
\DTMfinnishmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
}%
- {% time style (use default)
- \DTMsettimestyle{default}%
+ {% time style
+ \renewcommand*\DTMdisplaytime[3]{%
+ \number##1
+ \DTMfinnishtimesep\DTMtwodigits{##2}%
+ \ifDTMshowseconds\DTMfinnishtimesep\DTMtwodigits{##3}\fi
+ }%
}%
{% zone style
\DTMresetzones