* 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

diff --git a/lib/examples/addressExample.adr b/lib/examples/addressExample.adr
index 7e3244bb50d1b9a0ed62fdefbeb6f81b127a260a..0f26ff5992ad261a2bb221358b44670e916908dc 100644 (file)
--- a/lib/examples/addressExample.adr
+++ b/lib/examples/addressExample.adr
@@ -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}

diff --git a/lib/examples/de/serienbrief1.lyx b/lib/examples/de/serienbrief1.lyx
index 2e42e42d08dbddc73de7785b36c6231c14fee32d..32fb7510bd3ccebd2295278007fd4d0de71c328f 100644 (file)
--- a/lib/examples/de/serienbrief1.lyx
+++ b/lib/examples/de/serienbrief1.lyx
@@ -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

diff --git a/lib/examples/de/serienbrief2.lyx b/lib/examples/de/serienbrief2.lyx
index ba00d5f3c39b2c431ddea8584c94a3e5d5d72682..d1f78b740dedf980c542bac5291dc3450bb80dd6 100644 (file)
--- a/lib/examples/de/serienbrief2.lyx
+++ b/lib/examples/de/serienbrief2.lyx
@@ -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

diff --git a/lib/examples/de/serienbrief3.lyx b/lib/examples/de/serienbrief3.lyx
index a203d8e431e81402dca9cf2a8530eeb37e63a67b..90e772c2c74bd9c0abef0a64849a146817c360c8 100644 (file)
--- a/lib/examples/de/serienbrief3.lyx
+++ b/lib/examples/de/serienbrief3.lyx
@@ -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

diff --git a/lib/examples/serial_letter1.lyx b/lib/examples/serial_letter1.lyx
index 4a62d8fbf7bd1968e845fe900148fc8673091bc8..ed6975096da5f29faf41220eb10757e29ced1261 100644 (file)
--- a/lib/examples/serial_letter1.lyx
+++ b/lib/examples/serial_letter1.lyx
@@ -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

diff --git a/lib/examples/serial_letter3.lyx b/lib/examples/serial_letter3.lyx
index d9a4e953a163670fb32d78ce76d13421e4febf53..13e652c3705a80080b04ffd3b6cb2ec8b7bd18cb 100644 (file)
--- a/lib/examples/serial_letter3.lyx
+++ b/lib/examples/serial_letter3.lyx
@@ -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