anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trying to track down a bug in lyxlex with gcc 2.96, new insetmarginal, mini fix to insetfoot and testing the new lyx-cvs mailing list

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@838 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-06-26 18:34:31 +00:00
parent 802d3221e0
commit e5f1824f33
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/insets/Makefile.am
View File

@ -53,6 +53,8 @@ libinsets_la_SOURCES = \
insetlof.h \
insetlot.C \
insetlot.h \
insetmarginal.h \
insetmarginal.C \
insetparent.C \
insetparent.h \
insetquotes.C \

2
src/insets/insetfoot.C
View File

@ -39,7 +39,7 @@ InsetFoot::InsetFoot() : InsetCollapsable()
Inset * InsetFoot::Clone() const
{
InsetFoot * result = new InsetFoot();
InsetFoot * result = new InsetFoot;
result->init(this);
result->collapsed = collapsed;

2
src/lyxlex.C
View File

@ -123,7 +123,7 @@ float LyXLex::GetFloat() const
}
string const LyXLex::GetString() const
string LyXLex::GetString() const
{
return pimpl_->GetString();
}

2
src/lyxlex.h
View File

@ -84,7 +84,7 @@ public:
///
float GetFloat() const;
///
string const GetString() const;
string GetString() const;
/**
* Get a long string, ended by the tag `endtag'

10
src/lyxlex_pimpl.C
View File

@ -52,7 +52,7 @@ LyXLex::Pimpl::Pimpl(keyword_item * tab, int num)
}
string const LyXLex::Pimpl::GetString() const
string LyXLex::Pimpl::GetString() const
{
return string(buff);
}
@ -119,11 +119,11 @@ void LyXLex::Pimpl::popTable()
bool LyXLex::Pimpl::setFile(string const & filename)
{
if (fb__.is_open())
lyxerr << "Error in LyXLex::setFile: "
"file or stream already set." << endl;
//if (fb__.is_open())
// lyxerr << "Error in LyXLex::setFile: "
// "file or stream already set." << endl;
fb__.open(filename.c_str(), ios::in);
is.rdbuf(&fb__);
//is.rdbuf(&fb__);
name = filename;
lineno = 0;
return fb__.is_open() && is.good();

2
src/lyxlex_pimpl.h
View File

@ -36,7 +36,7 @@ struct LyXLex::Pimpl {
Pimpl(keyword_item * tab, int num);
string const GetString() const;
string GetString() const;
void printError(string const & message) const;

3
src/lyxrc.C
View File

@ -1128,8 +1128,9 @@ void LyXRC::output(ostream & os) const
// bind files are not done here.
case RC_BEGINTOOLBAR:
// Toolbar is not written here (yet).
case RC_SET_COLOR:
//case RC_SET_COLOR:
// color bindings not written to preference file.
// And we want to be warned about that. (Lgb)
case RC_FONT_ENCODING:
os << "\\font_encoding \"" << fontenc << "\"\n";
case RC_PRINTER: