The character '|' in description texts of EPG records is now interpreted as a newline character

5 files changed, 15 insertions, 6 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ef28cadf..2b342df1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -458,6 +458,8 @@ Gerhard Steiner <steiner@mail.austria.com>
  the 'epg.data' file
  for suggesting the new configuration file 'reccmds.conf' to define commands that
  shall be executed from the "Recordings" menu
+ for suggesting to interpret the character '|' in the description texts of EPG
+ records as a newline character
 
 Jaakko Hyvätti <jaakko@hyvatti.iki.fi>
  for translating OSD texts to the Finnish language
diff --git a/HISTORY b/HISTORY
index 6f9a0250..d3ec0bd4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1836,3 +1836,8 @@ Video Disk Recorder Revision History
   function of a given plugin (see man vdr(5) for details).
 - The new plugin 'sky' can be used to integrate a Sky Digibox into the VDR system,
   using a Kfir MPEG2 encoder card (see PLUGINS/src/sky/README for details).
+
+2002-12-06: Version 1.1.19
+
+- The character '|' in description texts of EPG records is now interpreted as a
+  newline character (suggested by Gerhard Steiner).
diff --git a/config.h b/config.h
index 43fbfbad..50e31564 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.142 2002/11/24 20:09:56 kls Exp $
+ * $Id: config.h 1.143 2002/12/06 14:17:55 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.18"
+#define VDRVERSION "1.1.19"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/interface.c b/interface.c
index 804747ae..7466a9ae 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.60 2002/11/01 10:50:38 kls Exp $
+ * $Id: interface.c 1.61 2002/12/06 14:13:16 kls Exp $
  */
 
 #include "interface.h"
@@ -157,6 +157,8 @@ char *cInterface::WrapText(const char *Text, int Width, int *Height)
         t[strlen(t) - 1] = 0; // skips trailing newlines
 
   for (char *p = t; *p; ) {
+      if (*p == '|')
+         *p = '\n';
       if (*p == '\n') {
          Lines++;
          w = 0;
diff --git a/vdr.5 b/vdr.5
index 8a76fdd9..4c3fa0a9 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.16 2002/12/01 10:34:40 kls Exp $
+.\" $Id: vdr.5 1.17 2002/12/06 14:21:00 kls Exp $
 .\"
-.TH vdr 5 "24 Nov 2002" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "6 Dec 2002" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -549,7 +549,7 @@ in (if this is left empty or 0 this event will not be overwritten\
 or modified by data that comes from the DVB stream)
 <title>        @is the title of the event
 <subtitle>     @is the subtitle (typically the name of the episode etc.)
-<description>  @is the description of the event
+<description>  @is the description of the event (any '|' characters will be interpreted as newlines)
 .TE
 
 This file will be read at program startup in order to restore the results of