I want to commit them also to branch split into small pieces.
This is the second one:
- don't specially handle the document encoding any longer - tex2lyx supports fileformat 264 since a
while now and support for ascii was added in fileformat 262
regards Uwe
Index: preamble.cpp
===================================================================
--- preamble.cpp (revision 32820)
+++ preamble.cpp (working copy)
@@ -337,18 +337,14 @@
;// ignore this
else if (name == "inputenc") {
- // only set when there is not more than one inputenc
- // option therefore check for the "," character also
- // only set when there is not more then one babel
- // language option
- if (opts.find(",") == string::npos && one_language == true) {
- if (opts == "ascii")
- //change ascii to auto to be in the unicode range, see
- //http://bugzilla.lyx.org/show_bug.cgi?id=4719
- h_inputencoding = "auto";
- else if (!opts.empty())
- h_inputencoding = opts;
- }
+ // h_inputencoding is only set when there is not more than one
+ // inputenc option because otherwise h_inputencoding must be
+ // set to "auto" (the default encoding of the document language)
+ // Therefore check for the "," character.
+ // It is also only set when there is not more then one babel
+ // language option but this is handled in the routine for babel.
+ if (opts.find(",") == string::npos && one_language == true)
+ h_inputencoding = opts;
if (!options.empty())
p.setEncoding(options.back());
options.clear();
