- UTF-8 works on Windows as well

- We even spit out the right usepackage chant



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15385 a592a061-630c-0410-9148-cb99ea01b6c8

src/bufferparams.C

@@ -839,6 +839,11 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 		texrow.newline();
 	}
 
+	// TODO: Some people want to support more encodings than UTF-8. They can have a field day around here
+	if (true) {
+		os << "\\usepackage[utf8]{inputenc}\n";
+		texrow.newline();
+	} else {
 		if (inputenc == "auto") {
 			string const doc_encoding =
 				language->encoding()->latexName();
@@ -860,6 +865,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 			   << "]{inputenc}\n";
 			texrow.newline();
 		}
+	}
 
 	if (use_geometry || nonstandard_papersize) {
 		os << "\\usepackage{geometry}\n";

src/output_latex.C

@@ -292,6 +292,7 @@ TeXOnePar(Buffer const & buf,
 		}
 	}
 
+	if (false) {
 		if (bparams.inputenc == "auto" &&
 			language->encoding() != previous_language->encoding()) {
 			os << "\\inputencoding{"
@@ -299,6 +300,7 @@ TeXOnePar(Buffer const & buf,
 			   << "}\n";
 			texrow.newline();
 		}
+	}
 
 	// In an an inset with unlimited length (all in one row),
 	// don't allow any special options in the paragraph

src/paragraph_pimpl.C

@@ -666,7 +666,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
 			// I assume this is hack treating typewriter as verbatim
 			if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
 				if (c != '\0') {
-					os << c;
+					os.put(c);
 				}
 				break;
 			}
@@ -691,7 +691,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
 			}
 
 			if (pnr == phrases_nr && c != '\0') {
-				os << c;
+				os.put(c);
 			}
 			break;
 		}