From c4a3bcaf5265a8750a01cbdf5bbd9688db723f50 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 7 Oct 2007 17:35:32 +0000 Subject: [PATCH 1/1] 2007-10-07 [colin] 3.0.2cvs28 * src/exporthtml.c Fix HTML export to make it more compliant Patch by Frank Dietrich --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/exporthtml.c | 11 ++++++----- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c35627b76..06937e318 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-07 [colin] 3.0.2cvs28 + + * src/exporthtml.c + Fix HTML export to make it more compliant + Patch by Frank Dietrich + 2007-10-07 [colin] 3.0.2cvs27 * src/prefs_toolbar.c diff --git a/PATCHSETS b/PATCHSETS index f09909e8e..5fb57f10a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2940,3 +2940,4 @@ ( cvs diff -u -r 1.43.2.87 -r 1.43.2.88 src/toolbar.c; ) > 3.0.2cvs25.patchset ( cvs diff -u -r 1.30.2.40 -r 1.30.2.41 src/prefs_toolbar.c; ) > 3.0.2cvs26.patchset ( cvs diff -u -r 1.30.2.41 -r 1.30.2.42 src/prefs_toolbar.c; ) > 3.0.2cvs27.patchset +( cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/exporthtml.c; ) > 3.0.2cvs28.patchset diff --git a/configure.ac b/configure.ac index e1c10ce51..ffbe0f48a 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=27 +EXTRA_VERSION=28 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/exporthtml.c b/src/exporthtml.c index 1e1f4aa99..fe733ac32 100644 --- a/src/exporthtml.c +++ b/src/exporthtml.c @@ -55,7 +55,7 @@ #define BORDER_SIZE 2 #define CELL_PADDING 2 #define CELL_SPACING 2 -#define CHAR_ENCODING "ISO-8859-1" +#define CHAR_ENCODING "UTF-8" /* Stylesheet names */ #define FILENAME_NONE "" @@ -121,7 +121,7 @@ ExportHtmlCtl *exporthtml_create( void ) { ctl->path = NULL; ctl->dirOutput = NULL; ctl->fileHtml = NULL; - ctl->encoding = NULL; + ctl->encoding = g_strconcat(CHAR_ENCODING, NULL); ctl->stylesheet = EXPORT_HTML_ID_NONE; ctl->nameFormat = EXPORT_HTML_FIRST_LAST; ctl->banding = FALSE; @@ -914,7 +914,9 @@ static void exporthtml_fmt_header( entry = exporthtml_find_stylesheet( ctl ); fprintf( stream, - "\n" ); + "\n" ); fprintf( stream, "\n" ); fprintf( stream, "\n" ); @@ -935,7 +937,6 @@ static void exporthtml_fmt_header( fprintf( stream, "href=\"%s\" >\n", entry->fileName ); } } - fprintf( stream, "\n" ); fprintf( stream, "\n" ); } @@ -987,7 +988,7 @@ void exporthtml_process( #else fprintf( htmlFile, "

\n", ctime_r( &tt, buf ) ); #endif - fprintf( htmlFile, "

\n" ); + fprintf( htmlFile, "

\n" ); fprintf( htmlFile, "\n" ); fprintf( htmlFile, "\n" ); -- 2.25.1