104 lines
3.7 KiB
Diff
104 lines
3.7 KiB
Diff
|
diff -ruN paps-0.6.6.orig/src/paps.c paps-0.6.6/src/paps.c
|
||
|
|
--- paps-0.6.6.orig/src/paps.c 2006-05-25 13:23:07.000000000 +0900
|
||
|
|
+++ paps-0.6.6/src/paps.c 2006-05-25 14:55:03.000000000 +0900
|
||
|
|
@@ -105,7 +105,8 @@
|
||
|
|
|
||
|
|
/* Information passed in user data when drawing outlines */
|
||
|
|
GList *split_paragraphs_into_lines (GList *paragraphs);
|
||
|
|
-static char *read_file (FILE *file);
|
||
|
|
+static char *read_file (FILE *file,
|
||
|
|
+ GIConv handle);
|
||
|
|
static GList *split_text_into_paragraphs (PangoContext *pango_context,
|
||
|
|
page_layout_t *page_layout,
|
||
|
|
int paint_width,
|
||
|
|
@@ -188,7 +189,7 @@
|
||
|
|
gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE, do_draw_header = FALSE;
|
||
|
|
int num_columns = 1, font_scale = 12;
|
||
|
|
int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36;
|
||
|
|
- char *font_family = "Monospace";
|
||
|
|
+ char *font_family = "Monospace", *encoding = NULL;
|
||
|
|
GOptionContext *ctxt = g_option_context_new("[text file]");
|
||
|
|
GOptionEntry entries[] = {
|
||
|
|
{"landscape", 0, 0, G_OPTION_ARG_NONE, &do_landscape, "Landscape output. (Default: portrait)", NULL},
|
||
|
|
@@ -205,6 +206,7 @@
|
||
|
|
{"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"},
|
||
|
|
{"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"},
|
||
|
|
{"header", 0, 0, G_OPTION_ARG_NONE, &do_draw_header, "Draw page header for each page.", NULL},
|
||
|
|
+ {"encoding", 0, 0, G_OPTION_ARG_STRING, &encoding, "Assume the documentation encoding.", "ENCODING"},
|
||
|
|
{NULL}
|
||
|
|
};
|
||
|
|
GError *error = NULL;
|
||
|
|
@@ -228,6 +230,7 @@
|
||
|
|
gchar *paps_header = NULL;
|
||
|
|
gchar *header_font_desc = "Monospace Bold 12";
|
||
|
|
int header_sep = 20;
|
||
|
|
+ GIConv cvh = NULL;
|
||
|
|
|
||
|
|
/* Prerequisite when using glib. */
|
||
|
|
g_type_init();
|
||
|
|
@@ -339,7 +342,21 @@
|
||
|
|
page_layout.filename = filename_in;
|
||
|
|
page_layout.header_font_desc = header_font_desc;
|
||
|
|
|
||
|
|
- text = read_file(IN);
|
||
|
|
+ if (encoding != NULL)
|
||
|
|
+ {
|
||
|
|
+ cvh = g_iconv_open ("UTF-8", encoding);
|
||
|
|
+ if (cvh == NULL)
|
||
|
|
+ {
|
||
|
|
+ fprintf(stderr, "%s: Invalid encoding: %s\n", g_get_prgname (), encoding);
|
||
|
|
+ exit(-1);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ text = read_file(IN, cvh);
|
||
|
|
+
|
||
|
|
+ if (encoding != NULL && cvh != NULL)
|
||
|
|
+ g_iconv_close(cvh);
|
||
|
|
+
|
||
|
|
paragraphs = split_text_into_paragraphs(pango_context,
|
||
|
|
&page_layout,
|
||
|
|
page_layout.column_width * page_layout.pt_to_pixel,
|
||
|
|
@@ -373,7 +390,8 @@
|
||
|
|
/* Read an entire file into a string
|
||
|
|
*/
|
||
|
|
static char *
|
||
|
|
-read_file (FILE *file)
|
||
|
|
+read_file (FILE *file,
|
||
|
|
+ GIConv handle)
|
||
|
|
{
|
||
|
|
GString *inbuf;
|
||
|
|
char *text;
|
||
|
|
@@ -382,7 +400,9 @@
|
||
|
|
inbuf = g_string_new (NULL);
|
||
|
|
while (1)
|
||
|
|
{
|
||
|
|
- char *bp = fgets (buffer, BUFSIZE-1, file);
|
||
|
|
+ char *ib, *ob, obuffer[BUFSIZE * 6], *bp = fgets (buffer, BUFSIZE-1, file);
|
||
|
|
+ gsize iblen, oblen;
|
||
|
|
+
|
||
|
|
if (ferror (file))
|
||
|
|
{
|
||
|
|
fprintf(stderr, "%s: Error reading file.\n", g_get_prgname ());
|
||
|
|
@@ -392,7 +412,19 @@
|
||
|
|
else if (bp == NULL)
|
||
|
|
break;
|
||
|
|
|
||
|
|
- g_string_append (inbuf, buffer);
|
||
|
|
+ if (handle != NULL)
|
||
|
|
+ {
|
||
|
|
+ ib = bp;
|
||
|
|
+ iblen = strlen (ib);
|
||
|
|
+ ob = bp = obuffer;
|
||
|
|
+ oblen = BUFSIZE * 6 - 1;
|
||
|
|
+ if (g_iconv (handle, &ib, &iblen, &ob, &oblen) == -1)
|
||
|
|
+ {
|
||
|
|
+ fprintf (stderr, "%s: Error while converting strings.\n", g_get_prgname ());
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ g_string_append (inbuf, bp);
|
||
|
|
}
|
||
|
|
|
||
|
|
fclose (file);
|