mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 09:15:50 +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/branches/BRANCH_1_5_X@23030 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller
parent
bc281693b6
commit
79dcdfe831
@ -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}
|
||||
|
||||
@ -167,7 +167,7 @@ status open
|
||||
\backslash
|
||||
renewcommand*{
|
||||
\backslash
|
||||
adrentry}[8]{
|
||||
adrentry}[8]{%
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -177,7 +177,25 @@ adrentry}[8]{
|
||||
|
||||
\begin_layout Address
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
{}
|
||||
\backslash
|
||||
if #5f{Frau}
|
||||
\backslash
|
||||
fi
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
|
||||
\backslash
|
||||
if #5m{Herrn}
|
||||
\backslash
|
||||
fi
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -185,6 +203,11 @@ status collapsed
|
||||
\backslash
|
||||
|
||||
\backslash
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
#3
|
||||
\end_layout
|
||||
|
||||
@ -195,7 +218,7 @@ status collapsed
|
||||
|
||||
\begin_layout Opening
|
||||
\begin_inset ERT
|
||||
status open
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -210,7 +233,7 @@ fi
|
||||
|
||||
|
||||
\backslash
|
||||
if #5w{Sehr geehrte Frau #1,}
|
||||
if #5f{Sehr geehrte Frau #1,}
|
||||
\backslash
|
||||
fi
|
||||
\end_layout
|
||||
@ -259,13 +282,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
|
||||
@ -283,7 +306,7 @@ Diese Umgebung muss leer sein.
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset ERT
|
||||
status open
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
|
||||
@ -97,7 +97,7 @@ fromurl=true% print sender URL
|
||||
\begin_body
|
||||
|
||||
\begin_layout Name
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\end_layout
|
||||
|
||||
\begin_layout SenderAddress
|
||||
@ -121,7 +121,7 @@ www.lyx.org
|
||||
\end_layout
|
||||
|
||||
\begin_layout Backaddress
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\newline
|
||||
Planstr.
|
||||
140
|
||||
@ -130,11 +130,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
|
||||
@ -207,12 +207,39 @@ 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 Standard
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Script
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Dokumentation
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
\begin_layout Standard
|
||||
ftp://ftp.dante.de/tex-archive/macros/latex/contrib/koma-script/scrguide.pdf
|
||||
\begin_inset LatexCommand url
|
||||
target "ftp://ftp.dante.de/tex-archive/macros/latex/contrib/koma-script/scrguide.pdf"
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -225,13 +252,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
|
||||
|
||||
\end_body
|
||||
|
||||
@ -97,7 +97,7 @@ fromurl=true% print sender URL
|
||||
\begin_body
|
||||
|
||||
\begin_layout Name
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\end_layout
|
||||
|
||||
\begin_layout SenderAddress
|
||||
@ -121,7 +121,7 @@ www.lyx.org
|
||||
\end_layout
|
||||
|
||||
\begin_layout Backaddress
|
||||
Das LyX Entwickler Team
|
||||
Das LyX-Entwicklerteam
|
||||
\newline
|
||||
Planstr.
|
||||
140
|
||||
@ -130,11 +130,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
|
||||
@ -177,13 +177,13 @@ adrentry}[8]{
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset ERT
|
||||
status open
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
|
||||
\backslash
|
||||
if #5w
|
||||
if #5f
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -202,8 +202,9 @@ wenn Person weiblich ist
|
||||
\end_layout
|
||||
|
||||
\begin_layout Address
|
||||
Frau
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -255,12 +256,39 @@ 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 Standard
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Script
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
"=
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
Dokumentation
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
\begin_layout Standard
|
||||
ftp://ftp.dante.de/tex-archive/macros/latex/contrib/koma-script/scrguide.pdf
|
||||
\begin_inset LatexCommand url
|
||||
target "ftp://ftp.dante.de/tex-archive/macros/latex/contrib/koma-script/scrguide.pdf"
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -273,13 +301,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
|
||||
@ -297,7 +325,7 @@ Diese Umgebung muss leer sein.
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset ERT
|
||||
status open
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
|
||||
@ -165,7 +165,7 @@ status open
|
||||
\backslash
|
||||
renewcommand*{
|
||||
\backslash
|
||||
adrentry}[8]{
|
||||
adrentry}[8]{%
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -175,7 +175,7 @@ adrentry}[8]{
|
||||
|
||||
\begin_layout Address
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -183,6 +183,11 @@ status collapsed
|
||||
\backslash
|
||||
|
||||
\backslash
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
#3
|
||||
\end_layout
|
||||
|
||||
@ -193,7 +198,7 @@ status collapsed
|
||||
|
||||
\begin_layout Opening
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -208,7 +213,7 @@ fi
|
||||
|
||||
|
||||
\backslash
|
||||
if #5w{Dear Mrs.~#1,}
|
||||
if#5f{Dear Mrs.~#1,}
|
||||
\backslash
|
||||
fi
|
||||
\end_layout
|
||||
@ -282,7 +287,7 @@ Keep this layout empty.
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset ERT
|
||||
status open
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
|
||||
@ -175,13 +175,13 @@ adrentry}[8]{
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset ERT
|
||||
status open
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
|
||||
\backslash
|
||||
if #5w
|
||||
if #5f
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -191,7 +191,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
|
||||
@ -201,7 +201,7 @@ when person is female
|
||||
|
||||
\begin_layout Address
|
||||
\begin_inset ERT
|
||||
status collapsed
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -209,6 +209,11 @@ status collapsed
|
||||
\backslash
|
||||
|
||||
\backslash
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
#3
|
||||
\end_layout
|
||||
|
||||
@ -297,7 +302,7 @@ Keep this layout empty.
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset ERT
|
||||
status open
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
@ -329,7 +334,7 @@ if
|
||||
|
||||
\begin_layout Standard
|
||||
\begin_inset ERT
|
||||
status open
|
||||
status inlined
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user