Fulfill promise to Andre: TextClass_ptr --> TextClassPtr.

[lyx.git] / src / factory.cpp

diff --git a/src/factory.cpp b/src/factory.cpp
index c790a377037479a1c6cc2a138a036d0158318351..cb5c15d36d60e7eab98351841824f548e6ae9d9b 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -26,7 +26,7 @@
 #include "insets/InsetBibtex.h"
 #include "insets/InsetCaption.h"
 #include "insets/InsetCitation.h"
-#include "insets/InsetCharStyle.h"
+#include "insets/InsetFlex.h"
 #include "insets/InsetEnvironment.h"
 #include "insets/InsetERT.h"
 #include "insets/InsetListings.h"
@@ -102,14 +102,11 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                case LFUN_CLEARDOUBLEPAGE_INSERT:
                        return new InsetClearDoublePage;
 
-               case LFUN_CHARSTYLE_INSERT: {
+               case LFUN_FLEX_INSERT: {
                        string s = cmd.getArg(0);
                        TextClass tclass = params.getTextClass();
-                       CharStyles::iterator found_cs = tclass.charstyle(s);
-                       if (found_cs != tclass.charstyles().end())
-                               return new InsetCharStyle(params, found_cs);
-                       else
-                               return new InsetCharStyle(params, s);
+                       InsetLayout il = tclass.insetlayout(from_utf8(s));
+                       return new InsetFlex(params, il);
                }
 
                case LFUN_NOTE_INSERT: {
@@ -176,7 +173,7 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                        string const argument = to_utf8(cmd.argument());
                        if (argument == "figure")
                                return new InsetWrap(params, argument);
-                       lyxerr << "Non-existent floatflt type: " << argument << endl;
+                       lyxerr << "Non-existent wrapfig type: " << argument << endl;
                        return 0;
                }
 
@@ -410,8 +407,7 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                // the various \\footcite commands. We should increase the
                // file format number and read these commands here, too.
                // Then we should use is_possible_cite_command() in
-               // src/frontends/controllers/frontend_helpers.cpp to test for valid cite
-               // commands.
+               // InsetCitation to test for valid cite commands.
                if (compare_ascii_no_case(cmdName.substr(0,4), "cite") == 0) {
                        inset.reset(new InsetCitation(inscmd));
                } else if (cmdName == "bibitem") {
@@ -473,16 +469,11 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                        inset.reset(new InsetNote(buf.params(), tmptok));
                } else if (tmptok == "Box") {
                        inset.reset(new InsetBox(buf.params(), tmptok));
-               } else if (tmptok == "CharStyle") {
+               } else if (tmptok == "Flex") {
                        lex.next();
                        string s = lex.getString();
-                       CharStyles::iterator found_cs = tclass.charstyle(s);
-                       if (found_cs != tclass.charstyles().end())
-                               inset.reset(new InsetCharStyle(buf.params(), found_cs));
-                       else {
-                               // "Undefined" inset
-                               inset.reset(new InsetCharStyle(buf.params(), s));
-                       }
+                       InsetLayout il = tclass.insetlayout(from_utf8(s));
+                       inset.reset(new InsetFlex(buf.params(), il));
                } else if (tmptok == "Branch") {
                        inset.reset(new InsetBranch(buf.params(),
                                                    InsetBranchParams()));