anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reindent files with tab-stops (instead of 4 spaces). It is allowed to change

Browse Source 
now the indent in files owned by myself to tabstops if I did miss some!
(but please set your tab-width to 4 ;)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1872 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Vigna 2001-04-02 14:02:58 +00:00
parent 9a75180e35
commit 63d5070bc3
9 changed files with 3985 additions and 4009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/POTFILES.in
View File

@ -24,9 +24,9 @@ src/frontends/controllers/ControlInclude.C
src/frontends/controllers/ControlPreamble.C
src/frontends/controllers/ControlPrint.C
src/frontends/controllers/ControlSearch.C
src/frontends/controllers/ControlToc.C
src/frontends/controllers/helper_funcs.C
src/frontends/gnome/FormCitation.C
src/frontends/gnome/FormCopyright.C
src/frontends/gnome/FormError.C
src/frontends/gnome/FormIndex.C
src/frontends/gnome/FormPrint.C

1
src/insets/insetcollapsable.C
View File

@ -66,7 +66,6 @@ bool InsetCollapsable::InsertInset(BufferView * bv, Inset * in)
"Unable to insert inset." << endl;
return false;
}
return inset.InsertInset(bv, in);
}

21
src/insets/insettext.C
View File

@ -204,7 +204,7 @@ void InsetText::Read(Buffer const * buf, LyXLex & lex)
// delete all instances of LyXText before deleting the paragraps used
// by it.
for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit){
for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit) {
delete (*cit).second;
(*cit).second = 0;
}
@ -331,7 +331,7 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
// if top_x differs we have a rule down and we don't have to clear anything
if (!cleared && (top_x == int(x)) &&
((need_update==INIT)||(need_update==FULL)||(top_baseline!=baseline)||
((need_update==INIT)||(need_update==FULL)||(top_baseline!=baseline) ||
(last_drawn_width!=insetWidth)))
{
int w = insetWidth;
@ -558,10 +558,11 @@ void InsetText::Edit(BufferView * bv, int x, int y, unsigned int button)
// If the inset is empty set the language of the current font to the
// language to the surronding text.
#ifndef NEW_INSETS
if (par->Last() == 0 && !par->next_) {
if (par->Last() == 0 && !par->next_)
#else
if (par->size() == 0 && !par->next()) {
if (par->size() == 0 && !par->next())
#endif
{
LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(bv->getParentLanguage(this));
SetFont(bv, font, false);
@ -1153,10 +1154,11 @@ InsetText::LocalDispatch(BufferView * bv,
/// If the action has deleted all text in the inset, we need to change the
// language to the language to the surronding text.
#ifndef NEW_INSETS
if (par->Last() == 0 && !par->next_) {
if (par->Last() == 0 && !par->next_)
#else
if (par->size() == 0 && !par->next()) {
if (par->size() == 0 && !par->next())
#endif
{
LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(bv->getParentLanguage(this));
SetFont(bv, font, false);
@ -1628,13 +1630,6 @@ void InsetText::SetFrameColor(BufferView * bv, LColor::color col)
}
}
#if 0
LyXFont InsetText::GetDrawFont(BufferView * bv, LyXParagraph * p, int pos) const
{
return TEXT(bv)->GetFont(bv->buffer(), p, pos);
}
#endif
int InsetText::cx(BufferView * bv) const
{

36
src/tabular.C
View File

@ -42,7 +42,7 @@ using std::vector;
namespace {
int const WIDTH_OF_LINE = 5;
int const WIDTH_OF_LINE = 5;
} // namespace
@ -263,7 +263,7 @@ void LyXTabular::AppendColumn(int cell)
c_info[i][j] = cell_info[i][j - 1];
}
// care about multicolumns
if (cell_info[i][column + 1].multicolumn == CELL_BEGIN_OF_MULTICOLUMN) {
if (cell_info[i][column + 1].multicolumn==CELL_BEGIN_OF_MULTICOLUMN) {
cell_info[i][column + 1].multicolumn = CELL_PART_OF_MULTICOLUMN;
}
if ((column + 1) == columns_ ||
@ -1043,22 +1043,6 @@ void LyXTabular::Write(Buffer const * buf, ostream & os) const
<< write_attribute("newpage", tostr(row_info[i].newpage))
<< ">\n";
for (int j = 0; j < columns_; ++j) {
#if 0
if (!i) {
os << "<column"
<< write_attribute("alignment", tostr(column_info[j].alignment))
<< write_attribute("valignment", tostr(column_info[j].valignment))
<< write_attribute("leftline", tostr(column_info[j].left_line))
<< write_attribute("rightline", tostr(column_info[j].right_line))
<< write_attribute("width",
VSpace(column_info[j].p_width)
.asLyXCommand())
<< write_attribute("special", column_info[j].align_special)
<< ">\n";
} else {
os << "<column>\n";
}
#endif
os << "<cell"
<< write_attribute("multicolumn", cell_info[i][j].multicolumn)
<< write_attribute("alignment", tostr(cell_info[i][j].alignment))
@ -1076,9 +1060,6 @@ void LyXTabular::Write(Buffer const * buf, ostream & os) const
cell_info[i][j].inset.Write(buf, os);
os << "\n\\end_inset \n"
<< "</cell>\n";
#if 0
<< "</column>\n";
#endif
}
os << "</row>\n";
}
@ -1536,10 +1517,11 @@ void LyXTabular::OldFormatRead(LyXLex & lex, string const & fl)
int row;
#ifndef NEW_INSETS
for (int i = 0; i < par->Last(); ++i) {
for (int i = 0; i < par->Last(); ++i)
#else
for (int i = 0; i < par->size(); ++i) {
for (int i = 0; i < par->size(); ++i)
#endif
{
if (par->IsNewline(i)) {
++cell;
if (cell > GetNumberOfCells()) {
@ -2331,11 +2313,11 @@ int LyXTabular::DocBook(Buffer const * buf, ostream & os) const
namespace {
inline
void print_n_chars(ostream & os, unsigned char ch, int n)
{
inline
void print_n_chars(ostream & os, unsigned char ch, int n)
{
os << string(n, ch);
}
}
} // namespace anon