From e49e8bc0b7e9222bc4e40d2e3b0298262c78380a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 May 2015 21:53:29 +0000 Subject: datetime2-italian (1may15) git-svn-id: svn://tug.org/texlive/trunk@37146 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/datetime2-italian/README | 2 +- .../latex/datetime2-italian/datetime2-italian.pdf | Bin 271655 -> 0 bytes .../latex/datetime2-italian/sample/datetime1.tex | 11 ++- .../sample/datetime2-sample-styles.tex | 11 ++- .../latex/datetime2-italian/sample/tomorrow.tex | 8 -- .../latex/datetime2-italian/datetime2-italian.dtx | 100 ++++++++++++++++----- .../latex/datetime2-italian/datetime2-italian.ins | 1 + .../datetime2-italian/datetime2-italian-ascii.ldf | 3 +- .../datetime2-italian/datetime2-italian-utf8.ldf | 6 +- .../latex/datetime2-italian/datetime2-italian.ldf | 49 +++++++++- 10 files changed, 148 insertions(+), 43 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/datetime2-italian/datetime2-italian.pdf (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/datetime2-italian/README b/Master/texmf-dist/doc/latex/datetime2-italian/README index 1d4e172310a..e4ab0fef27d 100644 --- a/Master/texmf-dist/doc/latex/datetime2-italian/README +++ b/Master/texmf-dist/doc/latex/datetime2-italian/README @@ -2,7 +2,7 @@ Italian Language Module for datetime2 Package Author: Nicola L. C. Talbot (inactive) -Mantainer: CLaudio Duchi +Mantainer: Claudio Duchi claduc at libero dot it Licence: LPPL diff --git a/Master/texmf-dist/doc/latex/datetime2-italian/datetime2-italian.pdf b/Master/texmf-dist/doc/latex/datetime2-italian/datetime2-italian.pdf deleted file mode 100644 index 04729ae44af..00000000000 Binary files a/Master/texmf-dist/doc/latex/datetime2-italian/datetime2-italian.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/datetime2-italian/sample/datetime1.tex b/Master/texmf-dist/doc/latex/datetime2-italian/sample/datetime1.tex index 170021968a4..40975b2d6dc 100644 --- a/Master/texmf-dist/doc/latex/datetime2-italian/sample/datetime1.tex +++ b/Master/texmf-dist/doc/latex/datetime2-italian/sample/datetime1.tex @@ -1,7 +1,12 @@ \documentclass[italian]{article} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} -\usepackage[italian]{babel} +\usepackage{ifpdf,ifxetex} +\ifpdf +\usepackage{babel} +\else +\usepackage{fontspec} +\usepackage{polyglossia} +\setdefaultlanguage{italian} +\fi \usepackage[useregional]{datetime2} \begin{document} Questo PDF è stato creato il \today diff --git a/Master/texmf-dist/doc/latex/datetime2-italian/sample/datetime2-sample-styles.tex b/Master/texmf-dist/doc/latex/datetime2-italian/sample/datetime2-sample-styles.tex index e7e65cbe5b9..3261d806048 100644 --- a/Master/texmf-dist/doc/latex/datetime2-italian/sample/datetime2-sample-styles.tex +++ b/Master/texmf-dist/doc/latex/datetime2-italian/sample/datetime2-sample-styles.tex @@ -76,12 +76,19 @@ Testing time styles. hmmss: \DTMcurrenttime. \DTMusetime{mydate}. \DTMusetime{mydate2}. + \DTMusetime{noon}. + \DTMusetime{midnight1}. + \DTMusetime{midnight2}. + \DTMusetime{8am}. + \DTMusetime{8pm}. + \DTMusetime{1203}. + \DTMusetime{2401}. \DTMusetime{0001}. @@ -124,9 +131,9 @@ ampm: \DTMcurrenttime. \DTMusetime{0001}. } -\renewcommand*{\DTMitalianampmfmt}[1]{\protect\textsc{#1}} +\DTMsettimestyle{italian-twenty-four} +(italian-twenty-four) \DTMcurrenttime. -(ampm sc) \DTMcurrenttime. \DTMusetime{mydate}. \DTMusetime{mydate2}. \DTMusetime{noon}. diff --git a/Master/texmf-dist/doc/latex/datetime2-italian/sample/tomorrow.tex b/Master/texmf-dist/doc/latex/datetime2-italian/sample/tomorrow.tex index ba3cf153c99..8892d71d41e 100644 --- a/Master/texmf-dist/doc/latex/datetime2-italian/sample/tomorrow.tex +++ b/Master/texmf-dist/doc/latex/datetime2-italian/sample/tomorrow.tex @@ -1,12 +1,4 @@ \documentclass[italian]{article} -\usepackage{pgfkeys,pgfcalendar} - -\newcount\pgfdatecount -%\newcommand{\tomorrow}{% -%\pgfcalendardatetojulian{\year-\month-\day+1}{\pgfdatecount} -%\pgfcalendarjuliantodate{\the\pgfdatecount}{\myyear}{\mymonth}{\myday} -%\pgfcalendarmonthname{\mymonth}\space\myday,\space\myyear% -%} \newcount\myct \newcount\datecount \newcommand{\tomorrow}{% diff --git a/Master/texmf-dist/source/latex/datetime2-italian/datetime2-italian.dtx b/Master/texmf-dist/source/latex/datetime2-italian/datetime2-italian.dtx index df151199e0e..1c194b04535 100644 --- a/Master/texmf-dist/source/latex/datetime2-italian/datetime2-italian.dtx +++ b/Master/texmf-dist/source/latex/datetime2-italian/datetime2-italian.dtx @@ -20,8 +20,6 @@ % \iffalse % Doc-Source file to use with LaTeX2e % Copyright (C) 2015 Nicola Talbot, all rights reserved. -% -% I have added dates in formed short e ampm format % \fi % \iffalse %<*driver> @@ -38,7 +36,7 @@ pdftitle={datetime2.sty Italian Module}]{hyperref} -\CheckSum{414} +\CheckSum{467} \renewcommand*{\usage}[1]{\hyperpage{#1}} \renewcommand*{\main}[1]{\hyperpage{#1}} @@ -62,13 +60,12 @@ % %\title{Italian Module for datetime2 Package} %\author{Nicola L. C. Talbot (inactive)} -%\date{2015-03-27 (v1.0)} +%\date{2015-05-01 (v1.3)} %\maketitle % -%This module is currently unmaintained and may be subject to change. -%If you want to volunteer to take over maintanance, contact me at -%\url{http://www.dickimaw-books.com/contact.html} +% This module is currently maintained and may be subject to change. % +% The Current Maintainer of this work is Claudio Duchi claduc at libero dot it %\begin{abstract} %This is the Italian language module for the \sty{datetime2} %package. If you want to use the settings in this module you must @@ -100,10 +97,13 @@ %This file contains the settings that use UTF-8 characters. This %file is loaded if XeLaTeX or LuaLaTeX are used. Please make sure %your text editor is set to UTF-8 if you want to view this code. -%\changes{1.0}{2015-03-27}{Initial release} +%\changes{1.0}{2015-03-10}{Initial release} +%\changes{1.1}{2015-04-10}{Add timestyle italianampm% } +%\changes{1.2}{2015-04-16}{Add timestyle italian-twenty-four% } +%\changes{1.3}{2015-05-01}{bug fif% } % Identify module % \begin{macrocode} -\ProvidesDateTimeModule{italian-utf8}[2015/04/10 v1.1] +\ProvidesDateTimeModule{italian-utf8}[2015/05/01 v1.3] % \end{macrocode} %\begin{macro}{\DTMitalianordinal} % \begin{macrocode} @@ -118,6 +118,7 @@ % \begin{macrocode} \newcommand*{\DTMitalianmonthname}[1]{% \ifcase#1 + \or gennaio% \or febbraio% @@ -147,7 +148,6 @@ %\end{macro} % % - % %\begin{macro}{\DTMitalianweekdayname} %These are provided here but not currently used in the date format. @@ -178,6 +178,7 @@ % \begin{macrocode} \newcommand*{\DTMitalianshortmonthname}[1]{% \ifcase#1 + \or gen.% \or feb.% @@ -245,14 +246,15 @@ %\texttt{datetime2-italian-utf8.ldf} file as the non-ASCII %characters are made active in that situation and would need %protecting against expansion. -%\changes{1.0}{2015-03-27}{Initial release} +%\changes{1.0}{2015-03-10}{Initial release} +%\changes{1.1}{2015-04-10}{Add timestyle italianampm% } +%\changes{1.2}{2015-04-16}{Add timestyle italian-twenty-four% } +%\changes{1.3}{2015-05-01}{bug fif% } % Identify module % \begin{macrocode} -\ProvidesDateTimeModule{italian-ascii}[2015/04/10 v1.1] +\ProvidesDateTimeModule{italian-ascii}[2015/05/01 v1.3] % \end{macrocode} % -%If abbreviated dates are supported, short month names should be -%likewise provided. %\begin{macro}{\DTMitalianordinal} % \begin{macrocode} \newcommand*{\DTMitalianordinal}[1]{% @@ -384,7 +386,10 @@ % %\subsection{Main Italian Module (\texttt{datetime2-italian.ldf})} %\changes{1.0}{2015-03-10}{Initial release} -%\changes{1.1}{2015-04-10}{updating} +%\changes{1.1}{2015-04-10}{Add timestyle italianampm% } +%\changes{1.2}{2015-04-16}{Add timestyle italian-twenty-four% } +%\changes{1.3}{2015-05-01}{bug fif% } +% %\iffalse % \begin{macrocode} %<*datetime2-italian.ldf> @@ -393,7 +398,7 @@ % % Identify Module % \begin{macrocode} -\ProvidesDateTimeModule{italian}[2015/04/10 v1.1] +\ProvidesDateTimeModule{italian}[2015/05/01 v1.3] % \end{macrocode} % Need to find out if XeTeX or LuaTeX are being used. % \begin{macrocode} @@ -416,10 +421,12 @@ % % Define the \texttt{italian} style. % The time style is the same as the "default" style -% provided by \sty{datetime2}. This may need correcting. +% provided by \sty{datetime2}. % -% Allow the user a way of configuring the "italian" and -% "italian-numeric" styles. This doesn't use the package wide +% the packet defines the styles: "italian", +% "italian-numeric", "italianampm" and "italian-twenty-four" styles. +% +%This doesn't use the package wide % separators such as % \cs{dtm@datetimesep} in case other date formats are also required. %\begin{macro}{\DTMitaliandaymonthsep} @@ -466,8 +473,8 @@ % \end{macrocode} %\end{macro} % -%Provide keys that can be used in \cs{DTMlangsetup} to set these -%separators. +% Provide keys that can be used in \cs{DTMlangsetup} to set these +% separators. % \begin{macrocode} \DTMdefkey{italian}{daymonthsep}{\renewcommand*{\DTMitaliandaymonthsep}{#1}} \DTMdefkey{italian}{monthyearsep}{\renewcommand*{\DTMitalianmonthyearsep}{#1}} @@ -589,7 +596,7 @@ }% {% time style \renewcommand*\DTMitaliantimesep{\DTMitaliantimesep}% - \DTMsettimestyle{default}%ampm + \DTMsettimestyle{default}% }% {% zone style \DTMresetzones @@ -757,6 +764,54 @@ }% % \end{macrocode} % +% Define italian-twenty-four style. +% +% \begin{macrocode} + \DTMnewtimestyle + {italian-twenty-four}% label + {% + \renewcommand*\DTMdisplaytime[3]{% + \ifnum##2=0 + \ifnum##1=12 + \DTMtexorpdfstring + {\DTMitalianampmfmt{\DTMitaliannoon}}% + {\DTMitaliannoon}% + \else + \ifnum##1=0 + \DTMtexorpdfstring + {\DTMitalianampmfmt{\DTMitalianmidnight}}% + {\DTMitalianmidnight}% + \else + \ifnum##1=24 + \DTMtexorpdfstring + {\DTMitalianampmfmt{\DTMitalianmidnight}}% + {\DTMitalianmidnight}% + \else + \ifnum##1<12 + \DTMtwodigits{##1}\DTMitaliantimesep\DTMtwodigits{##2}% + \else + \DTMtwodigits{##1}\DTMitaliantimesep\DTMtwodigits{##2}% + \fi + \fi + \fi + \fi + \else + \ifnum##1<13 + \ifnum##1=0 + \DTMtwodigits{##1}% + \else + \DTMtwodigits{##1}\relax + \fi + \DTMitaliantimesep\DTMtwodigits{##2}% + \else + \DTMtwodigits{##1}\relax + \DTMitaliantimesep\DTMtwodigits{##2}% + \fi + \fi + }% + }% +% \end{macrocode} +% % %\begin{macro}{\DTMitalianzonemaps} % The time zone mappings are set through this command, which can be @@ -769,7 +824,6 @@ } % \end{macrocode} %\end{macro} - % Switch style according to the \opt{useregional} setting. % \begin{macrocode} \DTMifcaseregional diff --git a/Master/texmf-dist/source/latex/datetime2-italian/datetime2-italian.ins b/Master/texmf-dist/source/latex/datetime2-italian/datetime2-italian.ins index 28ed287cf2c..3e9b4abb6b7 100644 --- a/Master/texmf-dist/source/latex/datetime2-italian/datetime2-italian.ins +++ b/Master/texmf-dist/source/latex/datetime2-italian/datetime2-italian.ins @@ -14,6 +14,7 @@ version 2005/12/01 or later. The Current Maintainer of this work is Claudio Duchi + claduc at libero dot it This work has the LPPL maintenance status `maintained'. diff --git a/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian-ascii.ldf b/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian-ascii.ldf index 33860795e56..f83de42e9fa 100644 --- a/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian-ascii.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian-ascii.ldf @@ -18,6 +18,7 @@ %% version 2005/12/01 or later. %% %% The Current Maintainer of this work is Claudio Duchi +%% claduc at libero dot it %% %% This work has the LPPL maintenance status `maintained'. %% @@ -41,7 +42,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{italian-ascii}[2015/04/10 v1.1] +\ProvidesDateTimeModule{italian-ascii}[2015/05/01 v1.3] \newcommand*{\DTMitalianordinal}[1]{% \number#1 }% diff --git a/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian-utf8.ldf b/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian-utf8.ldf index cdfdff542b6..de779cd51a2 100644 --- a/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian-utf8.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian-utf8.ldf @@ -18,6 +18,7 @@ %% version 2005/12/01 or later. %% %% The Current Maintainer of this work is Claudio Duchi +%% claduc at libero dot it %% %% This work has the LPPL maintenance status `maintained'. %% @@ -41,12 +42,13 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{italian-utf8}[2015/04/10 v1.1] +\ProvidesDateTimeModule{italian-utf8}[2015/05/01 v1.3] \newcommand*{\DTMitalianordinal}[1]{% \number#1 }% \newcommand*{\DTMitalianmonthname}[1]{% \ifcase#1 + \or gennaio% \or febbraio% @@ -72,7 +74,6 @@ dicembre% \fi } - \newcommand*{\DTMitalianweekdayname}[1]{% \ifcase#1 lunedì% @@ -92,6 +93,7 @@ } \newcommand*{\DTMitalianshortmonthname}[1]{% \ifcase#1 +\or gen.% \or feb.% diff --git a/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian.ldf b/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian.ldf index 968f59a5133..3420014bd74 100644 --- a/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian.ldf +++ b/Master/texmf-dist/tex/latex/datetime2-italian/datetime2-italian.ldf @@ -18,6 +18,7 @@ %% version 2005/12/01 or later. %% %% The Current Maintainer of this work is Claudio Duchi +%% claduc at libero dot it %% %% This work has the LPPL maintenance status `maintained'. %% @@ -41,7 +42,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesDateTimeModule{italian}[2015/04/10 v1.1] +\ProvidesDateTimeModule{italian}[2015/05/01 v1.3] \RequirePackage{ifxetex,ifluatex} \ifxetex \RequireDateTimeModule{italian-utf8} @@ -132,7 +133,7 @@ }% {% time style \renewcommand*\DTMitaliantimesep{\DTMitaliantimesep}% -\DTMsettimestyle{default}%ampm +\DTMsettimestyle{default}% }% {% zone style \DTMresetzones @@ -290,11 +291,53 @@ \fi }% }% + \DTMnewtimestyle + {italian-twenty-four}% label + {% + \renewcommand*\DTMdisplaytime[3]{% + \ifnum##2=0 + \ifnum##1=12 + \DTMtexorpdfstring + {\DTMitalianampmfmt{\DTMitaliannoon}}% + {\DTMitaliannoon}% + \else + \ifnum##1=0 + \DTMtexorpdfstring + {\DTMitalianampmfmt{\DTMitalianmidnight}}% + {\DTMitalianmidnight}% + \else + \ifnum##1=24 + \DTMtexorpdfstring + {\DTMitalianampmfmt{\DTMitalianmidnight}}% + {\DTMitalianmidnight}% + \else + \ifnum##1<12 + \DTMtwodigits{##1}\DTMitaliantimesep\DTMtwodigits{##2}% + \else + \DTMtwodigits{##1}\DTMitaliantimesep\DTMtwodigits{##2}% + \fi + \fi + \fi + \fi + \else + \ifnum##1<13 + \ifnum##1=0 + \DTMtwodigits{##1}% + \else + \DTMtwodigits{##1}\relax + \fi + \DTMitaliantimesep\DTMtwodigits{##2}% + \else + \DTMtwodigits{##1}\relax + \DTMitaliantimesep\DTMtwodigits{##2}% + \fi + \fi + }% + }% \newcommand*{\DTMitalianzonemaps}{% \DTMdefzonemap{01}{00}{CET}% \DTMdefzonemap{02}{00}{CEST}% } - \DTMifcaseregional {}% do nothing {\DTMsetstyle{italian}} -- cgit v1.2.3