mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-24 21:55:29 +00:00
* lib/examples/addressExample.adr:
- don't use German abbreviations (such as "w") and expressions. - add some documentation. * lib/examples/de/serienbrief[1-3]: - fix spelling git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23031 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller
parent
f35ff8f60d
commit
8aec041bcc
@ -1,32 +1,61 @@
|
||||
% Syntax:
|
||||
% \adrentry{Lastname} -> #1
|
||||
% {Firstname} -> #2
|
||||
% {Address} -> #3
|
||||
% {Telephone} -> #4
|
||||
% {F1} -> #5
|
||||
% {F2} -> #6
|
||||
% {Comment} -> #7
|
||||
% {ID} -> #8
|
||||
%
|
||||
% The F1 and F2 fields are free custom fields (F1 is used for gender
|
||||
% in this example). If you need more fields, there's also an \addrentry
|
||||
% entry type (note the additional 'd'), which has one additional field
|
||||
% (cf. the KOMA-script documentation for details).
|
||||
% NOTE: the ID must be unique.
|
||||
|
||||
|
||||
\adrentry{Miller}
|
||||
{John}
|
||||
{43 Straight Street\\Boston}
|
||||
{033-3445-90}
|
||||
{m}
|
||||
{}
|
||||
{Customer}
|
||||
{JOMILL}
|
||||
|
||||
\adrentry{Boehme}
|
||||
{Wilhelm}
|
||||
{Ubierweg 49\\754127 Dingsda}
|
||||
{0227557/35448}
|
||||
{m}
|
||||
{}
|
||||
{alter Kollege}
|
||||
{Friend}
|
||||
{WILBOE}
|
||||
|
||||
\adrentry{Zylla}
|
||||
{Rieke}
|
||||
{Salierweg 9\\850289 Kolonia}
|
||||
{022811/458290}
|
||||
{w}
|
||||
{f}
|
||||
{}
|
||||
{Versicherung}
|
||||
{Supervisor}
|
||||
{RIEZY}
|
||||
|
||||
\adrentry{Klausen}
|
||||
{Daniela}
|
||||
{Promenadenweg 17\\23155 Fuhlingen}
|
||||
{0672289/30945}
|
||||
{w}
|
||||
{f}
|
||||
{}
|
||||
{Freundin}
|
||||
{fellow student}
|
||||
{DANKLA}
|
||||
|
||||
\adrentry{Tollmann}
|
||||
{Gerd}
|
||||
{Ginsterweg 119\\48890 Karlingen}
|
||||
{074418/90833}
|
||||
{m}
|
||||
{}
|
||||
{Urlaub}
|
||||
{Holiday 2004}
|
||||
{GERTO}
|
||||
|
||||
@ -108,7 +108,7 @@ fromurl=true% print sender URL
|
||||
\begin_body
|
||||
|
||||
\begin_layout Name
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\end_layout
|
||||
|
||||
\begin_layout SenderAddress
|
||||
@ -132,7 +132,7 @@ www.lyx.org
|
||||
\end_layout
|
||||
|
||||
\begin_layout Backaddress
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\newline
|
||||
Planstr.
|
||||
140
|
||||
@ -141,11 +141,11 @@ Planstr.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Signature
|
||||
Das LyX Team
|
||||
Das LyX-Team
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subject
|
||||
Neues KOMA letter Layout
|
||||
Neues KOMA-Brief-Layout
|
||||
\end_layout
|
||||
|
||||
\begin_layout Place
|
||||
@ -188,10 +188,28 @@ adrentry}[8]{
|
||||
|
||||
\begin_layout Address
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
status open
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
{}
|
||||
\backslash
|
||||
if #5f{Frau}
|
||||
\backslash
|
||||
fi
|
||||
\end_layout
|
||||
|
||||
\begin_layout PlainLayout
|
||||
|
||||
|
||||
\backslash
|
||||
if #5m{Herrn}
|
||||
\backslash
|
||||
fi
|
||||
\end_layout
|
||||
|
||||
\begin_layout PlainLayout
|
||||
|
||||
#2 #1
|
||||
\backslash
|
||||
|
||||
@ -221,7 +239,7 @@ fi
|
||||
|
||||
|
||||
\backslash
|
||||
if #5w{Sehr geehrte Frau #1,}
|
||||
if #5f{Sehr geehrte Frau #1,}
|
||||
\backslash
|
||||
fi
|
||||
\end_layout
|
||||
@ -252,7 +270,29 @@ Einstellungen\SpecialChar \menuseparator
|
||||
LaTeX-Vorspann
|
||||
\family default
|
||||
finden sich die Einstellmöglichkeiten der meisten gebräuchlichen Parameter.
|
||||
Die KOMA Script Dokumentation
|
||||
Die KOMA
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
\begin_layout PlainLayout
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Script
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
\begin_layout PlainLayout
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Dokumentation
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
@ -276,13 +316,13 @@ Viel Spaß!
|
||||
\end_layout
|
||||
|
||||
\begin_layout PS
|
||||
p.\InsetSpace \thinspace{}
|
||||
s.: Blaufarbige Items sollen vor der Adresse eingefügt werden, magentafarbige
|
||||
P.\InsetSpace \thinspace{}
|
||||
S.: Blaufarbige Items sollen vor der Adresse eingefügt werden, magentafarbige
|
||||
danach.
|
||||
\end_layout
|
||||
|
||||
\begin_layout CC
|
||||
Die LyX User
|
||||
Die LyX-User
|
||||
\end_layout
|
||||
|
||||
\begin_layout EndLetter
|
||||
|
||||
@ -108,7 +108,7 @@ fromurl=true% print sender URL
|
||||
\begin_body
|
||||
|
||||
\begin_layout Name
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\end_layout
|
||||
|
||||
\begin_layout SenderAddress
|
||||
@ -132,7 +132,7 @@ www.lyx.org
|
||||
\end_layout
|
||||
|
||||
\begin_layout Backaddress
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\newline
|
||||
Planstr.
|
||||
140
|
||||
@ -141,11 +141,11 @@ Planstr.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Signature
|
||||
Das LyX Team
|
||||
Das LyX-Team
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subject
|
||||
Neues KOMA letter Layout
|
||||
Neues KOMA-Brief-Layout
|
||||
\end_layout
|
||||
|
||||
\begin_layout Place
|
||||
@ -219,7 +219,29 @@ Einstellungen\SpecialChar \menuseparator
|
||||
LaTeX-Vorspann
|
||||
\family default
|
||||
finden sich die Einstellmöglichkeiten der meisten gebräuchlichen Parameter.
|
||||
Die KOMA Script Dokumentation
|
||||
Die KOMA
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
\begin_layout PlainLayout
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Script
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
\begin_layout PlainLayout
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Dokumentation
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
@ -243,13 +265,13 @@ Viel Spaß!
|
||||
\end_layout
|
||||
|
||||
\begin_layout PS
|
||||
p.\InsetSpace \thinspace{}
|
||||
s.: Blaufarbige Items sollen vor der Adresse eingefügt werden, magentafarbige
|
||||
P.\InsetSpace \thinspace{}
|
||||
S.: Blaufarbige Items sollen vor der Adresse eingefügt werden, magentafarbige
|
||||
danach.
|
||||
\end_layout
|
||||
|
||||
\begin_layout CC
|
||||
Die LyX User
|
||||
Die LyX-User
|
||||
\end_layout
|
||||
|
||||
\begin_layout EndLetter
|
||||
|
||||
@ -108,7 +108,7 @@ fromurl=true% print sender URL
|
||||
\begin_body
|
||||
|
||||
\begin_layout Name
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\end_layout
|
||||
|
||||
\begin_layout SenderAddress
|
||||
@ -132,7 +132,7 @@ www.lyx.org
|
||||
\end_layout
|
||||
|
||||
\begin_layout Backaddress
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\newline
|
||||
Planstr.
|
||||
140
|
||||
@ -141,11 +141,11 @@ Planstr.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Signature
|
||||
Das LyX Team
|
||||
Das LyX-Team
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subject
|
||||
Neues KOMA letter Layout
|
||||
Neues KOMA-Brief-Layout
|
||||
\end_layout
|
||||
|
||||
\begin_layout Place
|
||||
@ -194,7 +194,7 @@ status open
|
||||
|
||||
|
||||
\backslash
|
||||
if #5w
|
||||
if #5f
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -213,6 +213,7 @@ wenn Person weiblich ist
|
||||
\end_layout
|
||||
|
||||
\begin_layout Address
|
||||
Frau
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
@ -222,6 +223,11 @@ status collapsed
|
||||
\backslash
|
||||
|
||||
\backslash
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
#3
|
||||
\end_layout
|
||||
|
||||
@ -266,7 +272,29 @@ Einstellungen\SpecialChar \menuseparator
|
||||
LaTeX-Vorspann
|
||||
\family default
|
||||
finden sich die Einstellmöglichkeiten der meisten gebräuchlichen Parameter.
|
||||
Die KOMA Script Dokumentation
|
||||
Die KOMA
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
\begin_layout PlainLayout
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Script
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
\begin_layout PlainLayout
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Dokumentation
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
@ -290,13 +318,13 @@ Viel Spaß!
|
||||
\end_layout
|
||||
|
||||
\begin_layout PS
|
||||
p.\InsetSpace \thinspace{}
|
||||
s.: Blaufarbige Items sollen vor der Adresse eingefügt werden, magentafarbige
|
||||
P.\InsetSpace \thinspace{}
|
||||
S.: Blaufarbige Items sollen vor der Adresse eingefügt werden, magentafarbige
|
||||
danach.
|
||||
\end_layout
|
||||
|
||||
\begin_layout CC
|
||||
Die LyX User
|
||||
Die LyX-User
|
||||
\end_layout
|
||||
|
||||
\begin_layout EndLetter
|
||||
|
||||
@ -176,7 +176,7 @@ status open
|
||||
\backslash
|
||||
renewcommand*{
|
||||
\backslash
|
||||
adrentry}[8]{
|
||||
adrentry}[8]{%
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -186,7 +186,7 @@ adrentry}[8]{
|
||||
|
||||
\begin_layout Address
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
status open
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -194,6 +194,11 @@ status collapsed
|
||||
\backslash
|
||||
|
||||
\backslash
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
#3
|
||||
\end_layout
|
||||
|
||||
@ -219,7 +224,7 @@ fi
|
||||
|
||||
|
||||
\backslash
|
||||
if #5w{Dear Mrs.~#1,}
|
||||
if #5f{Dear Mrs.~#1,}
|
||||
\backslash
|
||||
fi
|
||||
\end_layout
|
||||
|
||||
@ -192,7 +192,7 @@ status open
|
||||
|
||||
|
||||
\backslash
|
||||
if #5w
|
||||
if #5f
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -202,7 +202,7 @@ if #5w
|
||||
status open
|
||||
|
||||
\begin_layout Standard
|
||||
when person is female
|
||||
condition for this letter: gender [#5] must be female [f]
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -212,7 +212,7 @@ when person is female
|
||||
|
||||
\begin_layout Address
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
status open
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -220,6 +220,11 @@ status collapsed
|
||||
\backslash
|
||||
|
||||
\backslash
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
#3
|
||||
\end_layout
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user