anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-07 17:55:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ws cleanup

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3804 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-03-21 17:42:56 +00:00
parent 8283e978f8
commit 2b8ef58dc0
94 changed files with 525 additions and 553 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mathed/ChangeLog
View File

@ -1,5 +1,7 @@
2002-03-21 Lars Gullik Bjønnes <larsbj@birdstep.com>
* most files: ws cleanup
* Makefile.am: remove ld -r stuff
2002-03-20 Lars Gullik Bjønnes <larsbj@birdstep.com>
@ -423,7 +425,7 @@
2001-08-31 Dekel Tsur <dekelts@tau.ac.il>
* math_hash.C: Read symbols information from external file
many files: Add support for latex symbol fonts
many files: Add support for latex symbol fonts
2001-08-18 Dekel Tsur <dekelts@tau.ac.il>
@ -1459,4 +1461,3 @@
2001-01-15 Dekel Tsur <dekelts@tau.ac.il>
* math_draw.C (Metrics): Use the correct GetString.

4
src/mathed/formula.C
View File

@ -161,7 +161,7 @@ namespace {
// ^
//
lyxerr << "checking expr: '" << expr << "'\n";
out = captureOutput("octave -q 2>&1", expr);
out = captureOutput("octave -q 2>&1", expr);
lyxerr << "checking out: '" << out << "'\n";
// leave loop if expression syntax is probably ok
@ -500,7 +500,7 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
case LFUN_PASTESELECTION:
{
string const clip = bv->getClipboard();
if (!clip.empty())
if (!clip.empty())
mathed_parse_normal(par_, clip);
break;
}

4
src/mathed/formulabase.C
View File

@ -279,7 +279,7 @@ void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty)
bool InsetFormulaBase::insetButtonRelease(BufferView * bv,
int /*x*/, int /*y*/, int /*button*/)
int /*x*/, int /*y*/, int /*button*/)
{
if (!mathcursor)
return false;
@ -825,7 +825,7 @@ bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
//lyxerr << "reset lastformula to " << this << "\n";
lastformula = this;
laststr = str;
current = ibegin(par().nucleus());
current = ibegin(par().nucleus());
ar.clear();
mathed_parse_cell(ar, str);
} else {

4
src/mathed/formulabase.h
View File

@ -104,10 +104,10 @@ public:
///
virtual bool searchForward(BufferView *, string const &,
bool = true, bool = false);
bool = true, bool = false);
///
virtual bool searchBackward(BufferView *, string const &,
bool = true, bool = false);
bool = true, bool = false);
///
virtual bool isTextInset() const { return true; }
///

1
src/mathed/formulamacro.C
View File

@ -193,4 +193,3 @@ void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
yo_ = y;
par()->draw(pain, xo_, yo_);
}

2
src/mathed/math_braceinset.C
View File

@ -54,5 +54,3 @@ void MathBraceInset::normalize(NormalStream & os) const
{
os << "[block " << cell(0) << ']';
}

6
src/mathed/math_cursor.C
View File

@ -358,7 +358,7 @@ void MathCursor::last()
bool positionable(MathCursor::cursor_type const & cursor,
MathCursor::cursor_type const & anchor)
MathCursor::cursor_type const & anchor)
{
// avoid deeper nested insets when selecting
if (cursor.size() > anchor.size())
@ -946,12 +946,12 @@ void MathCursor::normalize()
}
#endif
if (idx() >= par()->nargs()) {
if (idx() >= par()->nargs()) {
lyxerr << "this should not really happen - 1: "
<< idx() << " " << par()->nargs() << "\n";
dump("error 2");
}
idx() = min(idx(), par()->nargs() - 1);
idx() = min(idx(), par()->nargs() - 1);
if (pos() > size()) {
lyxerr << "this should not really happen - 2: "

1
src/mathed/math_diffinset.C
View File

@ -72,4 +72,3 @@ void MathDiffInset::write(WriteStream &) const
{
lyxerr << "should not happen\n";
}

1
src/mathed/math_diminset.C
View File

@ -1,4 +1,3 @@
#include "math_diminset.h"
#include "Lsstream.h"
#include "textpainter.h"

2
src/mathed/math_exfuncinset.C
View File

@ -58,5 +58,3 @@ void MathExFuncInset::write(WriteStream & os) const
{
os << '\\' << name_ << '{' << cell(0) << '}';
}

1
src/mathed/math_exintinset.C
View File

@ -92,4 +92,3 @@ void MathExIntInset::write(WriteStream &) const
{
lyxerr << "should not happen" << endl;
}

4
src/mathed/math_extern.C
View File

@ -1,4 +1,3 @@
// This file contains most of the magic that extracts "context
// information" from the unstructered layout-oriented stuff in an
// MathArray.
@ -388,7 +387,7 @@ void extractFunctions(MathArray & ar)
if ((*it)->asFuncInset()) {
// it certainly is if it is well known...
name = (*it)->asFuncInset()->name();
} else {
} else {
// is this a user defined function?
// it it probably not, if it doesn't have a name.
if (!extractString((*it).nucleus(), name))
@ -799,4 +798,3 @@ void mathmlize(MathArray const & dat, MathMLStream & os)
os << ETag("mrow");
}
}

40
src/mathed/math_gridinset.C
View File

@ -63,7 +63,7 @@ MathGridInset::MathGridInset(char v, string const & h)
: MathNestInset(guessColumns(h)), rowinfo_(2), colinfo_(guessColumns(h) + 1)
{
setDefaults();
valign(v);
valign(v);
halign(h);
}
@ -79,7 +79,7 @@ MathGridInset::MathGridInset(col_type m, row_type n, char v, string const & h)
: MathNestInset(m * n), rowinfo_(n + 1), colinfo_(m + 1), v_align_(v)
{
setDefaults();
valign(v);
valign(v);
halign(h);
}
@ -287,19 +287,19 @@ void MathGridInset::metrics(MathMetricsInfo const & mi) const
width_ = colinfo_[ncols() - 1].offset_
+ colinfo_[ncols() - 1].width_
+ vlinesep() * colinfo_[ncols()].lines_
+ border();
+ colinfo_[ncols() - 1].width_
+ vlinesep() * colinfo_[ncols()].lines_
+ border();
ascent_ = - rowinfo_[0].offset_
+ rowinfo_[0].ascent_
+ hlinesep() * rowinfo_[0].lines_
+ border();
+ rowinfo_[0].ascent_
+ hlinesep() * rowinfo_[0].lines_
+ border();
descent_ = rowinfo_[nrows() - 1].offset_
+ rowinfo_[nrows() - 1].descent_
+ hlinesep() * rowinfo_[nrows()].lines_
+ border();
+ rowinfo_[nrows() - 1].descent_
+ hlinesep() * rowinfo_[nrows()].lines_
+ border();
/*
@ -449,19 +449,19 @@ void MathGridInset::metricsT(TextMetricsInfo const & mi) const
width_ = colinfo_[ncols() - 1].offset_
+ colinfo_[ncols() - 1].width_
//+ vlinesep() * colinfo_[ncols()].lines_
+ 2;
+ colinfo_[ncols() - 1].width_
//+ vlinesep() * colinfo_[ncols()].lines_
+ 2;
ascent_ = - rowinfo_[0].offset_
+ rowinfo_[0].ascent_
//+ hlinesep() * rowinfo_[0].lines_
+ 1;
+ rowinfo_[0].ascent_
//+ hlinesep() * rowinfo_[0].lines_
+ 1;
descent_ = rowinfo_[nrows() - 1].offset_
+ rowinfo_[nrows() - 1].descent_
//+ hlinesep() * rowinfo_[nrows()].lines_
+ 1;
+ rowinfo_[nrows() - 1].descent_
//+ hlinesep() * rowinfo_[nrows()].lines_
+ 1;
}

2
src/mathed/math_hullinset.C
View File

@ -722,5 +722,3 @@ void MathHullInset::check() const
lyx::Assert(nonum_.size() == nrows());
lyx::Assert(label_.size() == nrows());
}

1
src/mathed/math_iterator.C
View File

@ -1,4 +1,3 @@
#include <config.h>
#include "math_iterator.h"

1
src/mathed/math_kerninset.C
View File

@ -59,4 +59,3 @@ void MathKernInset::normalize(NormalStream & os) const
{
os << "[kern " << wid_.asLatexString() << "]";
}

1
src/mathed/math_macroarg.C
View File

@ -77,4 +77,3 @@ void MathMacroArgument::substitute(MathMacro const & m)
it->nucleus()->handleFont(code_);
expanded_ = true;
}

1
src/mathed/math_nestinset.C
View File

@ -182,4 +182,3 @@ bool MathNestInset::editing() const
{
return mathcursor && mathcursor->isInside(this);
}

6
src/mathed/math_parser.C
View File

@ -978,7 +978,7 @@ void Parser::parse_into1(MathArray & array, unsigned flags, MathTextCodes code)
// ignore braces around simple items
if ((ar.size() == 1 && !ar.front()->needsBraces()
|| (ar.size() == 2 && !ar.front()->needsBraces()
&& ar.back()->asScriptInset()))
&& ar.back()->asScriptInset()))
|| (ar.size() == 0 && array.size() == 0))
{
array.push_back(ar);
@ -1098,11 +1098,11 @@ void Parser::parse_into1(MathArray & array, unsigned flags, MathTextCodes code)
array.push_back(MathAtom(new MathArrayInset(name, valign[0], halign)));
parse_lines(array.back(), false, false);
} else if (name == "split" || name == "cases" ||
name == "gathered" || name == "aligned") {
name == "gathered" || name == "aligned") {
array.push_back(createMathInset(name));
parse_lines(array.back(), false, false);
} else if (name == "matrix" || name == "pmatrix" || name == "bmatrix" ||
name == "vmatrix" || name == "Vmatrix") {
name == "vmatrix" || name == "Vmatrix") {
array.push_back(createMathInset(name));
parse_lines2(array.back(), false);
} else

2
src/mathed/math_pos.C
View File

@ -92,5 +92,3 @@ bool operator<(MathCursorPos const & p, MathCursorPos const & q)
return p.idx_ < q.idx_;
return p.pos_ < q.pos_;
}

2
src/mathed/math_scriptinset.C
View File

@ -446,5 +446,3 @@ void MathScriptInset::octavize2(MathInset const * nuc, OctaveStream & os) const
if (hasUp() && up().data_.size())
os << "^(" << up().data_ << ')';
}

1
src/mathed/math_scriptinset.h
View File

@ -125,4 +125,3 @@ private:
};
#endif

2
src/mathed/math_spaceinset.C
View File

@ -82,5 +82,3 @@ void MathSpaceInset::write(WriteStream & os) const
if (space_ >= 0 && space_ < 6)
os << '\\' << latex_mathspace[space_] << ' ';
}

2
src/mathed/math_stringinset.C
View File

@ -125,5 +125,3 @@ void MathStringInset::write(WriteStream & os) const
else
os << str_;
}

2
src/mathed/math_support.C
View File

@ -773,5 +773,3 @@ string convertDelimToLatexName(string const & name)
return name;
return "\\" + name + " ";
}

2
src/mathed/math_symbolinset.C
View File

@ -200,5 +200,3 @@ void MathSymbolInset::infoize(ostream & os) const
{
os << '\\' << name();
}