X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftext.cpp;h=b6f5f1799d15c84cb6467e42871bb89254765cee;hb=ce8929e9b237af569934b434154d199634363268;hp=ab4c75fc4d64ffc0de9ea6e7dd8babc3eea17c23;hpb=2811f76039c20b886ddab4979be924bf1267c977;p=lyx.git

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index ab4c75fc4d..b6f5f1799d 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -521,8 +521,8 @@ docstring convert_unicodesymbols(docstring s)
 		bool termination;
 		docstring rem;
 		set<string> req;
-		docstring parsed = encodings.fromLaTeXCommand(s,
-				Encodings::TEXT_CMD, termination, rem, &req);
+		docstring parsed = normalize_c(encodings.fromLaTeXCommand(s,
+				Encodings::TEXT_CMD, termination, rem, &req));
 		set<string>::const_iterator it = req.begin();
 		set<string>::const_iterator en = req.end();
 		for (; it != en; ++it)
@@ -1555,15 +1555,17 @@ void parse_environment(Parser & p, ostream & os, bool outer,
 		preamble.registerAutomaticallyLoadedPackage("verbatim");
 	}
 
-	else if (name == "verbatim") {
+	else if (unstarred_name == "verbatim") {
 		// FIXME: this should go in the generic code that
 		// handles environments defined in layout file that
 		// have "PassThru 1". However, the code over there is
 		// already too complicated for my taste.
+		string const ascii_name =
+			(name == "verbatim*") ? "Verbatim*" : "Verbatim";
 		parent_context.new_paragraph(os);
 		Context context(true, parent_context.textclass,
-				&parent_context.textclass[from_ascii("Verbatim")]);
-		string s = p.verbatimEnvironment("verbatim");
+				&parent_context.textclass[from_ascii(ascii_name)]);
+		string s = p.verbatimEnvironment(name);
 		output_ert(os, s, context);
 		p.skip_spaces();
 	}
@@ -3494,6 +3496,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			   << ":";
 			os << convert_command_inset_arg(p.verbatim_item())
 			   << "\"\n";
+			os << "plural \"false\"\n";
+			os << "caps \"false\"\n";
+			os << "noprefix \"false\"\n";
 			end_inset(os);
 			preamble.registerAutomaticallyLoadedPackage("refstyle");
 		}
@@ -3510,6 +3515,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 				os << "reference \""
 				   << convert_command_inset_arg(p.verbatim_item())
 				   << "\"\n";
+				os << "plural \"false\"\n";
+				os << "caps \"false\"\n";
+				os << "noprefix \"false\"\n";
 				end_inset(os);
 				if (t.cs() == "vref" || t.cs() == "vpageref")
 					preamble.registerAutomaticallyLoadedPackage("varioref");
@@ -4743,10 +4751,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			}
 			// handle some TIPA special characters
 			else if (preamble.isPackageUsed("tipa")) {
-				if (name == "\\textglobfall") {
-					name = "End";
-					skip_braces(p);
-				} else if (name == "\\s") {
+				if (name == "\\s") {
 					// fromLaTeXCommand() does not yet
 					// recognize tipa short cuts
 					name = "\\textsyllabic";
@@ -4822,8 +4827,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
 			bool termination;
 			docstring rem;
 			set<string> req;
-			docstring s = encodings.fromLaTeXCommand(from_utf8(name),
-					Encodings::TEXT_CMD, termination, rem, &req);
+			docstring s = normalize_c(encodings.fromLaTeXCommand(from_utf8(name),
+					Encodings::TEXT_CMD, termination, rem, &req));
 			if (!s.empty()) {
 				context.check_layout(os);
 				os << to_utf8(s);