Keep textual data in UTF-8 internally; provide new options for recoding

* libid3tag/tag.c (id3_tag_new): Use conservative default options.

* configure.ac: Check for iconv

* src/utf8conv.c: New file.
* src/Makefile.am (idest_SOURCES): Add new source file.
(LDADD): Link with iconv libraries.
* src/backup.c (copy_file): Initialize fsize properly.
* src/cmdline.opt: New options: --fixup, --broken-8bit-charset,
--encoding
* src/guile.c: Remove unused functions.
* src/frametab.gperf: Use textual_frame_encoding.
* src/idest.h: Include locale.h
(latin1_option): Remove.
(charset,broken_8bit_charset)
(textual_frame_encoding,fixup_option): New globals.
(idest_conv_mode): New enum
(utf8_convert): New proto.
* src/idop.c (idest_ucs4_cvt): Hanlde broken_8bit_charset option.
(set_tags): Fix-up frames if so requested.
* src/main.c (latin1_option): Remove.
(textual_frame_encoding,fixup_option): New globals
(main): Set locale.

* bootstrap: Update.
* gnulib: Update.
* gnulib.modules: Add localcharset

* doc/html.init: Minor change.
* doc/idest.texi: Update docs.

1 files changed, 38 insertions, 3 deletions

diff --git a/src/cmdline.opt b/src/cmdline.opt
index 9ed798f..1f414a6 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -1,5 +1,5 @@
 /* This file is part of Idest. -*- c -*-
-   Copyright (C) 2009-2011 Sergey Poznyakoff
+   Copyright (C) 2009-2011, 2016 Sergey Poznyakoff
 
    Idest is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -109,6 +109,13 @@ BEGIN
 	SET_MODE(MODE_LIST);
 END
 
+OPTION(fixup,f,,
+       [<fixup ID3 tags>])
+BEGIN
+	fixup_option = 1;
+	SET_MODE(MODE_MOD);
+END
+
 GROUP([<Operation modifiers>])
 
 OPTION(filter,F,FRAME-LIST,
@@ -135,10 +142,38 @@ BEGIN
 	convert_version = get_version_list(optarg);
 END
 
+OPTION(charset,,CODE,
+       [<use this charset for external representation>])
+BEGIN
+	charset = optarg;
+END
+
+OPTION(broken-8bit-charset,,CODE,
+       [<assume textual frames in this 8bit charset>])
+BEGIN
+       broken_8bit_charset = optarg;
+END
+
+OPTION(encoding,e,NAME,
+       [<set encoding for textual tags>])
+BEGIN
+	if (strcasecmp(optarg, "latin1") == 0
+	    || strcasecmp(optarg, "iso-8859-1") == 0)
+		textual_frame_encoding = ID3_FIELD_TEXTENCODING_ISO_8859_1;
+        else if (strcasecmp(optarg, "utf-16") == 0)
+		textual_frame_encoding = ID3_FIELD_TEXTENCODING_UTF_16;
+        else if (strcasecmp(optarg, "utf-16be") == 0)
+		textual_frame_encoding = ID3_FIELD_TEXTENCODING_UTF_16BE;
+	else if (strcasecmp(optarg, "utf-8") == 0)
+		textual_frame_encoding = ID3_FIELD_TEXTENCODING_UTF_8;
+        else
+		error(1, 0, _("unsupported ID3 frame encoding"));
+END	
+
 OPTION(latin1,,,
-       [<force latin1 output>])
+       [<same as --encoding=latin1>])
 BEGIN
-	latin1_option = 1;
+	charset = "iso-8859-1";
 END
 
 OPTION(verbose,v,,