From f328f8f461746d6d176bc5066247026665c2b141 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 Sep 2010 23:10:15 +0000 Subject: isodoc update (25aug10) git-svn-id: svn://tug.org/texlive/trunk@19617 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/isodoc/Entries | 15 +++++ Master/texmf-dist/doc/latex/isodoc/README | 42 ++++++++----- Master/texmf-dist/doc/latex/isodoc/Repository | 1 + Master/texmf-dist/doc/latex/isodoc/Root | 1 + Master/texmf-dist/doc/latex/isodoc/doc/letter.tex | 21 +++++++ Master/texmf-dist/doc/latex/isodoc/inst | 3 +- Master/texmf-dist/doc/latex/isodoc/isodoc.pdf | Bin 922748 -> 880544 bytes Master/texmf-dist/doc/latex/isodoc/isontg.sty | 10 +++- Master/texmf-dist/doc/latex/isodoc/isowybo.sty | 10 +++- .../doc/latex/isodoc/language_template.tex | 45 ++++++++++++++ Master/texmf-dist/doc/latex/isodoc/letter.tex | 65 ++++++++++++++++----- Master/texmf-dist/doc/latex/isodoc/logoletter.tex | 10 +++- Master/texmf-dist/doc/latex/isodoc/logostyle.sty | 28 ++++----- Master/texmf-dist/doc/latex/isodoc/ltxdoc.cfg | 9 +++ Master/texmf-dist/doc/latex/isodoc/mystyle.sty | 6 +- 15 files changed, 212 insertions(+), 54 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/isodoc/Entries create mode 100644 Master/texmf-dist/doc/latex/isodoc/Repository create mode 100644 Master/texmf-dist/doc/latex/isodoc/Root create mode 100644 Master/texmf-dist/doc/latex/isodoc/doc/letter.tex create mode 100644 Master/texmf-dist/doc/latex/isodoc/language_template.tex create mode 100644 Master/texmf-dist/doc/latex/isodoc/ltxdoc.cfg (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/isodoc/Entries b/Master/texmf-dist/doc/latex/isodoc/Entries new file mode 100644 index 00000000000..a0a20bd69e3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/isodoc/Entries @@ -0,0 +1,15 @@ +/accept.tex/1.7/Fri Jan 1 21:46:57 2010// +/binaries.m64/1.5/Fri Jan 1 21:51:26 2010// +/invoice.tex/1.2/Sun Nov 5 15:38:52 2006// +/listkeys/1.4/Fri Jan 1 21:59:42 2010// +/ltxdoc.cfg/1.1/Mon Jan 11 20:50:43 2010// +/ntgletter.tex/1.2/Sun Nov 5 15:39:16 2006// +/typo/1.3/Sat Jan 2 16:50:16 2010// +/inst/1.17/Sat Aug 21 15:26:13 2010// +/isontg.sty/1.10/Tue Aug 24 19:20:55 2010// +/isowybo.sty/1.8/Tue Aug 24 19:20:55 2010// +/mystyle.sty/1.6/Tue Aug 24 19:20:55 2010// +/logostyle.sty/1.6/Tue Aug 24 19:23:57 2010// +/logoletter.tex/1.5/Tue Aug 24 19:24:45 2010// +/letter.tex/1.4/Tue Aug 24 19:26:39 2010// +D diff --git a/Master/texmf-dist/doc/latex/isodoc/README b/Master/texmf-dist/doc/latex/isodoc/README index 2e1e74246fa..0d5c85cebf3 100644 --- a/Master/texmf-dist/doc/latex/isodoc/README +++ b/Master/texmf-dist/doc/latex/isodoc/README @@ -1,4 +1,4 @@ -This is version 0.7 of the isodoc class +This is version 0.8 of the isodoc class License: LPPL The isodoc class can be used for the preparation of letters, @@ -8,18 +8,30 @@ wishes and extensible for other document types. Victor Eijkhout’s NTG brief class, which implements the NEN1026 standard, was the starting point. -major changesof v0.7 relative to v0.6: -- using eurosym package instead of marvosym; -- using frenchb package instead of french; -- added addresswidth option, default stays 2 cols; -- changes suggested by Fabrice Niessen (thanks!): -- added header/noheader options; -- added bodyshift option; -- date format can be yyyy-mm-dd or a literal `today'; -- added forcedate option to enter anything for date; -- added foldleft and foldright options, default stays right; -- headingcolor, if defined, colors fancy headings; -- headcolor, if defined, colors headings in header and footer; -- foldmarkcolor, if defined, colors foldmark +major changes of v0.8 relative to v0.7: +- now compatible with XeLaTeX +- made independent of babel/polyglossia packages: user must \Require those, if needed +- handling of font and encoding now left to the user +- language names same as in babel (norwegian -> norsk) +- option language added +- option english is synonym for language=UKenglish +- option american is synonym for language=USenglish +- language options /only/ change keyword translations +- new translations added: italian, spanish, catalan, serbian +- option fontpackage removed +- option cityzip moves zip behind city +- now compatible with XeLaTeX +- made independent of babel/polyglossia packages: user must \Require those, if needed +- handling of font and encoding now left to the user +- language names same as in babel (norwegian -> norsk) +- option language added +- option english is synonym for language=UKenglish +- option american is synonym for language=USenglish +- language options /only/ change keyword translations +- new translations added: italian, spanish, catalan, serbian +- option fontpackage removed +- option cityzip moves zip behind city +- positioning of headings, subject, opening, body text fixed +- repaired several minor bugs -$Id: README,v 1.5 2010-01-02 17:04:01 wybo Exp $ +$Id: README,v 1.6 2010-08-24 19:56:44 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/Repository b/Master/texmf-dist/doc/latex/isodoc/Repository new file mode 100644 index 00000000000..ef401f13adb --- /dev/null +++ b/Master/texmf-dist/doc/latex/isodoc/Repository @@ -0,0 +1 @@ +isodoc/doc diff --git a/Master/texmf-dist/doc/latex/isodoc/Root b/Master/texmf-dist/doc/latex/isodoc/Root new file mode 100644 index 00000000000..646e7b03ec4 --- /dev/null +++ b/Master/texmf-dist/doc/latex/isodoc/Root @@ -0,0 +1 @@ +/home/wybo/CVS diff --git a/Master/texmf-dist/doc/latex/isodoc/doc/letter.tex b/Master/texmf-dist/doc/latex/isodoc/doc/letter.tex new file mode 100644 index 00000000000..3a7518da2b0 --- /dev/null +++ b/Master/texmf-dist/doc/latex/isodoc/doc/letter.tex @@ -0,0 +1,21 @@ +\documentclass[11pt]{isodoc} +\usepackage{mystyle} +\definecolor{headcolor}{gray}{.5} +\setupdocument{ + to = {TeX Users Group\\ + 1466 NW Naito Parkway, Suite 3141\\ + Portland, OR 97208-2311\\ + U.S.A + }, + ourref = 1029, + enclosures = isodoc documentation\\LPPL documentation, + subject = An example letter using the isodoc class, + autograph = 2, +} + +\begin{document} +\letter[language=italian]{This letter was composed using the \LaTeX{} isodoc class. + \par\input{thuan} % for some body +} +\end{document} +$Id: letter.tex,v 1.4 2010-08-24 19:26:39 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/inst b/Master/texmf-dist/doc/latex/isodoc/inst index 9f8ffff2b3e..74e7566223f 100644 --- a/Master/texmf-dist/doc/latex/isodoc/inst +++ b/Master/texmf-dist/doc/latex/isodoc/inst @@ -80,6 +80,7 @@ zip) echo y |tex $NAME.ins >/dev/null for i in *.tex; do + echo ___________ $i ___________ mk --noview --noprint $i done vpp --noview --batch='1 ologo1' logoletter.pdf @@ -103,4 +104,4 @@ zip) exit 1 ;; esac -# $Id: inst,v 1.16 2010-01-02 16:52:07 wybo Exp $ +# $Id: inst,v 1.17 2010-08-21 15:26:13 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf index 9ea6842f098..003a54706fc 100644 Binary files a/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf and b/Master/texmf-dist/doc/latex/isodoc/isodoc.pdf differ diff --git a/Master/texmf-dist/doc/latex/isodoc/isontg.sty b/Master/texmf-dist/doc/latex/isodoc/isontg.sty index 95a4a7355fd..3930410caca 100644 --- a/Master/texmf-dist/doc/latex/isodoc/isontg.sty +++ b/Master/texmf-dist/doc/latex/isodoc/isontg.sty @@ -1,3 +1,10 @@ +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesPackage{isontg} + [2010/08/21 v1.1 NTG style file for isodoc] +\RequirePackage[english,dutch]{babel} +\RequirePackage{ucs}\RequirePackage[utf8x]{inputenc} +\RequirePackage{pxfonts} + \setupdocument{% accountname = NTG, accountno = 1306238, @@ -13,7 +20,6 @@ dutch, email = wybo@servalys.nl, fax = 842--23\,43\,93, fold3, -fontpackage = pxfonts, footer, iban = nl05pstb0001306238, opening = L.S., @@ -50,4 +56,4 @@ cityzip \end{textblock} } \endinput -$Id: isontg.sty,v 1.9 2010-01-01 21:50:59 wybo Exp $ +$Id: isontg.sty,v 1.10 2010-08-24 19:20:55 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/isowybo.sty b/Master/texmf-dist/doc/latex/isodoc/isowybo.sty index e5f1585d927..c57778ab4d6 100644 --- a/Master/texmf-dist/doc/latex/isodoc/isowybo.sty +++ b/Master/texmf-dist/doc/latex/isodoc/isowybo.sty @@ -1,3 +1,10 @@ +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesPackage{isowybo} + [2010/08/21 v1.1 example style for isodoc] +\RequirePackage[english,dutch]{babel} +\RequirePackage{ucs}\RequirePackage[utf8x]{inputenc} +\RequirePackage{pxfonts} + \setupdocument{% accountname = W.H.\ Dekker, accountno = 304046221, @@ -14,7 +21,6 @@ dutch, email = wybo@servalys.nl, fax = 842--234393, fold3, -fontpackage = pxfonts, footer, iban = nl94rabo0304046221, opening = L.S., @@ -31,4 +37,4 @@ zip = 4158 CH, \autograph{2}{.15}{82bp}{15bp}{290bp}{370bp}{signw.png} \autograph{3}{.20}{65bp}{61bp}{263bp}{260bp}{signws.png} \endinput -$Id: isowybo.sty,v 1.7 2010-01-01 21:52:46 wybo Exp $ +$Id: isowybo.sty,v 1.8 2010-08-24 19:20:55 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/language_template.tex b/Master/texmf-dist/doc/latex/isodoc/language_template.tex new file mode 100644 index 00000000000..fed8b5ac7b7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/isodoc/language_template.tex @@ -0,0 +1,45 @@ +\def\japanesedoc{% + \set@lang{japanese} + \gdef\Totaltext {...}{ % Total + \gdef\Vattext {...}{ % Vat + \gdef\accountdatatext {...}{ % Banking data + \gdef\accountnametext {...}{ % in the name of + \gdef\accountnotext {...}{ % Account no. + \gdef\amounttext {...}{ % Amount + \gdef\ccname {...}{ % cc + \gdef\cellphonetext {...}{ % cellphone + \gdef\chambertext {...}{ % ch.comm. + \gdef\datetext {...}{ % Date + \gdef\daystext {...}{ % days + \gdef\descriptiontext {...}{ % Description + \gdef\emailtext {...}{ % email + \gdef\enclosurestext {...}{ % Enclosures: + \gdef\enclosuretext {...}{ % Enclosure: + \gdef\faxtext {...}{ % telefax + \gdef\invoicetext {...}{ % \textbf{\textsc{\Large invoice}} + \gdef\oftext {...}{ % of + \gdef\ourreftext {...}{ % Our reference + \gdef\pagetext {...}{ % Page + \gdef\phonetext {...}{ % telephone + \gdef\referencetext {...}{ % Reference + \gdef\routenotext {...}{ % Routing no + \gdef\subjecttext {...}{ % Subject: + \gdef\termtext {...}{ % term of payment + \gdef\totext {...}{ % To + \gdef\vatnotext {...}{ % vat no. + \gdef\websitetext {...}{ % website + \gdef\yourlettertext {...}{ % Your letter of + \gdef\yourreftext {...}{ % Your reference + \gdef\date{\ifcase\day\or + 1st\or 2nd\or 3rd\or 4th\or 5th\or + 6th\or 7th\or 8th\or 9th\or 10th\or + 11th\or 12th\or 13th\or 14th\or 15th\or + 16th\or 17th\or 18th\or 19th\or 20th\or + 21st\or 22nd\or 23rd\or 24th\or 25th\or + 26th\or 27th\or 28th\or 29th\or 30th\or + 31st\fi\space\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 + \space \number\year} +} +% $Id: language_template.tex,v 1.1 2010-08-20 14:46:23 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/letter.tex b/Master/texmf-dist/doc/latex/isodoc/letter.tex index e495991e532..1a06daa2fbc 100644 --- a/Master/texmf-dist/doc/latex/isodoc/letter.tex +++ b/Master/texmf-dist/doc/latex/isodoc/letter.tex @@ -1,21 +1,56 @@ -\documentclass[11pt]{isodoc} -\usepackage{mystyle} -\definecolor{headcolor}{gray}{.5} +\documentclass[10pt]{isodoc} +\usepackage[english,dutch]{babel} \setupdocument{ - to = {TeX Users Group\\ - 1466 NW Naito Parkway, Suite 3141\\ - Portland, OR 97208-2311\\ - U.S.A - }, - ourref = 1029, + yourletter = 1 Marzo 2010, + yourref = 4532, + ourref = 1029, + date = 20100325, + opening = Egregi signori, + closing = Cordiali saluti, enclosures = isodoc documentation\\LPPL documentation, - subject = An example letter using the isodoc class, - autograph = 2, + subject = Esempio di lettera che utilizza isodoc.cls, +%noheader, + autograph = 1, + language = italian, + company = Wybo Dekker, + street = Deilsedijk 60, + zip = 4158 CH, + city = Deil, + country= The Netherlands, + who = {}, + email = wybo@servalys.nl, +%bodyshift = 10, + footer } \begin{document} -\letter{This letter was composed using the \LaTeX{} isodoc class. - \par\input{thuan} % for some body -} +\letter[ + signature = Wybo, + to = {TeX Users Group\\ + 1466 NW Naito Parkway, Suite 3141\\ + Portland, OR 97208-2311\\ + U.S.A + }, +]{ \par\input{thuan} } + +\selectlanguage{english} +\letter[english, + signature = Wybo, + to = {TeX Users Group\\ + 1466 NW Naito Parkway, Suite 3141\\ + Portland, OR 97208-2311\\ + U.S.A + }, +]{ \par\input{thuan} } + +\selectlanguage{dutch} +\letter[dutch, + signature = Wybo, + to = {TeX Users Group\\ + 1466 NW Naito Parkway, Suite 3141\\ + Portland, OR 97208-2311\\ + U.S.A + }, +]{ \par\input{sample-dutch} } \end{document} -$Id: letter.tex,v 1.3 2010-01-01 21:53:28 wybo Exp $ +$Id: letter.tex,v 1.2 2006-11-05 15:49:44 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/logoletter.tex b/Master/texmf-dist/doc/latex/isodoc/logoletter.tex index 4907d96c378..9d8bdb2deea 100644 --- a/Master/texmf-dist/doc/latex/isodoc/logoletter.tex +++ b/Master/texmf-dist/doc/latex/isodoc/logoletter.tex @@ -1,3 +1,4 @@ +%!xelatex \documentclass[11pt,twoside]{isodoc} \usepackage{logostyle} \setupdocument{ @@ -13,13 +14,18 @@ enclosures = Isodoc documentatie, } \newcommand{\letterbody}{% This is an example of a letter made with the isodoc class. + It has been compiled with XeLaTeX. Note that the date was set to `today', so the date above the letter depends upon the day of compilation. The picture in the logo was designed by Pieter Weltevrede. + The text in the logo is Chopin Script, the body text is MinionPro Regular. The text\footnote{gathered from the \TeX-distribution} has no meaning, its only goal is to get a long letter. - \par\input{typo} + % It's in dutch, so we select that language: + \begin{dutch} + \par\input{typo} + \end{dutch} } \begin{document} @@ -34,4 +40,4 @@ enclosures = Isodoc documentatie, opening = Beste Taco ]{\letterbody} \end{document} -$Id: logoletter.tex,v 1.4 2010-01-01 22:00:26 wybo Exp $ +$Id: logoletter.tex,v 1.5 2010-08-24 19:24:45 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/logostyle.sty b/Master/texmf-dist/doc/latex/isodoc/logostyle.sty index e683478bb6f..ebe00df5e05 100644 --- a/Master/texmf-dist/doc/latex/isodoc/logostyle.sty +++ b/Master/texmf-dist/doc/latex/isodoc/logostyle.sty @@ -1,7 +1,9 @@ -\RequirePackage{ucs} -\RequirePackage[utf8x]{inputenc} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesPackage{logostyle} + [2010/08/21 v1.1 Shiva Shakti style file for isodoc] +\usepackage{fontspec,polyglossia} \setupdocument{ - nofooter,fold2,autograph=1,dutch, + nofooter,fold2,autograph=1, company = The Shiva Shakti Foundation, who = Wybo Dekker, street = Deilsedijk 60, @@ -26,28 +28,26 @@ \definecolor{headcolor}{rgb}{0.42, 0.57, 0.14} % goldenrod2 \definecolor{shivablue}{rgb}{.14,.33,.43} \definecolor{shivaback}{rgb}{.78,.89,.68} -\pdfmapfile{=chopinsc.map} -\newcommand{\chopinscript}{\fontfamily{chopinscript}\selectfont} -\DeclareFontFamily{T1}{chopinscript}{} -\DeclareFontShape{T1}{chopinscript}{m}{n}{ <-> chopinsc}{} \graphicspath{{./graphics/}} \renewcommand{\logo}{ \pagecolor{shivaback} + \begin{textblock}{2}(10,13) + \includegraphics[scale=.3]{shiva_shakti.jpg} + \end{textblock} \begin{textblock}{105}(88,15) \begin{center} - \chopinscript{% - \Huge\noindent\textcolor{shivablue}{The Shiva Shakti Foundation} - }\\[2ex] + \fontspec{ChopinScript} + {\Huge\noindent\textcolor{shivablue}{The Shiva Shakti Foundation}}\\[2ex] Main Building\quad 567\textsuperscript{th} floor\quad Room 123\quad Bangkok \end{center} \end{textblock} - \begin{textblock}{2}(10,13) - \includegraphics[scale=.3]{shiva_shakti.jpg} - \end{textblock} } +\setmainfont[Mapping=tex-text]{MinionPro-Regular} +\setdefaultlanguage{english} +\setotherlanguage{dutch} \endinput -$Id: logostyle.sty,v 1.5 2010-01-01 22:02:21 wybo Exp $ +$Id: logostyle.sty,v 1.6 2010-08-24 19:23:57 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/ltxdoc.cfg b/Master/texmf-dist/doc/latex/isodoc/ltxdoc.cfg new file mode 100644 index 00000000000..d8f9d74d71b --- /dev/null +++ b/Master/texmf-dist/doc/latex/isodoc/ltxdoc.cfg @@ -0,0 +1,9 @@ +\PassOptionsToClass{a4paper}{article} +\AtBeginDocument{\usepackage[a4paper,margin=25mm,left=50mm,nohead]{geometry} + \usepackage{txfonts}\pdfprotrudechars=1} +%\AtBeginDocument{\OnlyDescription} +\AtBeginDocument{\RecordChanges} +\AtBeginDocument{\CodelineIndex\EnableCrossrefs} +\AtEndDocument{\PrintChanges} +\AtEndDocument{\PrintIndex} +%$Id: ltxdoc.cfg,v 1.1 2010-01-11 20:50:43 wybo Exp $ diff --git a/Master/texmf-dist/doc/latex/isodoc/mystyle.sty b/Master/texmf-dist/doc/latex/isodoc/mystyle.sty index a2e2fe517ba..4eb97d6d06f 100644 --- a/Master/texmf-dist/doc/latex/isodoc/mystyle.sty +++ b/Master/texmf-dist/doc/latex/isodoc/mystyle.sty @@ -1,9 +1,9 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{mystyle} - [2006/04/04 v1.0 Letter Company style file for isodoc] + [2010/08/21 v1.1 Letter Company style file for isodoc] +\RequirePackage{pxfonts} \setupdocument{return,footer,fold3, - fontpackage = pxfonts, autograph = 0, company = The Letter Company, returnaddress = Letter Cy\\Deilsedijk 60\\Deil, @@ -31,4 +31,4 @@ \graphicspath{{./graphics/}} \autograph{2}{.30}{75bp}{87bp}{216bp}{261bp}{signw_marked} \endinput -$Id: mystyle.sty,v 1.5 2007-09-02 09:35:59 wybo Exp $ +$Id: mystyle.sty,v 1.6 2010-08-24 19:20:55 wybo Exp $ -- cgit v1.2.3