anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

small changes

Browse Source 
prepare for the STRINGCONV patch


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5572 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-11-04 00:15:56 +00:00
parent 9babb4a5f9
commit dd9b8de435
27 changed files with 265 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
po/POTFILES.in
View File

@ -1,20 +1,16 @@
src/BufferView.C
src/BufferView_pimpl.C
src/Chktex.C
src/CutAndPaste.C
src/LColor.C
src/LaTeX.C
src/LyXAction.C
src/MenuBackend.C
src/buffer.C
src/bufferlist.C
src/BufferView.C
src/bufferview_funcs.C
src/BufferView_pimpl.C
src/Chktex.C
src/converter.C
src/CutAndPaste.C
src/debug.C
src/exporter.C
src/ext_l10n.h
src/frontends/LyXView.C
src/frontends/controllers/biblio.C
src/frontends/controllers/ButtonController.h
src/frontends/controllers/character.C
src/frontends/controllers/ControlAboutlyx.C
src/frontends/controllers/ControlBibtex.C
src/frontends/controllers/ControlCharacter.C
@ -29,13 +25,13 @@ src/frontends/controllers/ControlSearch.C
src/frontends/controllers/ControlSpellchecker.C
src/frontends/controllers/ControlThesaurus.C
src/frontends/controllers/ControlVCLog.C
src/frontends/controllers/biblio.C
src/frontends/controllers/character.C
src/frontends/controllers/frnt_lang.C
src/frontends/controllers/helper_funcs.C
src/frontends/gnome/GLog.C
src/frontends/LyXView.C
src/frontends/qt2/Alert_pimpl.C
src/frontends/qt2/FileDialog.C
src/frontends/qt2/lengthcombo.C
src/frontends/qt2/QAbout.C
src/frontends/qt2/QBibitem.C
src/frontends/qt2/QBibtex.C
@ -47,8 +43,8 @@ src/frontends/qt2/QCommandBuffer.C
src/frontends/qt2/QDelimiterDialog.C
src/frontends/qt2/QDocument.C
src/frontends/qt2/QDocumentDialog.C
src/frontends/qt2/QERT.C
src/frontends/qt2/QError.C
src/frontends/qt2/QERT.C
src/frontends/qt2/QExternal.C
src/frontends/qt2/QExternalDialog.C
src/frontends/qt2/QFloat.C
@ -65,6 +61,7 @@ src/frontends/qt2/QPrint.C
src/frontends/qt2/QPrintDialog.C
src/frontends/qt2/QRef.C
src/frontends/qt2/QSearch.C
src/frontends/qt2/QSendto.C
src/frontends/qt2/QShowFile.C
src/frontends/qt2/QSpellchecker.C
src/frontends/qt2/QTabularCreate.C
@ -74,9 +71,9 @@ src/frontends/qt2/QToc.C
src/frontends/qt2/QURL.C
src/frontends/qt2/QVCLog.C
src/frontends/qt2/QWrap.C
src/frontends/qt2/lengthcombo.C
src/frontends/xforms/Alert_pimpl.C
src/frontends/xforms/ColorHandler.C
src/frontends/xforms/combox.C
src/frontends/xforms/FeedbackController.C
src/frontends/xforms/FileDialog.C
src/frontends/xforms/FormAboutlyx.C
@ -85,8 +82,8 @@ src/frontends/xforms/FormBibtex.C
src/frontends/xforms/FormCharacter.C
src/frontends/xforms/FormCitation.C
src/frontends/xforms/FormDocument.C
src/frontends/xforms/FormERT.C
src/frontends/xforms/FormError.C
src/frontends/xforms/FormERT.C
src/frontends/xforms/FormExternal.C
src/frontends/xforms/FormFiledialog.C
src/frontends/xforms/FormFloat.C
@ -119,15 +116,14 @@ src/frontends/xforms/FormToc.C
src/frontends/xforms/FormUrl.C
src/frontends/xforms/FormVCLog.C
src/frontends/xforms/FormWrap.C
src/frontends/xforms/Menubar_pimpl.C
src/frontends/xforms/XMiniBuffer.C
src/frontends/xforms/combox.C
src/frontends/xforms/input_validators.C
src/frontends/xforms/Menubar_pimpl.C
src/frontends/xforms/xforms_helpers.C
src/frontends/xforms/XMiniBuffer.C
src/gettext.h
src/importer.C
src/insets/inset.C
src/insets/insetbib.C
src/insets/inset.C
src/insets/insetcaption.C
src/insets/inseterror.C
src/insets/insetert.C
@ -154,24 +150,27 @@ src/insets/inseturl.C
src/insets/insetwrap.C
src/kbsequence.C
src/language.C
src/LaTeX.C
src/LColor.C
src/LyXAction.C
src/lyx_cb.C
src/lyx_main.C
src/lyxfind.C
src/lyxfont.C
src/lyxfunc.C
src/lyx_main.C
src/lyxrc.C
src/lyxtextclasslist.C
src/lyxvc.C
src/mathed/formulabase.C
src/mathed/formulamacro.C
src/mathed/math_cursor.C
src/mathed/math_hullinset.C
src/mathed/math_parboxinset.C
src/mathed/ref_inset.C
src/MenuBackend.C
src/paragraph.C
src/support/filetools.C
src/tabular.C
src/text.C
src/text2.C
src/text3.C
src/text.C
src/ext_l10n.h

17
src/ChangeLog
View File

@ -1,3 +1,20 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* vc-backend.C (scanMaster): change from submatch[...] to
submatch.str(...)
* funcrequest.C: include config.h
* factory.C: include config.h
* chset.C (loadFile): change from submatch[...] to submatch.str(...)
* box.C: include config.h
* LaTeX.C (scanAuxFile): change from submatch[...] to
submatch.str(...)
(deplog): ditto
2002-10-25 Angus Leeming <leeming@lyx.org>
* BufferView_pimpl.C (cursorToggle): remove reapSpellchecker hack.

18
src/LaTeX.C
View File

@ -434,7 +434,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
token = rtrim(token, "\r");
smatch sub;
if (regex_match(token, sub, reg1)) {
string data = sub[1];
string data = sub.str(1);
while (!data.empty()) {
string citation;
data = split(data, citation, ',');
@ -443,7 +443,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
aux_info.citations.insert(citation);
}
} else if (regex_match(token, sub, reg2)) {
string data = sub[1];
string data = sub.str(1);
// data is now all the bib files separated by ','
// get them one by one and pass them to the helper
while (!data.empty()) {
@ -455,7 +455,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
aux_info.databases.insert(database);
}
} else if (regex_match(token, sub, reg3)) {
string style = sub[1];
string style = sub.str(1);
// token is now the style file
// pass it to the helper
style = ChangeExtension(style, "bst");
@ -463,7 +463,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
<< style << "'" << endl;
aux_info.styles.insert(style);
} else if (regex_match(token, sub, reg4)) {
string file2 = sub[1];
string file2 = sub.str(1);
scanAuxFile(file2, aux_info);
}
}
@ -685,15 +685,15 @@ void LaTeX::deplog(DepTable & head)
smatch sub;
if (regex_match(token, sub, reg1)) {
foundfile = sub[1];
foundfile = sub.str(1);
} else if (regex_match(token, sub, reg2)) {
foundfile = sub[1];
foundfile = sub.str(1);
} else if (regex_match(token, sub, reg3)) {
foundfile = sub[1];
foundfile = sub.str(1);
} else if (regex_match(token, sub, reg4)) {
foundfile = sub[1];
foundfile = sub.str(1);
} else if (regex_match(token, sub, reg5)) {
foundfile = sub[1];
foundfile = sub.str(1);
} else {
continue;
}

7
src/box.C
View File

@ -8,16 +8,20 @@
// Code moved out of line and out of box.h by Angus (7 Jan 2002)
#include <config.h>
#include "box.h"
#include "support/LOstream.h"
using std::ostream;
Box::Box(int x1_, int x2_, int y1_, int y2_) :
x1(x1_), x2(x2_), y1(y1_), y2(y2_)
{}
bool Box::contained(int x, int y)
{
return (x1 < x && x2 > x &&
@ -28,5 +32,6 @@ bool Box::contained(int x, int y)
ostream & operator<<(ostream & o, Box const & b)
{
return o << "x1,y1: " << b.x1 << "," << b.y1
<< " x2,y2: " << b.x2 << "," << b.y2 << std::endl;
<< " x2,y2: " << b.x2 << "," << b.y2
<< std::endl;
}

5
src/chset.C
View File

@ -22,6 +22,7 @@ using boost::regex;
using boost::regex_match;
using boost::smatch;
bool CharacterSet::loadFile(string const & fname)
{
map_.clear();
@ -51,8 +52,8 @@ bool CharacterSet::loadFile(string const & fname)
while (getline(ifs, line)) {
smatch sub;
if (regex_match(line, sub, reg)) {
int const n = lyx::atoi(sub[1]);
string const str = sub[2];
int const n = lyx::atoi(sub.str(1));
string const str = sub.str(2);
if (lyxerr.debugging(Debug::KBMAP))
lyxerr << "Chardef: " << n
<< " to [" << str << "]" << endl;

4
src/factory.C
View File

@ -8,6 +8,8 @@
* Full author contact details are available in file CREDITS
*/
#include <config.h>
#include "funcrequest.h"
#include "bufferparams.h"
#include "buffer.h"
@ -153,5 +155,3 @@ Inset * createInset(FuncRequest const & cmd)
}
return 0;
}

4
src/frontends/ChangeLog
View File

@ -1,3 +1,7 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyx_gui.h: reindent a bit, change signeture on lyx_gui::start.
2002-10-24 Rob Lahaye <lahaye@snu.ac.kr>
* PrinterParams.h (to): default value changed to 0 (from 1).

4
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,7 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* ControlMath.C: include config.h
2002-10-31 John Levon <levon@movementarian.org>
* ControlGraphics.h:

2
src/frontends/controllers/ControlMath.C
View File

@ -9,6 +9,8 @@
* Full author contact details are available in file CREDITS
*/
#include <config.h>
#include "ControlMath.h"
char const * function_names[] = {

43
src/frontends/lyx_gui.h
View File

@ -23,55 +23,56 @@ class LyXComm;
/// GUI interaction
namespace lyx_gui {
/// parse command line and do basic initialisation
void parse_init(int & argc, char * argv[]);
/// parse command line and do basic initialisation
void parse_init(int & argc, char * argv[]);
/**
/**
* set up GUI parameters. At this point lyxrc may
* be used.
*/
void parse_lyxrc();
void parse_lyxrc();
/**
/**
* Start the main event loop, after executing the given
* batch commands, and loading the given documents
*/
void start(string const & batch, std::vector<std::string> files);
void start(string const & batch, std::vector<std::string> const & files);
/**
/**
* quit running LyX
*/
void exit();
void exit();
/** Eg, passing LColor::black returns "000000",
/** Eg, passing LColor::black returns "000000",
* passing LColor::white returns "ffffff".
*/
string const hexname(LColor::color col);
string const hexname(LColor::color col);
/**
/**
* update an altered GUI color
*/
void update_color(LColor::color col);
void update_color(LColor::color col);
/**
/**
* update the font cache
*/
void update_fonts();
void update_fonts();
/**
/**
* is the given font available ?
*/
bool font_available(LyXFont const & font);
bool font_available(LyXFont const & font);
/**
/**
* add a callback for I/O read notification
*/
void set_read_callback(int fd, LyXComm * comm);
void set_read_callback(int fd, LyXComm * comm);
/**
/**
* remove a I/O read callback
*/
void remove_read_callback(int fd);
}
void remove_read_callback(int fd);
} // namespace lyx_gui
#endif // LYX_GUI_H

7
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,10 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* qttableview.C: include config.h
* lyx_gui.C: move includes around a bit
(start): adjust signature
2002-10-31 John Levon <levon@movementarian.org>
* QExternal.C: fix crash, valid check

8
src/frontends/qt2/lyx_gui.C
View File

@ -22,9 +22,6 @@
#include "debug.h"
#include "gettext.h"
#include <fcntl.h>
#include <boost/bind.hpp>
#include "lyx_gui.h"
#include "lyx_main.h"
#include "lyxrc.h"
@ -41,6 +38,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/function/function0.hpp>
#include <boost/signals/signal1.hpp>
#include <boost/bind.hpp>
#include "QtView.h"
#include "QLImage.h"
@ -51,6 +49,8 @@
#include <qwidget.h>
#include <qpaintdevicemetrics.h>
#include <fcntl.h>
#ifndef CXX_GLOBAL_CSTD
using std::exit;
#endif
@ -98,7 +98,7 @@ void lyx_gui::parse_lyxrc()
}
void lyx_gui::start(string const & batch, vector<string> files)
void lyx_gui::start(string const & batch, vector<string> const & files)
{
// initial geometry
int xpos = -1;

4
src/frontends/qt2/qttableview.C
View File

@ -1,5 +1,5 @@
/**********************************************************************
** $Id: qttableview.C,v 1.3 2002/03/21 21:19:37 larsbj Exp $
** $Id: qttableview.C,v 1.4 2002/11/04 00:15:54 larsbj Exp $
**
** Implementation of QtTableView class
**
@ -12,6 +12,8 @@
**
**********************************************************************/
#include <config.h>
#include "qttableview.h"
#ifndef QT_NO_QTTABLEVIEW
#include "qscrollbar.h"

5
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,8 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyx_gui.C (start): adjust signature
(start): exchange magic integeres for defined values.
2002-10-31 Rob Lahaye <lahaye@snu.ac.kr>
* xformsImage.C (clip): fix crash caused by uint -> int nastiness.

8
src/frontends/xforms/lyx_gui.C
View File

@ -239,7 +239,7 @@ void lyx_gui::parse_lyxrc()
}
void lyx_gui::start(string const & batch, vector<string> files)
void lyx_gui::start(string const & batch, vector<string> const & files)
{
// initial geometry
int xpos = -1;
@ -247,19 +247,19 @@ void lyx_gui::start(string const & batch, vector<string> files)
unsigned int width = 690;
unsigned int height = 510;
static const int geometryBitmask =
int const geometryBitmask =
XParseGeometry(geometry,
&xpos, &ypos, &width, &height);
// if width is not set by geometry, check it against monitor width
if (!(geometryBitmask & 4)) {
if (!(geometryBitmask & WidthValue)) {
Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
if (WidthOfScreen(scr) - 8 < int(width))
width = WidthOfScreen(scr) - 8;
}
// if height is not set by geometry, check it against monitor height
if (!(geometryBitmask & 8)) {
if (!(geometryBitmask & HeightValue)) {
Screen * scr = ScreenOfDisplay(fl_get_display(), fl_screen);
if (HeightOfScreen(scr) - 24 < int(height))
height = HeightOfScreen(scr) - 24;

2
src/funcrequest.C
View File

@ -6,6 +6,8 @@
* \author André Pönitz
*/
#include <config.h>
#include "funcrequest.h"
#include "BufferView.h"
#include "lyxfunc.h" // only for setMessage()

4
src/graphics/ChangeLog
View File

@ -1,3 +1,7 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* GraphicsTypes.C: include config.h
2002-10-25 Angus Leeming <leeming@lyx.org>
* GraphicsConverter.C (Impl::converted)

3
src/graphics/GraphicsTypes.C
View File

@ -9,8 +9,11 @@
* Full author contact details available in file CREDITS
*/
#include <config.h>
#include "graphics/GraphicsTypes.h"
namespace grfx {
/// The translator between the Display enum and corresponding lyx string.

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* insetcommandparams.C: include config.h
2002-10-31 Rob Lahaye <lahaye@snu.ac.kr>
* insetgraphicsParams.C (Write): use lyx::float_equal.

2
src/insets/insetcommandparams.C
View File

@ -8,6 +8,8 @@
* Full author contact details are available in file CREDITS
*/
#include <config.h>
#ifdef __GNUG__
#pragma implementation
#endif

9
src/mathed/ChangeLog
View File

@ -1,3 +1,12 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* math_factory.C: add using std::endl
(math_font_available): use it
(initSymbols): use it
(createMathInset): use it
* math_cursor.C (MathCursor): reindent
2002-10-28 Dekel Tsur <dekelts@tau.ac.il>
* many files: Add support for Maxima.

1
src/mathed/math_cursor.C
View File

@ -1473,4 +1473,3 @@ void releaseMathCursor(BufferView * bv)
delete mathcursor;
mathcursor = 0;
}

34
src/mathed/math_factory.C
View File

@ -1,4 +1,3 @@
#ifdef __GNUG__
#pragma implementation
#endif
@ -56,6 +55,8 @@
bool has_math_fonts;
using std::endl;
namespace {
// file scope
@ -79,7 +80,8 @@ bool math_font_available(string & name)
}
lyxerr[Debug::MATHED]
<< "font " << name << " not available and I can't fake it\n";
<< "font " << name << " not available and I can't fake it"
<< endl;
return false;
}
@ -87,9 +89,9 @@ bool math_font_available(string & name)
void initSymbols()
{
string const filename = LibFileSearch(string(), "symbols");
lyxerr[Debug::MATHED] << "read symbols from " << filename << "\n";
lyxerr[Debug::MATHED] << "read symbols from " << filename << endl;
if (filename.empty()) {
lyxerr << "Could not find symbols file\n";
lyxerr << "Could not find symbols file" << endl;
return;
}
@ -134,9 +136,9 @@ void initSymbols()
else
is >> tmp.extra;
if (!is) {
lyxerr[Debug::MATHED] << "skipping line '" << line << "'\n";
lyxerr[Debug::MATHED] << "skipping line '" << line << "'" << endl;
lyxerr[Debug::MATHED]
<< tmp.name << ' ' << tmp.inset << ' ' << tmp.extra << "\n";
<< tmp.name << ' ' << tmp.inset << ' ' << tmp.extra << endl;
continue;
}
@ -144,39 +146,39 @@ void initSymbols()
// tmp.inset _is_ the fontname here.
// create fallbacks if necessary
if (tmp.extra=="func" || tmp.extra=="funclim" || tmp.extra=="special") {
lyxerr[Debug::MATHED] << "symbol abuse for " << tmp.name << "\n";
lyxerr[Debug::MATHED] << "symbol abuse for " << tmp.name << endl;
tmp.draw = tmp.name;
} else if (math_font_available(tmp.inset)) {
lyxerr[Debug::MATHED] << "symbol available for " << tmp.name << "\n";
lyxerr[Debug::MATHED] << "symbol available for " << tmp.name << endl;
tmp.draw += char(charid);
} else if (fallbackid) {
if (tmp.inset == "cmex")
tmp.inset = "lyxsymbol";
else
tmp.inset = "lyxboldsymbol";
lyxerr[Debug::MATHED] << "symbol fallback for " << tmp.name << "\n";
lyxerr[Debug::MATHED] << "symbol fallback for " << tmp.name << endl;
tmp.draw += char(fallbackid);
} else {
lyxerr[Debug::MATHED] << "faking " << tmp.name << "\n";
lyxerr[Debug::MATHED] << "faking " << tmp.name << endl;
tmp.draw = tmp.name;
tmp.inset = "lyxtex";
}
} else {
// it's a proper inset
lyxerr[Debug::MATHED] << "inset " << tmp.inset << " used for "
<< tmp.name << "\n";
<< tmp.name << endl;
}
if (theWordList.find(tmp.name) != theWordList.end())
lyxerr[Debug::MATHED] << "readSymbols: inset " << tmp.name
<< " already exists.\n";
<< " already exists." << endl;
else
theWordList[tmp.name] = tmp;
lyxerr[Debug::MATHED] << "read symbol '" << tmp.name
<< " inset: " << tmp.inset
<< " draw: " << int(tmp.draw[0])
<< " extra: " << tmp.extra
<< "'\n";
<< "'" << endl;
}
string tmp = "cmm";
string tmp2 = "cmsy";
@ -208,11 +210,11 @@ latexkeys const * in_word_set(string const & str)
MathAtom createMathInset(string const & s)
{
lyxerr[Debug::MATHED] << "creating inset with name: '" << s << "'\n";
lyxerr[Debug::MATHED] << "creating inset with name: '" << s << "'" << endl;
latexkeys const * l = in_word_set(s);
if (l) {
string const & inset = l->inset;
lyxerr[Debug::MATHED] << " found inset: '" << inset << "'\n";
lyxerr[Debug::MATHED] << " found inset: '" << inset << "'" << endl;
if (inset == "ref")
return MathAtom(new RefInset(l->name));
if (inset == "underset")
@ -283,6 +285,6 @@ MathAtom createMathInset(string const & s)
if (MathMacroTable::has(s))
return MathAtom(new MathMacro(s));
//lyxerr[Debug::MATHED] << "creating inset 2 with name: '" << s << "'\n";
//lyxerr[Debug::MATHED] << "creating inset 2 with name: '" << s << "'" << endl;
return MathAtom(new MathUnknownInset(s));
}

7
src/support/ChangeLog
View File

@ -1,3 +1,10 @@
2002-11-04 Lars Gullik Bjønnes <larsbj@gullik.net>
* os.C: include config.h
* lstrings.C (getVectorFromString): rewrite to use
boost::tokenizer
2002-10-31 Angus Leeming <leeming@lyx.org>
* forkedcall.C (generateChild): clean it up further.

8
src/support/lstrings.C
View File

@ -21,6 +21,7 @@
#include "debug.h"
#include <boost/regex.hpp>
#include <boost/tokenizer.hpp>
#include <algorithm>
@ -615,6 +616,7 @@ string const escape(string const & lab)
vector<string> const getVectorFromString(string const & str,
string const & delim)
{
#if 0
vector<string> vec;
if (str.empty())
return vec;
@ -632,8 +634,14 @@ vector<string> const getVectorFromString(string const & str,
keys = keys.substr(start);
}
return vec;
#else
boost::char_separator<char> sep(delim.c_str());
boost::tokenizer<boost::char_separator<char> > tokens(str, sep);
return vector<string>(tokens.begin(), tokens.end());
#endif
}
// the same vice versa
string const getStringFromVector(vector<string> const & vec,
string const & delim)

2
src/support/os.C
View File

@ -1,3 +1,5 @@
#include <config.h>
#ifdef __GNUG__
#pragma implementation
#endif

4
src/vc-backend.C
View File

@ -257,8 +257,8 @@ void CVS::scanMaster()
//sm[0]; // whole matched string
//sm[1]; // filename
version_ = sm[2];
string file_date = sm[3];
version_ = sm.str(2);
string file_date = sm.str(3);
//sm[4]; // options
//sm[5]; // tag or tagdate
FileInfo fi(file_);