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

cleanups from Andre

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3075 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-11-26 11:08:43 +00:00
parent 85e30074c2
commit c897a93ed7
8 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -67,8 +67,6 @@ lyx_SOURCES = \
ParagraphParameters.h \
ParameterStruct.h \
PrinterParams.h \
Sectioning.h \
Sectioning.C \
ShareContainer.h \
Spacing.C \
Spacing.h \

35
src/buffer.h
View File

@ -162,15 +162,13 @@ public:
*/
void latexParagraphs(std::ostream & os, Paragraph * par,
Paragraph * endpar, TexRow & texrow) const;
///
///
void simpleDocBookOnePar(std::ostream &,
Paragraph * par, int & desc_on,
Paragraph::depth_type depth) const ;
///
///
void simpleLinuxDocOnePar(std::ostream & os, Paragraph * par,
Paragraph::depth_type depth);
///
void makeLinuxDocFile(string const & filename,
bool nice, bool only_body = false);
@ -178,14 +176,13 @@ public:
void makeDocBookFile(string const & filename,
bool nice, bool only_body = false);
/// Open SGML/XML tag.
void sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth,
string const & latexname) const;
/// Closes SGML/XML tag.
void sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth,
string const & latexname) const;
void sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth,
string const & latexname) const;
/// Closes SGML/XML tag.
void sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth,
string const & latexname) const;
///
void sgmlError(Paragraph * par, int pos,
string const & message) const;
void sgmlError(Paragraph * par, int pos, string const & message) const;
/// returns the main language for the buffer (document)
Language const * getLanguage() const;
@ -296,10 +293,10 @@ public:
bool isMultiLingual();
/// Does this mean that this is buffer local?
UndoStack undostack;
UndoStack undostack;
/// Does this mean that this is buffer local?
UndoStack redostack;
UndoStack redostack;
///
BufferParams params;
@ -561,7 +558,8 @@ void Buffer::setParentName(string const & name)
///
inline
bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) {
bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b)
{
return a.par == b.par && a.str == b.str;
// No need to compare depth.
}
@ -569,7 +567,8 @@ bool operator==(Buffer::TocItem const & a, Buffer::TocItem const & b) {
///
inline
bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) {
bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b)
{
return !(a == b);
// No need to compare depth.
}
@ -578,7 +577,8 @@ bool operator!=(Buffer::TocItem const & a, Buffer::TocItem const & b) {
///
inline
bool operator==(Buffer::inset_iterator const & iter1,
Buffer::inset_iterator const & iter2) {
Buffer::inset_iterator const & iter2)
{
return iter1.par == iter2.par
&& (iter1.par == 0 || iter1.it == iter2.it);
}
@ -587,7 +587,8 @@ bool operator==(Buffer::inset_iterator const & iter1,
///
inline
bool operator!=(Buffer::inset_iterator const & iter1,
Buffer::inset_iterator const & iter2) {
Buffer::inset_iterator const & iter2)
{
return !(iter1 == iter2);
}

30
src/layout.h
View File

@ -39,8 +39,8 @@ enum layout_default {
/// The different output types
enum OutputType {
///
LATEX = 1,
///
LATEX = 1,
///
LINUXDOC,
///
@ -49,6 +49,7 @@ enum OutputType {
LITERATE
};
/// The different margin types
enum LYX_MARGIN_TYPE {
///
@ -79,7 +80,7 @@ enum LyXAlignment {
///
LYX_ALIGN_LAYOUT = 16,
///
LYX_ALIGN_SPECIAL = 32
LYX_ALIGN_SPECIAL = 32
};
///
@ -88,6 +89,7 @@ void operator|=(LyXAlignment & la1, LyXAlignment la2) {
la1 = static_cast<LyXAlignment>(la1 | la2);
}
/// The different LaTeX-Types
enum LYX_LATEX_TYPES {
///
@ -102,6 +104,7 @@ enum LYX_LATEX_TYPES {
LATEX_LIST_ENVIRONMENT
};
/// The different label types
enum LYX_LABEL_TYPES {
///
@ -109,7 +112,7 @@ enum LYX_LABEL_TYPES {
///
LABEL_MANUAL,
///
LABEL_BIBLIO,
LABEL_BIBLIO,
///
LABEL_TOP_ENVIRONMENT,
///
@ -142,6 +145,7 @@ enum LYX_LABEL_TYPES {
LABEL_COUNTER_ENUMIV
};
///
enum LYX_END_LABEL_TYPES {
///
@ -367,9 +371,9 @@ private:
string labelstring_appendix_;
/// LaTeX parameter for environment
string latexparam_;
string latexparam_;
/// Macro definitions needed for this layout
/// Macro definitions needed for this layout
string preamble_;
};
@ -461,8 +465,8 @@ public:
///
int tocdepth() const { return tocdepth_; }
///
OutputType outputType() const { return outputType_; }
///
OutputType outputType() const { return outputType_; }
///
LyXFont const & defaultfont() const { return defaultfont_; }
@ -492,9 +496,9 @@ private:
///
string description_;
/// Specific class options
string opt_fontsize_;
string opt_fontsize_;
///
string opt_pagestyle_;
string opt_pagestyle_;
///
string options_;
///
@ -511,8 +515,8 @@ private:
int secnumdepth_;
///
int tocdepth_;
///
OutputType outputType_;
///
OutputType outputType_;
/** Base font. The paragraph and layout fonts are resolved against
this font. This has to be fully instantiated. Attributes
LyXFont::INHERIT, LyXFont::IGNORE, and LyXFont::TOGGLE are
@ -524,7 +528,7 @@ private:
/// Text that dictates how wide the right margin is on the screen
string rightmargin_;
///
///
int maxcounter_; // add approp. signedness
///

2
src/lyxlex.h
View File

@ -21,7 +21,7 @@ struct keyword_item {
///
char const * tag;
///
short code;
int code;
};
/** Generalized simple lexical analizer.

4
src/lyxscreen.h
View File

@ -25,10 +25,6 @@ class BufferView;
struct Row;
///
typedef unsigned short Dimension;
/** The class LyXScreen is used for the main Textbody.
Concretely, the screen is held in a pixmap. This pixmap is kept up to
date and used to optimize drawing on the screen.

4
src/mathed/ChangeLog
View File

@ -1,7 +1,7 @@
2001-11-19 Angus Leeming <a.leeming@ic.ac.uk>
* formula.C:
* math_arrayinset.C: add using std::getline directive.
* formula.C:
* math_arrayinset.C: add using std::getline directive.
2001-11-20 André Pönitz <poenitz@gmx.net>

2
src/mathed/formulabase.C
View File

@ -288,6 +288,7 @@ void InsetFormulaBase::insetButtonPress(BufferView * bv,
mathcursor->setPos(x + xo_, y + yo_);
}
break;
/*
case 2:
lyxerr << "insetButtonPress: 2\n";
// insert stuff
@ -302,6 +303,7 @@ void InsetFormulaBase::insetButtonPress(BufferView * bv,
mathcursor->insert(ar);
}
break;
*/
}
bv->updateInset(this, false);
}

4
src/vspace.C
View File

@ -204,7 +204,7 @@ bool isValidGlueLength (string const & data, LyXGlueLength * result)
// To make isValidGlueLength recognize negative values as
// the first number this little hack is needed:
short val_sign = 1; // positive as default
int val_sign = 1; // positive as default
switch (buffer[0]) {
case '-':
lyx_advance(buffer, 1);
@ -270,7 +270,7 @@ bool isValidLength(string const & data, LyXLength * result)
// To make isValidLength recognize negative values
// this little hack is needed:
short val_sign = 1; // positive as default
int val_sign = 1; // positive as default
switch (buffer[0]) {
case '-':
lyx_advance(buffer, 1);