Syntax change for CharStyles

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8147 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Martin Vermeer 2003-11-28 10:12:04 +00:00
parent 2943f3da29
commit e8185081bc
4 changed files with 11 additions and 4 deletions

View File

@ -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

View File

@ -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()));

View File

@ -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>

View File

@ -196,7 +196,7 @@ void InsetCharStyle::validate(LaTeXFeatures & features) const
void InsetCharStyleParams::write(ostream & os) const
{
os << type << "\n";
os << "CharStyle " << type << "\n";
}