commit 54327b8c60b2dc3164792260920397305920dc21
Author: Juergen Spitzmueller <[email protected]>
Date: Sun Oct 25 08:53:13 2026 +0100
Update KOMA serial letter examples
The old \adrentry command we used is no longer supported, so we switch
to \addrentry (which has been introduced long ago)
(cherry picked from commit 85fb052c22ee545b80b5e976f17a56a39fe502ec)
---
lib/examples/Letters/Serial_Letter_1.lyx | 2 +-
lib/examples/Letters/Serial_Letter_3.lyx | 2 +-
lib/examples/Letters/addressExample.adr | 24 +++++++++++++++---------
lib/examples/de/Letters/Serial_Letter_1.lyx | 2 +-
lib/examples/de/Letters/Serial_Letter_3.lyx | 2 +-
lib/examples/de/Letters/addressExample.adr | 24 +++++++++++++++---------
status.25x | 2 ++
7 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/lib/examples/Letters/Serial_Letter_1.lyx
b/lib/examples/Letters/Serial_Letter_1.lyx
index e086a699af..265e65e684 100644
--- a/lib/examples/Letters/Serial_Letter_1.lyx
+++ b/lib/examples/Letters/Serial_Letter_1.lyx
@@ -243,7 +243,7 @@ status open
\backslash
renewcommand*{
\backslash
-adrentry}[8]{%
+addrentry}[9]{%
\end_layout
\end_inset
diff --git a/lib/examples/Letters/Serial_Letter_3.lyx
b/lib/examples/Letters/Serial_Letter_3.lyx
index 24a6928357..fae640f3ca 100644
--- a/lib/examples/Letters/Serial_Letter_3.lyx
+++ b/lib/examples/Letters/Serial_Letter_3.lyx
@@ -243,7 +243,7 @@ status open
\backslash
renewcommand*{
\backslash
-adrentry}[8]{
+addrentry}[9]{
\end_layout
\end_inset
diff --git a/lib/examples/Letters/addressExample.adr
b/lib/examples/Letters/addressExample.adr
index 0f26ff5992..28755accc4 100644
--- a/lib/examples/Letters/addressExample.adr
+++ b/lib/examples/Letters/addressExample.adr
@@ -1,61 +1,67 @@
% Syntax:
-% \adrentry{Lastname} -> #1
+% \addrentry{Lastname} -> #1
% {Firstname} -> #2
% {Address} -> #3
% {Telephone} -> #4
% {F1} -> #5
% {F2} -> #6
-% {Comment} -> #7
-% {ID} -> #8
+% {F3} -> #7
+% {F4} -> #8
+% {ID} -> #9
%
-% The F1 and F2 fields are free custom fields (F1 is used for gender
+% The F1 to F4 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}
+\addrentry{Miller}
{John}
{43 Straight Street\\Boston}
{033-3445-90}
{m}
{}
{Customer}
+ {}
{JOMILL}
-\adrentry{Boehme}
+\addrentry{Boehme}
{Wilhelm}
{Ubierweg 49\\754127 Dingsda}
{0227557/35448}
{m}
{}
{Friend}
+ {}
{WILBOE}
-\adrentry{Zylla}
+\addrentry{Zylla}
{Rieke}
{Salierweg 9\\850289 Kolonia}
{022811/458290}
{f}
{}
{Supervisor}
+ {}
{RIEZY}
-\adrentry{Klausen}
+\addrentry{Klausen}
{Daniela}
{Promenadenweg 17\\23155 Fuhlingen}
{0672289/30945}
{f}
{}
{fellow student}
+ {}
{DANKLA}
-\adrentry{Tollmann}
+\addrentry{Tollmann}
{Gerd}
{Ginsterweg 119\\48890 Karlingen}
{074418/90833}
{m}
{}
{Holiday 2004}
+ {}
{GERTO}
diff --git a/lib/examples/de/Letters/Serial_Letter_1.lyx
b/lib/examples/de/Letters/Serial_Letter_1.lyx
index 0c925c281e..1ccdd1b2a0 100644
--- a/lib/examples/de/Letters/Serial_Letter_1.lyx
+++ b/lib/examples/de/Letters/Serial_Letter_1.lyx
@@ -245,7 +245,7 @@ status open
\backslash
renewcommand*{
\backslash
-adrentry}[8]{
+addrentry}[9]{
\end_layout
\end_inset
diff --git a/lib/examples/de/Letters/Serial_Letter_3.lyx
b/lib/examples/de/Letters/Serial_Letter_3.lyx
index 7b96744a8f..8d4ccac3f1 100644
--- a/lib/examples/de/Letters/Serial_Letter_3.lyx
+++ b/lib/examples/de/Letters/Serial_Letter_3.lyx
@@ -245,7 +245,7 @@ status open
\backslash
renewcommand*{
\backslash
-adrentry}[8]{
+addrentry}[9]{
\end_layout
\end_inset
diff --git a/lib/examples/de/Letters/addressExample.adr
b/lib/examples/de/Letters/addressExample.adr
index 0f26ff5992..28755accc4 100644
--- a/lib/examples/de/Letters/addressExample.adr
+++ b/lib/examples/de/Letters/addressExample.adr
@@ -1,61 +1,67 @@
% Syntax:
-% \adrentry{Lastname} -> #1
+% \addrentry{Lastname} -> #1
% {Firstname} -> #2
% {Address} -> #3
% {Telephone} -> #4
% {F1} -> #5
% {F2} -> #6
-% {Comment} -> #7
-% {ID} -> #8
+% {F3} -> #7
+% {F4} -> #8
+% {ID} -> #9
%
-% The F1 and F2 fields are free custom fields (F1 is used for gender
+% The F1 to F4 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}
+\addrentry{Miller}
{John}
{43 Straight Street\\Boston}
{033-3445-90}
{m}
{}
{Customer}
+ {}
{JOMILL}
-\adrentry{Boehme}
+\addrentry{Boehme}
{Wilhelm}
{Ubierweg 49\\754127 Dingsda}
{0227557/35448}
{m}
{}
{Friend}
+ {}
{WILBOE}
-\adrentry{Zylla}
+\addrentry{Zylla}
{Rieke}
{Salierweg 9\\850289 Kolonia}
{022811/458290}
{f}
{}
{Supervisor}
+ {}
{RIEZY}
-\adrentry{Klausen}
+\addrentry{Klausen}
{Daniela}
{Promenadenweg 17\\23155 Fuhlingen}
{0672289/30945}
{f}
{}
{fellow student}
+ {}
{DANKLA}
-\adrentry{Tollmann}
+\addrentry{Tollmann}
{Gerd}
{Ginsterweg 119\\48890 Karlingen}
{074418/90833}
{m}
{}
{Holiday 2004}
+ {}
{GERTO}
diff --git a/status.25x b/status.25x
index e1d61e4e3f..8a9070b9a6 100644
--- a/status.25x
+++ b/status.25x
@@ -29,6 +29,8 @@ What's new
* DOCUMENTATION AND LOCALIZATION
+- Update KOMA-Script serial letter examples to work with recent
+ releases of KOMA-Script.
* BUILD/INSTALLATION
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
