mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
remove unused code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8914 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz
parent
4473009fc3
commit
57163403d4
@ -53,8 +53,6 @@ libmathed_la_SOURCES = \
|
||||
math_dotsinset.h \
|
||||
math_envinset.C \
|
||||
math_envinset.h \
|
||||
math_ertinset.C \
|
||||
math_ertinset.h \
|
||||
math_extern.C \
|
||||
math_extern.h \
|
||||
math_exfuncinset.C \
|
||||
@ -143,8 +141,6 @@ libmathed_la_SOURCES = \
|
||||
math_symbolinset.h \
|
||||
math_tabularinset.C \
|
||||
math_tabularinset.h \
|
||||
math_textinset.C \
|
||||
math_textinset.h \
|
||||
math_unknowninset.C \
|
||||
math_unknowninset.h \
|
||||
math_undersetinset.C \
|
||||
|
||||
@ -423,15 +423,6 @@ int MathArray::dist(int x, int y) const
|
||||
}
|
||||
|
||||
|
||||
void MathArray::boundingBox(int & x1, int & x2, int & y1, int & y2)
|
||||
{
|
||||
x1 = xo_;
|
||||
x2 = xo_ + width();
|
||||
y1 = yo_ - ascent();
|
||||
y2 = yo_ + descent();
|
||||
}
|
||||
|
||||
|
||||
bool MathArray::contains(int x, int y) const
|
||||
{
|
||||
return xo_ <= x && x <= xo_ + width()
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
/**
|
||||
* \file math_ertinset.C
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author André Pönitz
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "math_ertinset.h"
|
||||
#include "math_mathmlstream.h"
|
||||
#include "support/std_ostream.h"
|
||||
|
||||
using std::auto_ptr;
|
||||
|
||||
|
||||
auto_ptr<InsetBase> MathErtInset::clone() const
|
||||
{
|
||||
return auto_ptr<InsetBase>(new MathErtInset(*this));
|
||||
}
|
||||
|
||||
|
||||
void MathErtInset::metrics(MetricsInfo & mi, Dimension & dim) const
|
||||
{
|
||||
FontSetChanger dummy(mi.base, "lyxert");
|
||||
MathTextInset::metrics(mi, dim);
|
||||
cache_.colinfo_[0].align_ = 'l';
|
||||
metricsMarkers(dim);
|
||||
dim_ = dim;
|
||||
}
|
||||
|
||||
|
||||
void MathErtInset::draw(PainterInfo & pi, int x, int y) const
|
||||
{
|
||||
FontSetChanger dummy(pi.base, "lyxert");
|
||||
MathTextInset::draw(pi, x + 1, y);
|
||||
drawMarkers(pi, x, y);
|
||||
}
|
||||
|
||||
|
||||
void MathErtInset::write(WriteStream & os) const
|
||||
{
|
||||
if (os.latex())
|
||||
os << cell(0);
|
||||
else
|
||||
os << "\\lyxert{" << cell(0) << '}';
|
||||
}
|
||||
|
||||
|
||||
void MathErtInset::infoize(std::ostream & os) const
|
||||
{
|
||||
os << "Box: Ert";
|
||||
}
|
||||
@ -1,39 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
/**
|
||||
* \file math_ertinset.h
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author André Pönitz
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
#ifndef MATH_ERTINSET_H
|
||||
#define MATH_ERTINSET_H
|
||||
|
||||
#include "math_data.h"
|
||||
#include "math_textinset.h"
|
||||
|
||||
|
||||
// implements support for \parbox
|
||||
|
||||
class MathErtInset : public MathTextInset {
|
||||
public:
|
||||
///
|
||||
MathErtInset() {}
|
||||
///
|
||||
virtual std::auto_ptr<InsetBase> clone() const;
|
||||
///
|
||||
mode_type currentMode() const { return TEXT_MODE; }
|
||||
///
|
||||
void metrics(MetricsInfo & mi, Dimension & dim) const;
|
||||
///
|
||||
void draw(PainterInfo & pi, int x, int y) const;
|
||||
///
|
||||
void infoize(std::ostream & os) const;
|
||||
///
|
||||
void write(WriteStream & os) const;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -23,7 +23,6 @@
|
||||
#include "math_decorationinset.h"
|
||||
#include "math_dfracinset.h"
|
||||
#include "math_dotsinset.h"
|
||||
#include "math_ertinset.h"
|
||||
#include "math_fboxinset.h"
|
||||
#include "math_frameboxinset.h"
|
||||
#include "math_fontinset.h"
|
||||
@ -316,8 +315,6 @@ MathAtom createMathInset(string const & s)
|
||||
return MathAtom(new MathFracInset(true));
|
||||
if (s == "lefteqn")
|
||||
return MathAtom(new MathLefteqnInset);
|
||||
if (s == "lyxert")
|
||||
return MathAtom(new MathErtInset);
|
||||
if (s == "boldsymbol")
|
||||
return MathAtom(new MathBoldsymbolInset);
|
||||
if (s == "color")
|
||||
|
||||
@ -1,197 +0,0 @@
|
||||
/**
|
||||
* \file math_textinset.C
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author André Pönitz
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "math_textinset.h"
|
||||
#include "math_data.h"
|
||||
|
||||
#include "cursor.h"
|
||||
#include "debug.h"
|
||||
#include "metricsinfo.h"
|
||||
|
||||
using std::auto_ptr;
|
||||
using std::endl;
|
||||
|
||||
|
||||
MathTextInset::MathTextInset()
|
||||
: MathNestInset(1)
|
||||
{}
|
||||
|
||||
|
||||
auto_ptr<InsetBase> MathTextInset::clone() const
|
||||
{
|
||||
return auto_ptr<InsetBase>(new MathTextInset(*this));
|
||||
}
|
||||
|
||||
|
||||
MathInset::idx_type MathTextInset::pos2row(pos_type pos) const
|
||||
{
|
||||
for (pos_type r = 0, n = cache_.nargs(); r < n; ++r)
|
||||
if (pos >= cache_.cellinfo_[r].begin_ && pos <= cache_.cellinfo_[r].end_)
|
||||
return r;
|
||||
lyxerr << "illegal row for pos " << pos << endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
void MathTextInset::getCursorPos(LCursor const & cur, int & x, int & y) const
|
||||
{
|
||||
LCursor c = cur;
|
||||
c.idx() = pos2row(cur.pos());
|
||||
c.pos() -= cache_.cellinfo_[c.idx()].begin_;
|
||||
cache_.getCursorPos(c, x, y);
|
||||
y = cache_.cell(c.idx()).yo();
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
bool MathTextInset::idxUpDown2(LCursor & pos, bool up) const
|
||||
{
|
||||
// try to move only one screen row up or down if possible
|
||||
idx_type i = pos2row(pos);
|
||||
//lyxerr << "\nMathTextInset::idxUpDown() i: " << i << endl;
|
||||
MathGridInset::CellInfo const & cell1 = cache_.cellinfo_[i];
|
||||
int const x = cache_.cell(i).pos2x(pos - cell1.begin_, cell1.glue_);
|
||||
if (up) {
|
||||
if (i == 0)
|
||||
return false;
|
||||
--i;
|
||||
} else {
|
||||
++i;
|
||||
if (i == cache_.nargs())
|
||||
return false;
|
||||
}
|
||||
MathGridInset::CellInfo const & cell2 = cache_.cellinfo_[i];
|
||||
pos = cell2.begin_ + cache_.cell(i).x2pos(x, cell2.glue_);
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
void MathTextInset::metrics(MetricsInfo & mi, Dimension & dim) const
|
||||
{
|
||||
cell(0).metrics(mi);
|
||||
|
||||
// we do our own metrics fiddling
|
||||
// save old positional information
|
||||
int const old_xo = cache_.cell(0).xo();
|
||||
int const old_yo = cache_.cell(0).yo();
|
||||
|
||||
// delete old cache
|
||||
cache_ = MathGridInset(1, 0);
|
||||
|
||||
int spaces = 0;
|
||||
int safe = 0;
|
||||
int curr = 0;
|
||||
int begin = 0;
|
||||
int safepos = 0;
|
||||
for (size_type i = 0, n = cell(0).size(); i < n; ++i) {
|
||||
//lyxerr << "at pos: " << i << " of " << n << " safepos: " << safepos
|
||||
// << " curr: " << curr << " safe: " << safe
|
||||
// << " spaces: " << spaces << endl;
|
||||
|
||||
// 0 1 2 3 4 5 6
|
||||
// <char> <char> <char> <space> <char> <char> <char>
|
||||
// ................... <safe>
|
||||
// ..........................<curr>
|
||||
// ....................<safepos>
|
||||
|
||||
// Special handling of spaces. We reached a safe position for breaking.
|
||||
char const c = cell(0)[i]->getChar();
|
||||
if (c == ' ') {
|
||||
//lyxerr << "reached safe pos" << endl;
|
||||
// we don't count the space into the safe pos
|
||||
safe += curr;
|
||||
// we reset to this safepos if the next chunk does not fit
|
||||
safepos = i;
|
||||
++spaces;
|
||||
// restart chunk with size of the space
|
||||
curr = cell(0)[i]->width();
|
||||
continue;
|
||||
}
|
||||
|
||||
if (c != '\n') {
|
||||
// This is a regular char. Go on if we either don't care for
|
||||
// the width limit or have not reached that limit.
|
||||
curr += cell(0)[i]->width();
|
||||
if (curr + safe <= mi.base.textwidth)
|
||||
continue;
|
||||
}
|
||||
|
||||
// We passed the limit. Create a row entry.
|
||||
//lyxerr << "passed limit" << endl;
|
||||
cache_.appendRow();
|
||||
MathArray & ar = cache_.cell(cache_.nargs() - 1);
|
||||
MathGridInset::CellInfo & row = cache_.cellinfo_.back();
|
||||
if (c == '\n') {
|
||||
// we are here because we hit a hard newline
|
||||
row.begin_ = begin;
|
||||
row.end_ = i + 1;
|
||||
begin = i + 1; // next chunk starts after the newline
|
||||
spaces = 0;
|
||||
} else if (spaces) {
|
||||
// but we had a space break before this position.
|
||||
// so retreat to this position
|
||||
//lyxerr << "... but had safe pos." << endl;
|
||||
row.begin_ = begin;
|
||||
row.end_ = safepos; // this is position of the safe space
|
||||
i = safepos; // i gets incremented at end of loop
|
||||
begin = i + 1; // next chunk starts after the space
|
||||
spaces = 0;
|
||||
} else {
|
||||
// This item is too large and it is the only one.
|
||||
// We have no choice but to produce an overfull box.
|
||||
lyxerr << "... without safe pos" << endl;
|
||||
row.begin_ = begin;
|
||||
row.end_ = i + 1;
|
||||
begin = i + 1;
|
||||
}
|
||||
ar = MathArray(cell(0).begin() + row.begin_, cell(0).begin() + row.end_);
|
||||
//lyxerr << "line: " << ar << endl;
|
||||
// in any case, start the new row with empty boxes
|
||||
curr = 0;
|
||||
safe = 0;
|
||||
}
|
||||
// last row: put in everything else
|
||||
cache_.appendRow();
|
||||
MathArray & ar = cache_.cell(cache_.nargs() - 1);
|
||||
MathGridInset::CellInfo & row = cache_.cellinfo_.back();
|
||||
row.begin_ = begin;
|
||||
row.end_ = cell(0).size();
|
||||
ar = MathArray(cell(0).begin() + row.begin_, cell(0).begin() + row.end_);
|
||||
//lyxerr << "last line: " << ar.data() << endl;
|
||||
|
||||
// what to report?
|
||||
cache_.metrics(mi, dim_);
|
||||
//lyxerr << "outer dim: " << dim_ << endl;
|
||||
|
||||
// reset position cache
|
||||
for (idx_type i = 0; i < cache_.nargs(); ++i)
|
||||
cache_.cell(i).setXY(old_xo, old_yo);
|
||||
|
||||
dim = dim_;
|
||||
}
|
||||
|
||||
|
||||
void MathTextInset::draw(PainterInfo & pi, int x, int y) const
|
||||
{
|
||||
cache_.draw(pi, x + 1, y);
|
||||
setPosCache(pi, x, y);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
void MathTextInset::drawSelection(PainterInfo & pi,
|
||||
idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const
|
||||
{
|
||||
cache_.drawSelection(pi, idx1, pos1, idx2, pos2);
|
||||
}
|
||||
*/
|
||||
@ -1,44 +0,0 @@
|
||||
// -*- C++ -*-
|
||||
/**
|
||||
* \file math_textinset.h
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author André Pönitz
|
||||
*
|
||||
* Full author contact details are available in file CREDITS.
|
||||
*/
|
||||
|
||||
#ifndef MATH_TEXTINSET_H
|
||||
#define MATH_TEXTINSET_H
|
||||
|
||||
#include "math_gridinset.h"
|
||||
|
||||
|
||||
// not yet a substitute for the real text inset...
|
||||
|
||||
class MathTextInset : public MathNestInset {
|
||||
public:
|
||||
///
|
||||
MathTextInset();
|
||||
///
|
||||
std::auto_ptr<InsetBase> clone() const;
|
||||
/// get cursor position
|
||||
void getCursorPos(LCursor const & cur, int & x, int & y) const;
|
||||
/// this stores metrics information in cache_
|
||||
void metrics(MetricsInfo & mi, Dimension & dim) const;
|
||||
/// draw according to cached metrics
|
||||
void draw(PainterInfo &, int x, int y) const;
|
||||
/// draw selection background
|
||||
//void drawSelection(PainterInfo & pi,
|
||||
// idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const;
|
||||
/// moves cursor up or down
|
||||
//bool idxUpDown2(LCursor & pos, bool up) const;
|
||||
protected:
|
||||
/// row corresponding to given position
|
||||
idx_type pos2row(pos_type pos) const;
|
||||
/// cached metrics
|
||||
mutable MathGridInset cache_;
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user