Change inset label from ": filename" to "Program Listing: filename" for listings...

[lyx.git] / src / insets / ExternalTemplate.cpp

diff --git a/src/insets/ExternalTemplate.cpp b/src/insets/ExternalTemplate.cpp
index 7b47955aa2597c4599d8c43d01c57a590bd23fec..7861e8a59fa0fd869143385a689a5ded1289272b 100644 (file)
--- a/src/insets/ExternalTemplate.cpp
+++ b/src/insets/ExternalTemplate.cpp
@@ -202,8 +202,7 @@ TemplateManager & TemplateManager::get()
 }
 
 
-TemplateManager::Templates const &
-TemplateManager::getTemplates() const
+TemplateManager::Templates const & TemplateManager::getTemplates() const
 {
        return templates;
 }
@@ -292,23 +291,6 @@ void TemplateManager::readTemplates(FileName const & path)
 }
 
 
-namespace {
-
-void add(vector<TransformID> & ids, string const & name)
-{
-       TransformID id = transformIDTranslator().find(name);
-       if (int(id) == -1) {
-               lyxerr << "external::Template::readTemplate\n"
-                      << "Transform " << name << " is not recognized"
-                      << endl;
-       } else {
-               ids.push_back(id);
-       }
-}
-
-} // namespace anon
-
-
 void Template::readTemplate(Lexer & lex)
 {
        enum {
@@ -334,7 +316,9 @@ void Template::readTemplate(Lexer & lex)
        };
 
        PushPopHelper pph(lex, templateoptiontags);
+       lex.setContext("Template::readTemplate");
 
+       string token;
        while (lex.isOK()) {
                switch (lex.lex()) {
                case TO_GUINAME:
@@ -361,10 +345,15 @@ void Template::readTemplate(Lexer & lex)
                        automaticProduction = lex.getBool();
                        break;
 
-               case TO_TRANSFORM:
-                       lex.next(true);
-                       add(transformIds, lex.getString());
+               case TO_TRANSFORM: {
+                       lex >> token;
+                       TransformID id = transformIDTranslator().find(token);
+                       if (int(id) == -1)
+                               LYXERR0("Transform " << token << " is not recognized");
+                       else
+                               transformIds.push_back(id);
                        break;
+               }
 
                case TO_FORMAT:
                        lex.next(true);
@@ -377,7 +366,7 @@ void Template::readTemplate(Lexer & lex)
                default:
                        lex.printError("external::Template::readTemplate: "
                                       "Wrong tag: $$Token");
-                       BOOST_ASSERT(false);
+                       LASSERT(false, /**/);
                        break;
                }
        }