diff options
author | Karl Berry <karl@freefriends.org> | 2018-08-06 20:56:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-08-06 20:56:47 +0000 |
commit | 9e1e224887153916678bd6f5bb9dd1c69e61d453 (patch) | |
tree | 462be0e38ab758514be00c00ba5c7916301d2741 /Master/texmf-dist/tex/latex/invoice | |
parent | 446ad0df71b4bdd2b9d5d5baea71344246aaa5da (diff) |
invoice (6aug18)
git-svn-id: svn://tug.org/texlive/trunk@48359 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/invoice')
-rw-r--r-- | Master/texmf-dist/tex/latex/invoice/invoice.sty | 33 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/invoice/invoicelabels.sty (renamed from Master/texmf-dist/tex/latex/invoice/invoice.def) | 217 |
2 files changed, 163 insertions, 87 deletions
diff --git a/Master/texmf-dist/tex/latex/invoice/invoice.sty b/Master/texmf-dist/tex/latex/invoice/invoice.sty index ed930becb14..2fb397fddcf 100644 --- a/Master/texmf-dist/tex/latex/invoice/invoice.sty +++ b/Master/texmf-dist/tex/latex/invoice/invoice.sty @@ -2,8 +2,8 @@ % Datei: invoice.sty % Autor: Oliver Corff % Contact: oliver.corff@email.de -% Datum: October 01, 2011 -% Version: 0.9 +% Datum: August 06, 2018 +% Version: 0.91 % Copyright: Ulaanbaatar, Beijing, Berlin, Zagreb, Shenyang, Shanghai % Description: This collection of macros provides % tools for generating complex invoices @@ -16,6 +16,8 @@ % Some of the following contributions came years ago, others quite % recently: % +% Czech: Svarny Petr <svarnypetr@gmail.com> +% % Spanish: Juanjo <jj.hfmc@gmail.com> and Lee Rudolph <lrudolph@panix.com> % % Corrections of Italian orthography: Paolo Cusinu <paolo.cusinu@gmail.com> @@ -27,6 +29,16 @@ % One variant of Spanish: Matias Banchoff <matiasb@cespi.unlp.edu.ar> % %%%%%% +% 2018-08-05 +% Katrin Michelbach, request for "," instead of "." +% email: katrin.michelbach@googlemail.com +% +%%%%%% +% 2018-08-05 +% Svarny Petr, Czech labels +% email: <svarnypetr@gmail.com> +% +%%%%%% % Jacopo, May 2003 % e-mail: jacopo@ % @@ -104,7 +116,7 @@ % ------------------- identification ------------------- % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{invoice}[2011/10/01] +\ProvidesPackage{invoice}[2018/08/06] % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ------------------- language options ------------------- @@ -140,6 +152,8 @@ \DeclareOption{spanishv}{\invoice@language=\number\l@spanishv} \DeclareOption{swedish}{\invoice@language=\number\l@swedish} \DeclareOption{position}{} +\newif\ifcomma +\DeclareOption{comma}{\commatrue} % \ProcessOptions % @@ -149,10 +163,15 @@ \RequirePackage{ifthen} \RequirePackage{longtable} \RequirePackage{calc} -\input{fp} -\input{invoice.def} +\ifcomma + \RequirePackage[output-decimal-marker={,}]{siunitx} +\else + \RequirePackage{siunitx} +\fi +\RequirePackage{fp} +\input{invoicelabels.sty} % -\newcommand{\InvoiceVersion}{0.9}% +\newcommand{\InvoiceVersion}{0.91}% \newcounter{Fee} % \newcounter{VAT} % %\newcounter{VAT@rate} % @@ -815,7 +834,7 @@ \newcommand{\Print@Value}[1]{% \FPmul\r#1{0.01}%% <- Reduce to BaseCurrency \FPtrunc\r\r{2}%% <- Truncate to two digits - \r% % <- Output data! + \num{\r}% % <- Output data! }% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newcommand{\Message@Value}[1]{% diff --git a/Master/texmf-dist/tex/latex/invoice/invoice.def b/Master/texmf-dist/tex/latex/invoice/invoicelabels.sty index 799d203b936..9c8b0e6638e 100644 --- a/Master/texmf-dist/tex/latex/invoice/invoice.def +++ b/Master/texmf-dist/tex/latex/invoice/invoicelabels.sty @@ -1,9 +1,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% File: invoice.def +% File: invoicelabels.sty (used to be invoice.def, renamed for CTAN's sake) % Author: Oliver Corff -% Date: 2003-12-12 -% +% Date: 2018-08-06 +% % This file contains messages, labels etc. in English, German % and other languages. % @@ -14,7 +14,7 @@ % This file is the only file of this package which may be % modified without renaming it. % -% Adding a new language to labels is simple. Follow the +% Adding a new language to labels is simple. Follow the % instructions at line 275 of this file, and, please!, % do not forget to send the result to % @@ -26,7 +26,7 @@ % % Oliver Corff, % -% Berlin, Guangzhou, Ulaanbaatar, Zagreb, Shenyang, Shanghai 2003 +% Berlin, Guangzhou, Ulaanbaatar, Zagreb, Shenyang, Shanghai 2003--2018 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -135,6 +135,7 @@ % Languages other than English in alphabetical order. % So far we have: % - Afrikaans +% - Czech % - Dutch % - (English) (default) % - Estonian @@ -154,25 +155,53 @@ Language \string\l@afrikaans\space unknown.^^J^^J} \else \ifnum\number\invoice@language=\number\l@afrikaans - \def\Warning {Waarskuwing} - \def\Error {Fout} - \def\Expense {Onkostes} - \def\Amount {Bedrag} - \def\Currency {Valuta} - \def\Factor {Faktor} - \def\Activity {Aktiwiteit} - \def\Count {Aantal ure} - \def\UnitRate {Tarief} - \def\Fees {Fooie} - \def\VAT {BTW} - \def\Expenses {Uitgawes} - \def\SumFees {Totaal Fooie} - \def\SumVAT {Totaal BTW} - \def\SumExpenses {Totaal Uitgawes} - \def\SubtotalFee {Subtotaal \Fees} - \def\SubtotalExpenses {Subtotaal \Expenses} - \def\SubtotalProject {Subtotaal \Project} - \def\Total {Totaal} + \def\Warning {Waarskuwing} + \def\Error {Fout} + \def\Expense {Onkostes} + \def\Amount {Bedrag} + \def\Currency {Valuta} + \def\Factor {Faktor} + \def\Activity {Aktiwiteit} + \def\Count {Aantal ure} + \def\UnitRate {Tarief} + \def\Fees {Fooie} + \def\VAT {BTW} + \def\Expenses {Uitgawes} + \def\SumFees {Totaal Fooie} + \def\SumVAT {Totaal BTW} + \def\SumExpenses {Totaal Uitgawes} + \def\SubtotalFee {Subtotaal \Fees} + \def\SubtotalExpenses {Subtotaal \Expenses} + \def\SubtotalProject {Subtotaal \Project} + \def\Total {Totaal} +\fi\fi +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This is Czech. +% +\ifx\l@czech\undefined + \message{^^J(invoice) \Warning: + Language \string\l@czech\space unknown.^^J^^J} +\else +\ifnum\number\invoice@language=\number\l@czech + \def\Warning {Upozorn{\v e}n{\' i}}% + \def\Error {Chyba}% + \def\Expense {Výdaj}% + \def\Amount {Cena}% + \def\Currency {M{\v e}na}% + \def\Factor {Pom{\e }r}% + \def\Activity {{\v C}innost}% + \def\Count {Po{\v c}et}% + \def\UnitRate {Cena}% + \def\Fees {Cena}% + \def\VAT {DPH}% + \def\Expenses {V{\' y}daje}% + \def\SumFees {\Fees celkem bez \VAT}% + \def\SumVAT {\VAT celkem}% + \def\SumExpenses {\Expenses celkem}% + \def\SubtotalFee {Mezisou{\v c}et \Fees}% + \def\SubtotalExpenses {Mezisou{\v c}et \Expenses}% + \def\SubtotalProject {Mezisou{\v c}et \Project}% + \def\Total {Celkem k {\' u}hrad{\v e}}% \fi\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % This is Dutch. @@ -183,24 +212,24 @@ \else \ifnum\number\invoice@language=\number\l@dutch \def\Warning {Waarschuwing}% - \def\Error {Fout}% - \def\Expense {Onkosten}% - \def\Amount {Bedrag}% - \def\Currency {Valuta}% - \def\Factor {Faktor}% - \def\Activity {Activiteit}% - \def\Count {Aantal}% - \def\UnitRate {Prijs/Eenheid}% - \def\Fees {Honorarium}% - \def\VAT {BTW}% - \def\Expenses {Onkosten}% - \def\SumFees {Totaal \Fees}% - \def\SumVAT {Totaal \VAT}% - \def\SumExpenses {Totaal \Expenses}% - \def\SubtotalFee {Subtotaal \Fees}% - \def\SubtotalExpenses {Subtotaal \Expenses}% - \def\SubtotalProject {Subtotaal \Project}% - \def\Total {Totaal}% + \def\Error {Fout}% + \def\Expense {Onkosten}% + \def\Amount {Bedrag}% + \def\Currency {Valuta}% + \def\Factor {Faktor}% + \def\Activity {Activiteit}% + \def\Count {Aantal}% + \def\UnitRate {Prijs/Eenheid}% + \def\Fees {Honorarium}% + \def\VAT {BTW}% + \def\Expenses {Onkosten}% + \def\SumFees {Totaal \Fees}% + \def\SumVAT {Totaal \VAT}% + \def\SumExpenses {Totaal \Expenses}% + \def\SubtotalFee {Subtotaal \Fees}% + \def\SubtotalExpenses {Subtotaal \Expenses}% + \def\SubtotalProject {Subtotaal \Project}% + \def\Total {Totaal}% \fi\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % This is Estonian @@ -237,24 +266,24 @@ \else \ifnum\number\invoice@language=\number\l@finnish \def\Warning {Varoitus} % Enter translations here! - \def\Error {Virhe} % - \def\Expense {Kulu} % - \def\Amount {Summa} % - \def\Currency {Valuutta} % - \def\Factor {Kerroin} % - \def\Activity {Laskutusperuste} % - \def\Count {Määrä} % - \def\UnitRate {Yksikköhinta} % - \def\Fees {Työt} % - \def\VAT {ALV} % - \def\Expenses {Kulut} % - \def\SumFees {Työt yhteensä} % - \def\SumVAT {ALV yhteensä} % - \def\SumExpenses {Kulut yhteensä} % - \def\SubtotalFee {Työt välisumma} % - \def\SubtotalExpenses {Kulut välisumma} % - \def\SubtotalProject {Välisumma} % - \def\Total {Yhteensä} % + \def\Error {Virhe} % + \def\Expense {Kulu} % + \def\Amount {Summa} % + \def\Currency {Valuutta} % + \def\Factor {Kerroin} % + \def\Activity {Laskutusperuste} % + \def\Count {Määrä} % + \def\UnitRate {Yksikköhinta} % + \def\Fees {Työt} % + \def\VAT {ALV} % + \def\Expenses {Kulut} % + \def\SumFees {Työt yhteensä} % + \def\SumVAT {ALV yhteensä} % + \def\SumExpenses {Kulut yhteensä} % + \def\SubtotalFee {Työt välisumma} % + \def\SubtotalExpenses {Kulut välisumma} % + \def\SubtotalProject {Välisumma} % + \def\Total {Yhteensä} % \fi\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % This is French. @@ -313,6 +342,34 @@ \def\Total {Gesamtsumme}% \fi\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% This is New German. +% +\ifx\l@ngerman\undefined + \message{^^J(invoice) \Warning: + Language \string\l@ngerman\space unknown.^^J^^J} +\else +\ifnum\number\invoice@language=\number\l@ngerman + \def\Warning {Warnung}% + \def\Error {Fehler}% + \def\Expense {Auslage}% + \def\Amount {Betrag}% + \def\Currency {W\"ahrung}% + \def\Factor {Faktor}% + \def\Activity {Aktivit\"at}% + \def\Count {Anzahl}% + \def\UnitRate {Rate/Einheit}% + \def\Fees {Honorare}% + \def\VAT {MWSt.}% + \def\Expenses {Auslagen}% + \def\SumFees {Summe \Fees}% + \def\SumVAT {Summe \VAT}% + \def\SumExpenses {Summe \Expenses}% + \def\SubtotalFee {Zwischensumme \Fees}% + \def\SubtotalExpenses {Zwischensumme \Expenses}% + \def\SubtotalProject {Zwischensumme \Project}% + \def\Total {Gesamtsumme}% +\fi\fi +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % This is Italian. % \ifx\l@italian\undefined @@ -453,7 +510,7 @@ \def\Total {Slutsumma}% \fi\fi %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% +% % How to add new label languages to the `invoice' package: % % 1. Copy all following lines after this explanation @@ -468,7 +525,7 @@ % into the condition of the \ifnum clause. % % 5. Please do not forget to mail the resulting file to -% corff@zedat.fu-berlin.de or oliver.corff@email.de +% oliver.corff@email.de % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -480,22 +537,22 @@ %\else %\ifnum\number\invoice@language=\number\l@german % \def\Warning {} % Enter translations here! -% \def\Error {} % -% \def\Expense {} % -% \def\Amount {} % -% \def\Currency {} % -% \def\Factor {} % -% \def\Activity {} % -% \def\Count {} % -% \def\UnitRate {} % -% \def\Fees {} % -% \def\VAT {} % -% \def\Expenses {} % -% \def\SumFees {} % -% \def\SumVAT {} % -% \def\SumExpenses {} % -% \def\SubtotalFee {} % -% \def\SubtotalExpenses {} % -% \def\SubtotalProject {} % -% \def\Total {} % +% \def\Error {} % +% \def\Expense {} % +% \def\Amount {} % +% \def\Currency {} % +% \def\Factor {} % +% \def\Activity {} % +% \def\Count {} % +% \def\UnitRate {} % +% \def\Fees {} % +% \def\VAT {} % +% \def\Expenses {} % +% \def\SumFees {} % +% \def\SumVAT {} % +% \def\SumExpenses {} % +% \def\SubtotalFee {} % +% \def\SubtotalExpenses {} % +% \def\SubtotalProject {} % +% \def\Total {} % %\fi\fi |