mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-25 22:06:15 +00:00
Small changes needed by dec cxx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@639 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
77e706c441
commit
1a0b18b01c
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
|||||||
|
2000-04-04 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||||
|
|
||||||
|
* src/lyxparagraph.h: make strict InsetTable public.
|
||||||
|
|
||||||
|
* src/support/lyxstring.h: change lyxstring::difference_type to be
|
||||||
|
ptrdiff_t. Add std:: modifiers to streams.
|
||||||
|
|
||||||
|
* src/font.C: include the <cctype> header, for islower() and
|
||||||
|
isupper().
|
||||||
|
|
||||||
2000-04-03 Lars Gullik Bjønnes <larsbj@lyx.org>
|
2000-04-03 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||||
|
|
||||||
* src/font.[Ch]: new files. Contains the metric functions for
|
* src/font.[Ch]: new files. Contains the metric functions for
|
||||||
|
@ -28,7 +28,6 @@ src/insets/form_graphics.C
|
|||||||
src/insets/form_url.C
|
src/insets/form_url.C
|
||||||
src/insets/insetbib.C
|
src/insets/insetbib.C
|
||||||
src/insets/inset.C
|
src/insets/inset.C
|
||||||
src/insets/inseteditor.C
|
|
||||||
src/insets/inseterror.C
|
src/insets/inseterror.C
|
||||||
src/insets/insetert.C
|
src/insets/insetert.C
|
||||||
src/insets/insetfoot.C
|
src/insets/insetfoot.C
|
||||||
@ -84,6 +83,7 @@ src/spellchecker.C
|
|||||||
src/sp_form.C
|
src/sp_form.C
|
||||||
src/support/filetools.C
|
src/support/filetools.C
|
||||||
src/support/getUserName.C
|
src/support/getUserName.C
|
||||||
|
src/support/path.C
|
||||||
src/support/path.h
|
src/support/path.h
|
||||||
src/TableLayout.C
|
src/TableLayout.C
|
||||||
src/text2.C
|
src/text2.C
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
|
#include <cctype>
|
||||||
|
|
||||||
#include "font.h"
|
#include "font.h"
|
||||||
#include "FontLoader.h"
|
#include "FontLoader.h"
|
||||||
#include "lyxrc.h"
|
#include "lyxrc.h"
|
||||||
|
@ -131,7 +131,7 @@ public:
|
|||||||
/** returns the number of rows (\n's) of generated tex code.
|
/** returns the number of rows (\n's) of generated tex code.
|
||||||
fragile != 0 means, that the inset should take care about
|
fragile != 0 means, that the inset should take care about
|
||||||
fragile commands by adding a \protect before.
|
fragile commands by adding a \protect before.
|
||||||
If the freee_spc (freespacing) variable is set, then this inset
|
If the free_spc (freespacing) variable is set, then this inset
|
||||||
is in a free-spacing paragraph.
|
is in a free-spacing paragraph.
|
||||||
*/
|
*/
|
||||||
virtual int Latex(std::ostream &, signed char fragile,
|
virtual int Latex(std::ostream &, signed char fragile,
|
||||||
|
@ -501,6 +501,15 @@ public:
|
|||||||
///
|
///
|
||||||
void SimpleDocBookOneTablePar(std::ostream &, string & extra,
|
void SimpleDocBookOneTablePar(std::ostream &, string & extra,
|
||||||
int & desc_on, int depth);
|
int & desc_on, int depth);
|
||||||
|
///
|
||||||
|
struct InsetTable {
|
||||||
|
///
|
||||||
|
size_type pos;
|
||||||
|
///
|
||||||
|
Inset * inset;
|
||||||
|
///
|
||||||
|
InsetTable(size_type p, Inset * i) { pos = p; inset = i;}
|
||||||
|
};
|
||||||
private:
|
private:
|
||||||
/** A font entry covers a range of positions. Notice that the
|
/** A font entry covers a range of positions. Notice that the
|
||||||
entries in the list are inserted in random order.
|
entries in the list are inserted in random order.
|
||||||
@ -525,15 +534,6 @@ private:
|
|||||||
LyXFont font;
|
LyXFont font;
|
||||||
};
|
};
|
||||||
///
|
///
|
||||||
struct InsetTable {
|
|
||||||
///
|
|
||||||
size_type pos;
|
|
||||||
///
|
|
||||||
Inset * inset;
|
|
||||||
///
|
|
||||||
InsetTable(size_type p, Inset * i) { pos = p; inset = i;}
|
|
||||||
};
|
|
||||||
///
|
|
||||||
typedef std::list<FontTable> FontList;
|
typedef std::list<FontTable> FontList;
|
||||||
///
|
///
|
||||||
FontList fontlist;
|
FontList fontlist;
|
||||||
|
@ -647,8 +647,8 @@ lyxstring operator+(lyxstring const & a, lyxstring::value_type b);
|
|||||||
|
|
||||||
void swap(lyxstring & s1, lyxstring & s2);
|
void swap(lyxstring & s1, lyxstring & s2);
|
||||||
|
|
||||||
istream & operator>>(istream &, lyxstring &);
|
std::istream & operator>>(std::istream &, lyxstring &);
|
||||||
ostream & operator<<(ostream &, lyxstring const &);
|
std::ostream & operator<<(std::ostream &, lyxstring const &);
|
||||||
istream & getline(istream &, lyxstring &, lyxstring::value_type delim = '\n');
|
std::istream & getline(std::istream &, lyxstring &, lyxstring::value_type delim = '\n');
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user