From 0f59ec12963c2f5ec2ddb5b3d4ff3e8298925e01 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Fri, 21 Mar 2003 12:48:20 +0000 Subject: [PATCH] read 'environment' tag in layout files git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6552 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 5 +++++ src/lyxtextclass.C | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 7d8fce2449..b0c6496b16 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ + +2003-03-21 André Pönitz + + * lyxtextclass.C: read 'environment' tag. + 2003-03-20 Alfredo Braunstein * text2.C (removeRow): fix bug 964 diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C index debb6b819a..61b2b1f44c 100644 --- a/src/lyxtextclass.C +++ b/src/lyxtextclass.C @@ -92,6 +92,7 @@ enum TextClassTags { TC_INPUT, TC_STYLE, TC_DEFAULTSTYLE, + TC_ENVIRONMENT, TC_NOSTYLE, TC_COLUMNS, TC_SIDES, @@ -112,8 +113,7 @@ enum TextClassTags { TC_COUNTER, TC_NOFLOAT, TC_TITLELATEXNAME, - TC_TITLELATEXTYPE, - TC_ENVIRONMENT + TC_TITLELATEXTYPE }; // Reads a textclass structure from file. @@ -125,6 +125,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) { "counter", TC_COUNTER }, { "defaultfont", TC_DEFAULTFONT }, { "defaultstyle", TC_DEFAULTSTYLE }, + { "environment", TC_ENVIRONMENT }, { "float", TC_FLOAT }, { "input", TC_INPUT }, { "leftmargin", TC_LEFTMARGIN }, @@ -156,7 +157,8 @@ bool LyXTextClass::Read(string const & filename, bool merge) << MakeDisplayPath(filename) << endl; - LyXLex lexrc(textClassTags, TC_TITLELATEXTYPE); + LyXLex lexrc(textClassTags, + sizeof(textClassTags) / sizeof(textClassTags[0])); bool error = false; lexrc.setFile(filename); @@ -218,7 +220,8 @@ bool LyXTextClass::Read(string const & filename, bool merge) LyXLayout lay; lay.setName(name); if (!(error = do_readStyle(lexrc, lay))) - layoutlist_.push_back(boost::shared_ptr(new LyXLayout(lay))); + layoutlist_.push_back + (boost::shared_ptr(new LyXLayout(lay))); if (defaultlayout_.empty()) { // We do not have a default // layout yet, so we choose -- 2.39.2