serial_letter: fix a typo and make it possible to catch opening for female and male...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22801 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/examples/de/serienbrief1.lyx b/lib/examples/de/serienbrief1.lyx
index 6f9ac5cbe7854c3f2d4c8c7555de34460544e2b1..ce7cbd7813ad2e193f35029321e9f63eda2a5c4c 100644 (file)
--- a/lib/examples/de/serienbrief1.lyx
+++ b/lib/examples/de/serienbrief1.lyx
@@ -135,7 +135,7 @@ Das LyX Team
 \end_layout
 
 \begin_layout Subject
-Neues KOMA letter Layout 
+Neues KOMA letter Layout
 \end_layout
 
 \begin_layout Place
@@ -148,6 +148,7 @@ status collapsed
 
 \begin_layout Standard
 
+
 \backslash
 today
 \end_layout
@@ -163,6 +164,7 @@ status open
 
 \begin_layout Standard
 
+
 \backslash
 renewcommand*{
 \backslash
@@ -179,6 +181,7 @@ adrentry}[8]{
 status collapsed
 
 \begin_layout Standard
+
 #2 #1
 \backslash
 
@@ -192,17 +195,30 @@ status collapsed
 \end_layout
 
 \begin_layout Opening
-Hallo 
 \begin_inset ERT
-status collapsed
+status open
 
 \begin_layout Standard
-#2 #1
+
+
+\backslash
+if #5m{Sehr geehrter Herr #1,} 
+\backslash
+fi
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+if #5w{Sehr geehrte Frau #1,} 
+\backslash
+fi
 \end_layout
 
 \end_inset
 
-,
+
 \end_layout
 
 \begin_layout Standard
@@ -211,7 +227,7 @@ dieses Beispiel zeigt einen Serienbrief an
 alle Personen
 \series default
  einer Adressdatenbank.
- Der Aufbau von Adressdatenbanken ist der unten angegebenen Dokumentation
+ Der Aufbau von Adressdatenbanken ist in der unten angegebenen Dokumentation
  beschrieben.
 \end_layout
 
@@ -271,6 +287,7 @@ keep this environment empty
 status open
 
 \begin_layout Standard
+
 }
 \end_layout
 

diff --git a/lib/examples/de/serienbrief2.lyx b/lib/examples/de/serienbrief2.lyx
index 8188ba70d79e5a90454bab1295830d5f04ab92ab..e2971db8479849feee1d3512582a844a113d2b33 100644 (file)
--- a/lib/examples/de/serienbrief2.lyx
+++ b/lib/examples/de/serienbrief2.lyx
@@ -135,7 +135,7 @@ Das LyX Team
 \end_layout
 
 \begin_layout Subject
-Neues KOMA letter Layout 
+Neues KOMA letter Layout
 \end_layout
 
 \begin_layout Place
@@ -148,6 +148,7 @@ status collapsed
 
 \begin_layout Standard
 
+
 \backslash
 today
 \end_layout
@@ -173,6 +174,7 @@ status collapsed
 
 \begin_layout Standard
 
+
 \backslash
 WILBOE
 \end_layout
@@ -189,10 +191,10 @@ Hallo lieber Wilhelm,
 \begin_layout Standard
 dieses Beispiel zeigt einen Serienbrief an 
 \series bold
-eine Person
+eine einzelne Person
 \series default
  der Adressdatenbank.
- Der Aufbau von Adressdatenbanken ist der unten angegebenen Dokumentation
+ Der Aufbau von Adressdatenbanken ist in der unten angegebenen Dokumentation
  beschrieben.
 \end_layout
 

diff --git a/lib/examples/de/serienbrief3.lyx b/lib/examples/de/serienbrief3.lyx
index 96ef70905f9193b459d3435d8a9f3e93593452ad..9a97cd03eff226fadd91b0287d454299712204d9 100644 (file)
--- a/lib/examples/de/serienbrief3.lyx
+++ b/lib/examples/de/serienbrief3.lyx
@@ -135,7 +135,7 @@ Das LyX Team
 \end_layout
 
 \begin_layout Subject
-Neues KOMA letter Layout 
+Neues KOMA letter Layout
 \end_layout
 
 \begin_layout Place
@@ -148,6 +148,7 @@ status collapsed
 
 \begin_layout Standard
 
+
 \backslash
 today
 \end_layout
@@ -163,6 +164,7 @@ status open
 
 \begin_layout Standard
 
+
 \backslash
 renewcommand*{
 \backslash
@@ -180,6 +182,7 @@ status open
 
 \begin_layout Standard
 
+
 \backslash
 if #5w
 \end_layout
@@ -204,6 +207,7 @@ wenn Person weiblich ist
 status collapsed
 
 \begin_layout Standard
+
 #2 #1
 \backslash
 
@@ -222,6 +226,7 @@ Sehr geehrte Frau
 status collapsed
 
 \begin_layout Standard
+
 #1
 \end_layout
 
@@ -236,7 +241,7 @@ dieses Beispiel zeigt einen Serienbrief an
 alle weiblichen Personen
 \series default
  der Adressdatenbank.
- Der Aufbau von Adressdatenbanken ist der unten angegebenen Dokumentation
+ Der Aufbau von Adressdatenbanken ist in der unten angegebenen Dokumentation
  beschrieben.
 \end_layout
 
@@ -297,6 +302,7 @@ status open
 
 \begin_layout Standard
 
+
 \backslash
 fi
 \end_layout
@@ -327,6 +333,7 @@ if
 status open
 
 \begin_layout Standard
+
 }
 \end_layout
 

diff --git a/lib/examples/serial_letter1.lyx b/lib/examples/serial_letter1.lyx
index 60073180433b122d369fe678433368ab7e574a80..7a6898cb22765c6d0d2103df99f4a4b435c97b01 100644 (file)
--- a/lib/examples/serial_letter1.lyx
+++ b/lib/examples/serial_letter1.lyx
@@ -133,7 +133,7 @@ The LyX Team
 \end_layout
 
 \begin_layout Subject
-New KOMA letter layout 
+New KOMA letter layout
 \end_layout
 
 \begin_layout Place
@@ -146,6 +146,7 @@ status collapsed
 
 \begin_layout Standard
 
+
 \backslash
 today
 \end_layout
@@ -161,6 +162,7 @@ status open
 
 \begin_layout Standard
 
+
 \backslash
 renewcommand*{
 \backslash
@@ -177,6 +179,7 @@ adrentry}[8]{
 status collapsed
 
 \begin_layout Standard
+
 #2 #1
 \backslash
 
@@ -190,17 +193,30 @@ status collapsed
 \end_layout
 
 \begin_layout Opening
-Hello 
 \begin_inset ERT
-status collapsed
+status open
 
 \begin_layout Standard
-#2 #1
+
+
+\backslash
+if #5m{Dear Mr.~#1,} 
+\backslash
+fi
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+if #5w{Dear Mrs.~#1,} 
+\backslash
+fi
 \end_layout
 
 \end_inset
 
-,
+
 \end_layout
 
 \begin_layout Standard
@@ -230,12 +246,12 @@ Preamble
 status collapsed
 
 \begin_layout Standard
-http://www.ctan.org/tex-archive/macros/latex/contrib/supported/koma-script/scrguien.pdf
+http://www.ctan.org/tex-archive/macros/latex/contrib/supported/koma-script/scrguie
+n.pdf
 \end_layout
 
 \end_inset
 
-
  for a detailed description.
 \end_layout
 
@@ -271,6 +287,7 @@ keep this environment empty
 status open
 
 \begin_layout Standard
+
 }
 \end_layout
 

diff --git a/lib/examples/serial_letter2.lyx b/lib/examples/serial_letter2.lyx
index 6b9ba5dcabb314bf009bfcd3b0799a6cf41df26d..6c67ee4cff341469645b23f2e90410a3f94d9b8d 100644 (file)
--- a/lib/examples/serial_letter2.lyx
+++ b/lib/examples/serial_letter2.lyx
@@ -133,7 +133,7 @@ The LyX Team
 \end_layout
 
 \begin_layout Subject
-New KOMA letter layout 
+New KOMA letter layout
 \end_layout
 
 \begin_layout Place
@@ -146,6 +146,7 @@ status collapsed
 
 \begin_layout Standard
 
+
 \backslash
 today
 \end_layout
@@ -171,6 +172,7 @@ status collapsed
 
 \begin_layout Standard
 
+
 \backslash
 WILBOE
 \end_layout
@@ -211,12 +213,12 @@ Preamble
 status collapsed
 
 \begin_layout Standard
-http://www.ctan.org/tex-archive/macros/latex/contrib/supported/koma-script/scrguien.pdf
+http://www.ctan.org/tex-archive/macros/latex/contrib/supported/koma-script/scrguie
+n.pdf
 \end_layout
 
 \end_inset
 
-
 for a detailed description.
 \end_layout
 

diff --git a/lib/examples/serial_letter3.lyx b/lib/examples/serial_letter3.lyx
index 0411e6680432bc6ca53737a8527fb119d5a2f0fb..a7c0e5f304d6ece4a05923e92f0aa1a8c6ea1f9d 100644 (file)
--- a/lib/examples/serial_letter3.lyx
+++ b/lib/examples/serial_letter3.lyx
@@ -133,7 +133,7 @@ The LyX Team
 \end_layout
 
 \begin_layout Subject
-New KOMA letter layout 
+New KOMA letter layout
 \end_layout
 
 \begin_layout Place
@@ -146,6 +146,7 @@ status collapsed
 
 \begin_layout Standard
 
+
 \backslash
 today
 \end_layout
@@ -161,6 +162,7 @@ status open
 
 \begin_layout Standard
 
+
 \backslash
 renewcommand*{
 \backslash
@@ -178,6 +180,7 @@ status open
 
 \begin_layout Standard
 
+
 \backslash
 if #5w
 \end_layout
@@ -202,6 +205,7 @@ when person is female
 status collapsed
 
 \begin_layout Standard
+
 #2 #1
 \backslash
 
@@ -221,6 +225,7 @@ Dear Mrs.\InsetSpace ~
 status collapsed
 
 \begin_layout Standard
+
 #1
 \end_layout
 
@@ -256,12 +261,12 @@ Preamble
 status collapsed
 
 \begin_layout Standard
-http://www.ctan.org/tex-archive/macros/latex/contrib/supported/koma-script/scrguien.pdf
+http://www.ctan.org/tex-archive/macros/latex/contrib/supported/koma-script/scrguie
+n.pdf
 \end_layout
 
 \end_inset
 
-
  for a detailed description.
 \end_layout
 
@@ -298,6 +303,7 @@ status open
 
 \begin_layout Standard
 
+
 \backslash
 fi
 \end_layout
@@ -328,6 +334,7 @@ if
 status open
 
 \begin_layout Standard
+
 }
 \end_layout