X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FExternalTemplate.cpp;h=64f31343a67d13817daa093e40e5b6dfbd5c2d5c;hb=860accd01fb8115ec7c6ad80b054f1046e19c62f;hp=7a3b6beb6c51596ff09b8b8f93dfbef3365fffad;hpb=483e1fcd196ed61be3928e6f59f69dadbc2aaea4;p=lyx.git

diff --git a/src/insets/ExternalTemplate.cpp b/src/insets/ExternalTemplate.cpp
index 7a3b6beb6c..64f31343a6 100644
--- a/src/insets/ExternalTemplate.cpp
+++ b/src/insets/ExternalTemplate.cpp
@@ -19,7 +19,8 @@
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
+#include "support/Translator.h"
 
 #include <ostream>
 
@@ -50,7 +51,7 @@ static TransformIDTranslator const & transformIDTranslator()
 
 // We have to have dummy default commands for security reasons!
 Template::Template()
-	: inputFormat("*")
+	: inputFormat("*"), automaticProduction(false), preview_mode(PREVIEW_OFF)
 {}
 
 
@@ -77,7 +78,7 @@ public:
 
 	void operator()(value_type const & vt) {
 		os_ << "PreambleDef " << vt.first << '\n'
-		    << vt.second
+		    << to_utf8(vt.second)
 		    << "PreambleDefEnd" << endl;
 	}
 
@@ -98,7 +99,7 @@ public:
 		os_ << "Template " << et.lyxName << '\n'
 		    << "\tGuiName " << et.guiName << '\n'
 		    << "\tHelpText\n"
-		    << et.helpText
+		    << to_utf8(et.helpText)
 		    << "\tHelpTextEnd\n"
 		    << "\tInputFormat " << et.inputFormat << '\n'
 		    << "\tFileFilter " << et.fileRegExp << '\n'
@@ -227,16 +228,15 @@ TemplateManager::getTemplateByName(string const & name) const
 }
 
 
-string const
-TemplateManager::getPreambleDefByName(string const & name) const
+docstring TemplateManager::getPreambleDefByName(string const & name) const
 {
 	string const trimmed_name = trim(name);
 	if (trimmed_name.empty())
-		return string();
+		return docstring();
 
 	PreambleDefs::const_iterator it = preambledefs.find(trimmed_name);
 	if (it == preambledefs.end())
-		return string();
+		return docstring();
 
 	return it->second;
 }
@@ -277,7 +277,7 @@ void TemplateManager::readTemplates(FileName const & path)
 		case TM_PREAMBLEDEF: {
 			lex.next();
 			string const name = lex.getString();
-			preambledefs[name] = lex.getLongString(preamble_end_tag);
+			preambledefs[name] = lex.getLongString(from_ascii(preamble_end_tag));
 		}
 		break;
 
@@ -340,7 +340,7 @@ void Template::readTemplate(Lexer & lex)
 			break;
 
 		case TO_HELPTEXT:
-			helpText = lex.getLongString("HelpTextEnd");
+			helpText = lex.getLongString(from_ascii("HelpTextEnd"));
 			break;
 
 		case TO_INPUTFORMAT:
@@ -385,12 +385,6 @@ void Template::readTemplate(Lexer & lex)
 
 		case TO_END:
 			return;
-
-		default:
-			lex.printError("external::Template::readTemplate: "
-				       "Wrong tag: $$Token");
-			LASSERT(false, /**/);
-			break;
 		}
 	}
 }