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

Small things.

Browse Source 
Make Jean-Marc happy by allowing the InsetNote to contain anything.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2293 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2001-07-20 12:40:38 +00:00
parent 96a1cc78b2
commit ce00d69629
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2001-07-20 Angus Leeming <a.leeming@ic.ac.uk>
* buffer.C (readInset): enable reading of new InsetNotes as well as old
InsetInfos.
* FontLoader.C: remove FORMS_H_LOCATION cruft.
2001-07-20 Angus Leeming <a.leeming@ic.ac.uk>
* sp_form.[Ch]: remove.

1
src/FontLoader.C
View File

@ -15,7 +15,6 @@
#pragma implementation "FontLoader.h"
#endif
#include FORMS_H_LOCATION
#include "FontLoader.h"
#include "FontInfo.h"
#include "gettext.h"

3
src/buffer.C
View File

@ -1388,7 +1388,8 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par,
inset = new InsetFormula;
} else if (tmptok == "Figure") {
inset = new InsetFig(100, 100, *this);
} else if (tmptok == "Info") {
} else if (tmptok == "Info" // backwards compatibility
|| tmptok == "Note") {
inset = new InsetNote;
} else if (tmptok == "Include") {
InsetCommandParams p( "Include" );

7
src/insets/ChangeLog
View File

@ -1,3 +1,10 @@
2001-07-20 Angus Leeming <a.leeming@ic.ac.uk>
* insetnote.[Ch]: (insertInset, insetAllowed): removed. Note now uses
the default InsetCollapsable methods. I.e., it can insert anything.
(write) output the name of the inset, not some silly hack for
compatability with the old InsetInfo.
2001-07-20 Angus Leeming <a.leeming@ic.ac.uk>
* insetinfo.[Ch]: removed.

5
src/insets/insetnote.C
View File

@ -30,7 +30,6 @@ InsetNote::InsetNote()
{
LyXFont font(LyXFont::ALL_SANE);
font.decSize();
font.decSize();
font.setColor(LColor::note);
setLabelFont(font);
setAutoCollapse(true);
@ -60,8 +59,6 @@ string const InsetNote::editMessage() const
void InsetNote::write(Buffer const *buf, ostream & os) const
{
//os << getInsetName() << "\n";
os << "Info\n";
os << getInsetName() << "\n";
InsetCollapsable::write(buf, os);
}

4
src/insets/insetnote.h
View File

@ -32,10 +32,6 @@ public:
///
virtual Inset::Code lyxCode() const { return Inset::IGNORE_CODE; }
///
virtual bool insertInset(BufferView *, Inset *) { return false; }
///
virtual bool insetAllowed(Inset::Code) const { return false; }
///
virtual void write(Buffer const *, std::ostream &) const;
///
virtual int latex(Buffer const *, std::ostream &, bool, bool) const