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

Small changes needed by dec cxx

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@639 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-04-06 09:17:40 +00:00
parent 77e706c441
commit 1a0b18b01c
6 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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>
* src/font.[Ch]: new files. Contains the metric functions for

2
po/POTFILES.in
View File

@ -28,7 +28,6 @@ src/insets/form_graphics.C
src/insets/form_url.C
src/insets/insetbib.C
src/insets/inset.C
src/insets/inseteditor.C
src/insets/inseterror.C
src/insets/insetert.C
src/insets/insetfoot.C
@ -84,6 +83,7 @@ src/spellchecker.C
src/sp_form.C
src/support/filetools.C
src/support/getUserName.C
src/support/path.C
src/support/path.h
src/TableLayout.C
src/text2.C

2
src/font.C
View File

@ -1,5 +1,7 @@
#include <config.h>
#include <cctype>
#include "font.h"
#include "FontLoader.h"
#include "lyxrc.h"

2
src/insets/lyxinset.h
View File

@ -131,7 +131,7 @@ public:
/** returns the number of rows (\n's) of generated tex code.
fragile != 0 means, that the inset should take care about
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.
*/
virtual int Latex(std::ostream &, signed char fragile,

18
src/lyxparagraph.h
View File

@ -501,6 +501,15 @@ public:
///
void SimpleDocBookOneTablePar(std::ostream &, string & extra,
int & desc_on, int depth);
///
struct InsetTable {
///
size_type pos;
///
Inset * inset;
///
InsetTable(size_type p, Inset * i) { pos = p; inset = i;}
};
private:
/** A font entry covers a range of positions. Notice that the
entries in the list are inserted in random order.
@ -525,15 +534,6 @@ private:
LyXFont font;
};
///
struct InsetTable {
///
size_type pos;
///
Inset * inset;
///
InsetTable(size_type p, Inset * i) { pos = p; inset = i;}
};
///
typedef std::list<FontTable> FontList;
///
FontList fontlist;

6
src/support/lyxstring.h
View File

@ -647,8 +647,8 @@ lyxstring operator+(lyxstring const & a, lyxstring::value_type b);
void swap(lyxstring & s1, lyxstring & s2);
istream & operator>>(istream &, lyxstring &);
ostream & operator<<(ostream &, lyxstring const &);
istream & getline(istream &, lyxstring &, lyxstring::value_type delim = '\n');
std::istream & operator>>(std::istream &, lyxstring &);
std::ostream & operator<<(std::ostream &, lyxstring const &);
std::istream & getline(std::istream &, lyxstring &, lyxstring::value_type delim = '\n');
#endif