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

patch from Marko, remove table.Ch from repository

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1030 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-09-20 16:15:27 +00:00
parent 783c043a7e
commit cafa657995
10 changed files with 64 additions and 2565 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
2000-09-20 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/Makefile.am (lyx_SOURCES): remove table.C and Table.h
2000-09-20 Marko Vendelin <markov@ioc.ee>
* src/frontends/gnome/FormCitation.C
* src/frontends/gnome/FormIndex.C
* src/frontends/gnome/FormToc.C
* src/frontends/gnome/FormUrl.C: cleanup the loops, reordering
the variable initialization to shut up the warnings
2000-09-20 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/table.[Ch]: deleted files
* src/lyxfunc.C (Dispatch): Don't pass 0 as argument to Dispatch
second arg.
2000-09-18 Juergen Vigna <jug@sad.it>
* src/insets/insettext.C (LocalDispatch): fixed Backspace/Delete

6
po/POTFILES.in
View File

@ -29,10 +29,11 @@ src/filedlg.C
src/FontLoader.C
src/form1.C
src/frontends/gnome/FormCitation.C
src/frontends/gnome/FormIndex.C
src/frontends/gnome/FormPrint.C
src/frontends/gnome/FormToc.C
src/frontends/kde/dlg/FormIndex.C
src/frontends/kde/dlg/formindexdialog.C
src/frontends/gnome/FormUrl.C
src/frontends/gnome/Menubar_pimpl.C
src/frontends/kde/FormCitation.C
src/frontends/kde/formcitationdialog.C
src/frontends/kde/FormCopyright.C
@ -132,7 +133,6 @@ src/support/filetools.C
src/support/getUserName.C
src/support/path.C
src/support/path.h
src/table.C
src/TableLayout.C
src/tabular.C
src/text2.C

2
src/Makefile.am
View File

@ -207,8 +207,6 @@ lyx_SOURCES = \
spellchecker.C \
spellchecker.h \
stl_string_fwd.h \
table.h \
table.C \
tabular.C \
tabular.h \
tex-accent.C \

74
src/frontends/gnome/FormCitation.C
View File

@ -78,7 +78,7 @@ static string const CONF_SEARCH("FormCitation_search");
static string const CONF_TEXTAFTER("FormCitation_textafter");
FormCitation::FormCitation(LyXView * lv, Dialogs * d)
: lv_(lv), d_(d), u_(0), h_(0), ih_(0), inset_(0), dialog_(NULL)
: lv_(lv), d_(d), inset_(0), u_(0), h_(0), ih_(0), dialog_(NULL)
{
// let the dialog be shown
// These are permanent connections so we won't bother
@ -365,15 +365,13 @@ void FormCitation::showStageSelect()
gtk_widget_grab_default (GTK_WIDGET(b_ok->gtkobj()));
// setting sizes of the widgets
string path;
string w, h;
path = PACKAGE "/" + LOCAL_CONFIGURE_PREFIX;
string path = PACKAGE "/" + LOCAL_CONFIGURE_PREFIX;
string w = path + "/" + CONF_PANE_INFO + CONF_PANE_INFO_DEFAULT;
w = path + "/" + CONF_PANE_INFO + CONF_PANE_INFO_DEFAULT;
paned_info_->set_position( gnome_config_get_int(w.c_str()) );
int i, sz;
for (i = 0, sz = clist_bib_->columns().size(); i < sz; ++i)
int sz = clist_bib_->columns().size();
for (int i = 0; i < sz; ++i)
{
w = path + "/" + CONF_COLUMN + "_" + tostr(i) + CONF_COLUMN_DEFAULT;
clist_bib_->column(i).set_width( gnome_config_get_int(w.c_str()) );
@ -392,8 +390,9 @@ void FormCitation::showStageSelect()
false, false));
// retrieving data
vector<pair<string,string> > blist = lv_->buffer()->getBibkeyList();
for ( i = 0, sz = blist.size(); i < sz; ++i )
sz = blist.size();
for (int i = 0; i < sz; ++i )
{
bibkeys.push_back(blist[i].first);
bibkeysInfo.push_back(blist[i].second);
@ -566,16 +565,16 @@ void FormCitation::update()
vector<pair<string,string> > blist =
lv_->buffer()->getBibkeyList();
int i, sz;
for ( i = 0, sz = blist.size(); i < sz; ++i )
int sz = blist.size();
for ( int i = 0; i < sz; ++i )
{
bibkeys.push_back(blist[i].first);
bibkeysInfo.push_back(blist[i].second);
}
blist.clear();
for ( i = 0, sz = bibkeys.size(); i < sz; ++i )
sz = bibkeys.size();
for ( int i = 0; i < sz; ++i )
addItemToBibList(i);
clist_bib_->sort();
@ -608,9 +607,9 @@ void FormCitation::updateButtons()
sens = (clist_selected_->selection().size()>0);
button_unselect_->set_sensitive(sens);
button_up_->set_sensitive(sens &&
clist_selected_->selection().operator[](0).get_row_num()>0);
clist_selected_->selection()[0].get_row_num()>0);
button_down_->set_sensitive(sens &&
clist_selected_->selection().operator[](0).get_row_num() <
clist_selected_->selection()[0].get_row_num() <
clist_selected_->rows().size()-1);
sens = (clist_bib_->selection().size()>0);
@ -630,10 +629,9 @@ void FormCitation::selection_toggled(gint row,
if (citeselected)
{
// lookup the record with the same key in bibkeys and show additional Info
int i;
int sz = bibkeys.size();
int const sz = bibkeys.size();
string key = clist_selected_->cell(row,0).get_text();
for (i=0; !keyfound && i<sz; ++i)
for (int i=0; !keyfound && i<sz; ++i)
if (bibkeys[i] == key)
{
info = bibkeysInfo[i];
@ -660,13 +658,13 @@ void FormCitation::selection_toggled(gint row,
void FormCitation::removeCitation()
{
clist_selected_->rows().remove(clist_selected_->selection().operator[](0));
clist_selected_->rows().remove(clist_selected_->selection()[0]);
updateButtons();
}
void FormCitation::moveCitationUp()
{
int i = clist_selected_->selection().operator[](0).get_row_num();
int i = clist_selected_->selection()[0].get_row_num();
clist_selected_->swap_rows( i-1, i );
clist_selected_->row(i-1).select();
updateButtons();
@ -674,7 +672,7 @@ void FormCitation::moveCitationUp()
void FormCitation::moveCitationDown()
{
int i = clist_selected_->selection().operator[](0).get_row_num();
int i = clist_selected_->selection()[0].get_row_num();
clist_selected_->swap_rows( i+1, i );
clist_selected_->row(i+1).select();
updateButtons();
@ -684,7 +682,7 @@ void FormCitation::newCitation()
{
// citation key is in the first column of clist_bib_ list
vector<string> r;
r.push_back( clist_bib_->selection().operator[](0).operator[](1).get_text() );
r.push_back( clist_bib_->selection()[0][1].get_text() );
clist_selected_->rows().push_back(r);
clist_selected_->row( clist_selected_->rows().size()-1 ).select();
updateButtons();
@ -741,16 +739,16 @@ void FormCitation::applySelect()
if( lv_->buffer()->isReadonly() ) return;
string contents;
int i, sz;
int sz;
contents = frontStrip( strip(params.getContents()) );
if (!contents.empty()) contents += ", ";
sz = clist_bib_->selection().size();
for (i=0; i < sz; ++i)
for (int i=0; i < sz; ++i)
{
if (i > 0) contents += ", ";
contents += clist_bib_->selection().operator[](i).operator[](1).get_text();
contents += clist_bib_->selection()[i][1].get_text();
}
params.setContents( contents );
@ -768,20 +766,19 @@ void FormCitation::applySelect()
else
{
lv_->getLyXFunc()->Dispatch( LFUN_CITATION_INSERT,
params.getAsString().c_str() );
params.getAsString() );
}
// save config
text_after_->save_history();
string path;
string w, h;
path = PACKAGE "/" + LOCAL_CONFIGURE_PREFIX;
string path = PACKAGE "/" + LOCAL_CONFIGURE_PREFIX;
string w = path + "/" + CONF_PANE_INFO;
w = path + "/" + CONF_PANE_INFO;
gnome_config_set_int(w.c_str(), paned_info_->width() - info_->width());
for (i = 0, sz = clist_bib_->columns().size(); i < sz; ++i)
sz = clist_bib_->columns().size();
for (int i = 0; i < sz; ++i)
{
w = path + "/" + CONF_COLUMN + "_" + tostr(i);
gnome_config_set_int(w.c_str(), clist_bib_->get_column_width(i));
@ -798,7 +795,8 @@ void FormCitation::apply()
if( lv_->buffer()->isReadonly() ) return;
string contents;
for( unsigned int i = 0; i < clist_selected_->rows().size(); ++i )
int const sz = clist_selected_->rows().size();
for( int i = 0; i < sz; ++i )
{
if (i > 0) contents += ", ";
contents += clist_selected_->cell(i, 0).get_text();
@ -819,7 +817,7 @@ void FormCitation::apply()
else
{
lv_->getLyXFunc()->Dispatch( LFUN_CITATION_INSERT,
params.getAsString().c_str() );
params.getAsString() );
}
}
@ -848,9 +846,9 @@ void FormCitation::searchReg()
clist_bib_->freeze();
int i, sz;
int const sz = bibkeys.size();
bool additem;
for ( i = 0, sz = bibkeys.size(); i < sz; ++i )
for ( int i = 0; i < sz; ++i )
{
string data = bibkeys[i] + bibkeysInfo[i];
@ -882,9 +880,9 @@ void FormCitation::searchSimple()
clist_bib_->freeze();
int i, sz;
int const sz = bibkeys.size();
bool additem;
for ( i = 0, sz = bibkeys.size(); i < sz; ++i )
for ( int i = 0; i < sz; ++i )
{
string data = bibkeys[i] + bibkeysInfo[i];

4
src/frontends/gnome/FormIndex.C
View File

@ -46,7 +46,7 @@ extern GLyxAppWin * mainAppWin;
static string const CONF_ENTRY("FormIndex_entry");
FormIndex::FormIndex(LyXView * lv, Dialogs * d)
: lv_(lv), d_(d), u_(0), h_(0), ih_(0), inset_(0), dialog_(NULL)
: lv_(lv), d_(d), inset_(0), u_(0), h_(0), ih_(0), dialog_(NULL)
{
// let the dialog be shown
// These are permanent connections so we won't bother
@ -187,7 +187,7 @@ void FormIndex::apply()
else
{
lv_->getLyXFunc()->Dispatch( LFUN_INDEX_INSERT,
params.getAsString().c_str() );
params.getAsString() );
}
// save history

2
src/frontends/gnome/FormToc.C
View File

@ -39,7 +39,7 @@ extern "C" {
using SigC::bind;
FormToc::FormToc(LyXView * lv, Dialogs * d)
: lv_(lv), d_(d), u_(0), h_(0), ih_(0), inset_(0), dialog_(NULL), ignore_callback_(false)
: lv_(lv), d_(d), inset_(0), u_(0), h_(0), ih_(0), dialog_(NULL), ignore_callback_(false)
{
// let the dialog be shown
// These are permanent connections so we won't bother

4
src/frontends/gnome/FormUrl.C
View File

@ -39,7 +39,7 @@ static string const CONF_ENTRY_URL("FormUrl_url");
static string const CONF_ENTRY_NAME("FormUrl_name");
FormUrl::FormUrl(LyXView * lv, Dialogs * d)
: lv_(lv), d_(d), u_(0), h_(0), ih_(0), inset_(0), dialog_(NULL)
: lv_(lv), d_(d), inset_(0), u_(0), h_(0), ih_(0), dialog_(NULL)
{
// let the dialog be shown
// These are permanent connections so we won't bother
@ -209,7 +209,7 @@ void FormUrl::apply()
else
{
lv_->getLyXFunc()->Dispatch( LFUN_INSERT_URL,
params.getAsString().c_str() );
params.getAsString() );
}
// save history

2
src/lyxfunc.C
View File

@ -893,7 +893,7 @@ string const LyXFunc::Dispatch(int ac,
meta_fake_bit = 0;
if(owner->view()->available())
// cancel any selection
Dispatch(LFUN_MARK_OFF, 0);
Dispatch(LFUN_MARK_OFF);
setMessage(N_("Cancel"));
break;

2080
src/table.C
View File

File diff suppressed because it is too large Load Diff

436
src/table.h
View File

@ -1,436 +0,0 @@
// -*- C++ -*-
/* This file is part of
* ======================================================
*
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#ifndef TABLE_H
#define TABLE_H
#ifdef __GNUG__
#pragma interface
#endif
#include <iosfwd>
#include "lyxlex.h"
#include "LString.h"
/* The features the text class offers for tables */
///
class LyXTable {
public:
// Are the values of these enums important? (Lgb)
///
enum {
///
APPEND_ROW = 0,
///
APPEND_COLUMN = 1,
///
DELETE_ROW = 2,
///
DELETE_COLUMN = 3,
///
TOGGLE_LINE_TOP = 4,
///
TOGGLE_LINE_BOTTOM = 5,
///
TOGGLE_LINE_LEFT = 6,
///
TOGGLE_LINE_RIGHT = 7,
///
ALIGN_LEFT = 8, // what are these alignment enums used for?
///
ALIGN_RIGHT = 9,
///
ALIGN_CENTER = 10,
///
DELETE_TABLE = 11,
///
MULTICOLUMN = 12,
///
SET_ALL_LINES = 13,
///
UNSET_ALL_LINES = 14,
///
SET_LONGTABLE = 15,
///
UNSET_LONGTABLE = 16,
///
SET_PWIDTH = 17,
///
APPEND_CONT_ROW = 18,
///
SET_ROTATE_TABLE = 19,
///
UNSET_ROTATE_TABLE = 20,
///
SET_ROTATE_CELL = 21,
///
UNSET_ROTATE_CELL = 22,
///
SET_LINEBREAKS = 23,
///
SET_LTHEAD = 24,
///
SET_LTFIRSTHEAD = 25,
///
SET_LTFOOT = 26,
///
SET_LTLASTFOOT = 27,
///
SET_LTNEWPAGE = 28,
///
SET_SPECIAL_COLUMN = 29,
///
SET_SPECIAL_MULTI = 30
};
///
enum {
///
CELL_NORMAL = 0,
///
CELL_BEGIN_OF_MULTICOLUMN = 1,
///
CELL_PART_OF_MULTICOLUMN = 2
};
/* konstruktor */
///
LyXTable(int columns_arg, int rows_arg);
///
LyXTable(LyXTable const &);
///
explicit
LyXTable(LyXLex & lex);
///
~LyXTable();
///
LyXTable & operator=(LyXTable const &);
///
LyXTable * Clone();
/// Returns true if there is a topline, returns false if not
bool TopLine(int cell);
/// Returns true if there is a topline, returns false if not
bool BottomLine(int cell);
/// Returns true if there is a topline, returns false if not
bool LeftLine(int cell);
/// Returns true if there is a topline, returns false if not
bool RightLine(int cell);
///
bool TopAlreadyDrawed(int cell);
///
bool VeryLastRow(int cell);
///
int AdditionalHeight(int cell);
///
int AdditionalWidth(int cell);
/* returns the maximum over all rows */
///
int WidthOfColumn(int cell);
///
int WidthOfTable();
///
int AscentOfRow(int row);
///
int DescentOfRow(int row);
///
int HeightOfTable();
///
void SetAscentOfRow(int row, int height);
///
void SetDescentOfRow(int row, int height);
/// Returns true if a complete update is necessary, otherwise false
bool SetWidthOfCell(int cell, int new_width);
/// Returns true if a complete update is necessary, otherwise false
bool SetAllLines(int cell, bool line);
/// Returns true if a complete update is necessary, otherwise false
bool SetTopLine(int cell, bool line);
/// Returns true if a complete update is necessary, otherwise false
bool SetBottomLine(int cell, bool line);
/// Returns true if a complete update is necessary, otherwise false
bool SetLeftLine(int cell, bool line);
/// Returns true if a complete update is necessary, otherwise false
bool SetRightLine(int cell, bool line);
/// Returns true if a complete update is necessary, otherwise false
bool SetAlignment(int cell, char align);
///
bool SetPWidth(int cell, string width);
///
bool SetAlignSpecial(int cell, string special, int what);
///
char GetAlignment(int cell); // add approp. signedness
///
string const GetPWidth(int cell);
///
string const GetAlignSpecial(int cell, int what);
///
int GetWidthOfCell(int cell);
///
int GetBeginningOfTextInCell(int cell);
///
void AppendRow(int cell);
///
void DeleteRow(int cell);
///
void AppendColumn(int cell);
///
void DeleteColumn(int cell);
///
bool IsFirstCell(int cell);
///
bool IsLastCell(int cell);
///
int GetNumberOfCells();
///
int AppendCellAfterCell(int append_cell, int question_cell);
///
int DeleteCellIfColumnIsDeleted(int cell, int delete_column_cell);
///
int NumberOfCellsInRow(int cell);
///
void Reinit();
///
void Init(int columns_arg, int rows_arg);
///
void Write(std::ostream &, bool old_format=true);
///
void Read(std::istream &);
///
int Latex(std::ostream &);
/**
@param cell < 0 will tex the preamble
@return the number of printed newlines
*/
int TexEndOfCell(std::ostream &, int cell);
///
int DocBookEndOfCell(std::ostream &, int cell, int & depth);
#if 0
///
int RoffEndOfCell(std::ostream &, int cell);
#endif
///
char const * getDocBookAlign(int cell, bool isColumn = false);
///
bool IsMultiColumn(int cell);
///
void SetMultiColumn(int cell, int number);
///
int UnsetMultiColumn(int cell); // returns number of new cells
///
bool IsPartOfMultiColumn(int row, int column);
///
int row_of_cell(int cell) const;
///
int column_of_cell(int cell) const;
///
int rows;
///
int columns;
///
void SetLongTable(int what);
///
bool IsLongTable();
///
void SetRotateTable(int what);
///
bool RotateTable();
///
void SetRotateCell(int cell, int what);
///
bool RotateCell(int cell);
///
bool NeedRotating();
///
void AppendContRow(int cell);
///
bool IsContRow(int cell);
/**
@return number of the cell which coninues or -1 if no ContRow
*/
int CellHasContRow(int cell);
///
bool RowHasContRow(int cell);
///
int FirstVirtualCell(int cell);
///
int NextVirtualCell(int cell);
///
bool ShouldBeVeryLastCell(int cell);
///
bool ShouldBeVeryLastRow(int cell);
///
int GetCellAbove(int cell);
///
int GetCellNumber(int column, int row);
///
void SetLinebreaks(int cell, bool what);
///
bool Linebreaks(int cell);
//
// Long Table Options
///
void SetLTHead(int cell, bool first);
///
bool RowOfLTHead(int cell);
///
bool RowOfLTFirstHead(int cell);
///
void SetLTFoot(int cell, bool last);
///
bool RowOfLTFoot(int cell);
///
bool RowOfLTLastFoot(int cell);
///
void SetLTNewPage(int cell, bool what);
///
bool LTNewPage(int cell);
private:
///
struct cellstruct {
///
cellstruct();
///
~cellstruct();
///
cellstruct & operator=(cellstruct const &);
///
int cellno;
///
int width_of_cell;
///
int multicolumn; // add approp. signedness
///
int alignment; // add approp. signedness
///
bool top_line;
///
bool bottom_line;
///
bool has_cont_row;
///
bool linebreaks;
///
int rotate;
///
string align_special;
///
string p_width; // this is only set for multicolumn!!!
};
///
struct rowstruct {
///
rowstruct();
///
~rowstruct();
///
rowstruct & operator=(rowstruct const &);
///
bool top_line;
///
bool bottom_line;
///
bool is_cont_row;
///
int ascent_of_row;
///
int descent_of_row;
/// This are for longtables only
bool newpage;
};
///
struct columnstruct {
///
columnstruct();
///
~columnstruct();
///
columnstruct & operator=(columnstruct const &);
///
int alignment; // add approp. signedness
///
bool left_line;
///
bool right_line;
///
int width_of_column;
///
string p_width;
///
string align_special;
};
///
int numberofcells;
///
int * rowofcell;
///
int * columnofcell;
///
rowstruct * row_info;
///
columnstruct * column_info;
///
cellstruct ** cell_info;
///
int width_of_table;
//
// for long tables
/// row of endhead
int endhead;
/// row of endfirst head
int endfirsthead;
/// row of endfoot
int endfoot;
/// row of endlastfoot
int endlastfoot;
///
void set_row_column_number_info();
/// Returns true if a complete update is necessary, otherwise false
bool SetWidthOfMulticolCell(int cell, int new_width);
///
void recalculateMulticolCells(int cell, int new_width);
/// Returns true if change
bool calculate_width_of_column(int column);
///
bool calculate_width_of_column_NMC(int column); // no multi cells
///
void calculate_width_of_table();
///
int right_column_of_cell(int cell);
///
cellstruct * cellinfo_of_cell(int cell);
///
void delete_column(int column);
///
int cells_in_multicolumn(int cell);
///
int is_long_table;
///
int rotate;
};
#endif