Syntax change for CharStyles

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 31bdf90615d547dff6a37ca13893f1ccf6be66ad..7868791b914961932c36375790c8a910a31fddc8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,8 @@
 
+2003-11-28  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * factory.C: Syntax change for CharStyles
+
 2003-11-28  André Pönitz  <poenitz@gmx.net>
 
        * BufferView.[Ch]: make LyXText * text a private member

diff --git a/src/factory.C b/src/factory.C
index 41b8dcf02fe4225de3ca9c5826fa63410c190227..d69aad7c2f715c223ef313822998916bf289fbd8 100644 (file)
--- a/src/factory.C
+++ b/src/factory.C
@@ -331,9 +331,6 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                
        lex.next();
        string tmptok = lex.getString();
-       CharStyles::iterator found_cs = tclass.charstyle(tmptok);
-       if (found_cs != tclass.charstyles().end())
-               tmptok = "CharStyle";
 
        // test the different insets
        if (tmptok == "LatexCommand") {
@@ -406,6 +403,9 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
                        || tmptok == "Ovalbox" || tmptok == "Frameless") {
                        inset.reset(new InsetBox(buf.params(), tmptok));
                } else if (tmptok == "CharStyle") {
+                       lex.next();
+                       string s = lex.getString();
+                       CharStyles::iterator found_cs = tclass.charstyle(s);
                        inset.reset(new InsetCharStyle(buf.params(), found_cs));
                } else if (tmptok == "Branch") {
                        inset.reset(new InsetBranch(buf.params(), string()));

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index b87658fc7018930b0242be4df3a08ff7a4e01f83..32f2f048dab499b657dafb07b16c57e5c3d8cb26 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,4 +1,7 @@
 
+2003-11-28  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * insetcharstyle.C: Syntax change for CharStyles
 
 2003-11-28  André Pönitz  <poenitz@gmx.net>
 

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 0bba357496b754a90080ac4ff44683963f359eb0..26d5409cd88fde6234850b631757d9011be8e15e 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -196,7 +196,7 @@ void InsetCharStyle::validate(LaTeXFeatures & features) const
 
 void InsetCharStyleParams::write(ostream & os) const
 {
-       os << type << "\n";
+       os << "CharStyle " << type << "\n";
 }