[Groff-commit] groff ./ChangeLog src/preproc/preconv/Makefile....

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/01/05 15:45:00

Modified files:
        .              : ChangeLog 
        src/preproc/preconv: Makefile.sub preconv.cpp 
Added files:
        src/preproc/preconv: preconv.man 

Log message:
        * src/preproc/preconv/preconv.cpp (do_file): Don't pass BOM to
        `conversion_utf8'.
        
        * src/preproc/preconv/preconv.man: New file.  Not complete yet.
        * src/preproc/proconv/Makefile.sub (MAN1): New variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.878&tr2=1.879&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/preproc/preconv/Makefile.sub.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/preproc/preconv/preconv.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/preproc/preconv/preconv.man?rev=1.1

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.878 groff/ChangeLog:1.879
--- groff/ChangeLog:1.878       Thu Jan  5 14:43:33 2006
+++ groff/ChangeLog     Thu Jan  5 15:45:00 2006
@@ -8,10 +8,14 @@
        * src/preproc/preconv/preconv.cpp: s/debug/debug_flag/.
        (raw_flag): New global variable.
        (do_file): Use .lf to set file name (if `raw_flag' isn't set).
+       Don't pass BOM to `conversion_utf8'.
        (usage): Updated.
        (main): Handle `-r' command line switch to set `raw_flag'.
        (get_BOM): Fix encodings in `BOM_table'.
 
+       * src/preproc/preconv/preconv.man: New file.  Not complete yet.
+       * src/preproc/proconv/Makefile.sub (MAN1): New variable.
+
 2006-01-04  Werner LEMBERG  <address@hidden>
 
        * src/preproc/preconv/preconv.cpp (emacs_to_mime): As suggested by
Index: groff/src/preproc/preconv/Makefile.sub
diff -u groff/src/preproc/preconv/Makefile.sub:1.2 
groff/src/preproc/preconv/Makefile.sub:1.3
--- groff/src/preproc/preconv/Makefile.sub:1.2  Tue Jan  3 23:57:03 2006
+++ groff/src/preproc/preconv/Makefile.sub      Thu Jan  5 15:45:00 2006
@@ -1,5 +1,5 @@
 PROG=preconv$(EXEEXT)
-# MAN1=preconv.n
+MAN1=preconv.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 EXTRA_LDFLAGS=$(LIBICONV)
Index: groff/src/preproc/preconv/preconv.cpp
diff -u groff/src/preproc/preconv/preconv.cpp:1.6 
groff/src/preproc/preconv/preconv.cpp:1.7
--- groff/src/preproc/preconv/preconv.cpp:1.6   Thu Jan  5 13:22:56 2006
+++ groff/src/preproc/preconv/preconv.cpp       Thu Jan  5 15:45:00 2006
@@ -1051,20 +1051,19 @@
   }
   if (debug_flag)
     fprintf(stderr, "  encoding used: `%s'\n", encoding);
-  data = BOM + data;
   if (!raw_flag)
     printf(".lf 1 %s\n", filename);
   int success = 1;
   // Call converter (converters write to stdout).
   if (!strcasecmp(encoding, "ISO-8859-1"))
-    conversion_latin1(fp, data);
+    conversion_latin1(fp, BOM + data);
   else if (!strcasecmp(encoding, "UTF-8"))
     conversion_utf8(fp, data);
   else if (!strcasecmp(encoding, "cp1047"))
-    conversion_cp1047(fp, data);
+    conversion_cp1047(fp, BOM + data);
   else {
 #if HAVE_ICONV
-    conversion_iconv(fp, data, encoding);
+    conversion_iconv(fp, BOM + data, encoding);
 #else
     error("encoding system `%1' not supported", encoding);
     success = 0;