anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 06:20:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Syntax change for CharStyles

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
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> 2003-11-28 André Pönitz <poenitz@gmx.net>
* BufferView.[Ch]: make LyXText * text a private member * BufferView.[Ch]: make LyXText * text a private member

6
src/factory.C
View File

@ -331,9 +331,6 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
lex.next(); lex.next();
string tmptok = lex.getString(); string tmptok = lex.getString();
CharStyles::iterator found_cs = tclass.charstyle(tmptok);
if (found_cs != tclass.charstyles().end())
tmptok = "CharStyle";
// test the different insets // test the different insets
if (tmptok == "LatexCommand") { if (tmptok == "LatexCommand") {
@ -406,6 +403,9 @@ InsetOld * readInset(LyXLex & lex, Buffer const & buf)
|| tmptok == "Ovalbox" || tmptok == "Frameless") { || tmptok == "Ovalbox" || tmptok == "Frameless") {
inset.reset(new InsetBox(buf.params(), tmptok)); inset.reset(new InsetBox(buf.params(), tmptok));
} else if (tmptok == "CharStyle") { } 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)); inset.reset(new InsetCharStyle(buf.params(), found_cs));
} else if (tmptok == "Branch") { } else if (tmptok == "Branch") {
inset.reset(new InsetBranch(buf.params(), string())); inset.reset(new InsetBranch(buf.params(), string()));

3
src/insets/ChangeLog
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> 2003-11-28 André Pönitz <poenitz@gmx.net>

2
src/insets/insetcharstyle.C
View File

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