From e39935204d98de595eac31642b420c71a4a048d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Sun, 28 Jul 2002 18:13:51 +0000 Subject: [PATCH] remove some unneeded version of functions from lstrings, some gcc 3.2. minor compile fixes. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4800 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 14 +++-- config/lyxinclude.m4 | 4 +- po/POTFILES.in | 1 - src/BufferView_pimpl.C | 1 + src/BufferView_pimpl.h | 11 ++-- src/ChangeLog | 22 +++++++- src/LaTeX.C | 4 +- src/PrinterParams.h | 2 +- src/buffer.C | 2 +- src/bufferparams.C | 2 +- src/exporter.C | 2 +- src/frontends/controllers/ChangeLog | 16 ++++-- src/frontends/controllers/biblio.C | 8 +-- src/frontends/qt2/lyx_gui.C | 44 +++++++-------- src/frontends/xforms/FormGraphics.C | 4 +- src/frontends/xforms/XMiniBuffer.h | 2 +- src/frontends/xforms/lyx_gui.C | 6 +- src/graphics/ChangeLog | 5 ++ src/graphics/PreviewLoader.C | 2 +- src/insets/ChangeLog | 46 +++++++++------- src/insets/insetbib.C | 10 ++-- src/insets/insetcite.C | 43 +++++++++------ src/insets/insetnote.C | 2 +- src/lyxfont.C | 3 +- src/lyxfunc.C | 16 +++--- src/lyxlength.C | 6 +- src/lyxserver.C | 4 +- src/mathed/ChangeLog | 10 +++- src/mathed/formula.C | 6 +- src/mathed/math_nestinset.C | 20 ++++--- src/support/ChangeLog | 22 ++++++-- src/support/filetools.C | 24 ++++---- src/support/lstrings.C | 85 +++++------------------------ src/support/lstrings.h | 36 ++---------- src/vc-backend.C | 6 +- 35 files changed, 236 insertions(+), 255 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 378dc53cdf..2429ffd297 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2002-07-28 Lars Gullik Bjønnes + + * lyxinclude.m4 (LYX_PROG_CXX): remove the double -Winline + 2002-07-17 Jean-Marc Lasgouttes * lyxinclude.m4 (LYX_SCO): @@ -13,7 +17,7 @@ 2002-06-20 John Levon * lyxinclude.m4: add -Wno-non-template-friend - + 2002-06-20 Jean-Marc Lasgouttes * pspell.m4: patch from Garst to help find pspell (bug 428) this @@ -22,7 +26,7 @@ 2002-06-19 John Levon * lyxinclude.m4: remove LYX_REGEX properly - + 2002-06-12 Angus Leeming * lyxinclude.m4 (LYX_STL_STRING_FWD): removed. @@ -34,14 +38,14 @@ 2002-06-12 John Levon - * qt2.m4: Qt frontend is for Qt 2 OR Qt 3 - + * qt2.m4: Qt frontend is for Qt 2 OR Qt 3 + 2002-06-07 Jean-Marc Lasgouttes * xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): complete rewrite. Now simpler and hopefully better. Please test. (LYX_PATH_XFORMS): move test for flimage.h in - LYX_USE_XFORMS_IMAGE_LOADER. + LYX_USE_XFORMS_IMAGE_LOADER. (LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG): killed. Now just a couple lines in LYX_USE_XFORMS_IMAGE_LOADER. diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 498f881ba2..172309f978 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -211,7 +211,7 @@ if test x$GXX = xyes; then 2.96*) CXXFLAGS="$lyx_opt -fno-exceptions -Wno-non-template-friend";; 3.0*) CXXFLAGS="$lyx_opt";; 3.1*) CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";; - 3.2*) CXXFLAGS="$lyx_opt";; + 3.2*) CXXFLAGS="$lyx_opt -fno-exceptions";; *) CXXFLAGS="$lyx_opt";; esac if test x$enable_debug = xyes ; then @@ -222,7 +222,7 @@ if test x$GXX = xyes; then case $gxx_version in 2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";; 2.96*) CXXFLAGS="$CXXFLAGS -W -Wall";; - 3.1*) CXXFLAGS="$CXXFLAGS -W -Wall -Winline";; + 3.1*) CXXFLAGS="$CXXFLAGS -W -Wall";; *) CXXFLAGS="$CXXFLAGS -W -Wall";; esac if test $lyx_devel_version = yes ; then diff --git a/po/POTFILES.in b/po/POTFILES.in index 532fdf1208..b6f49b1bd1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,7 +8,6 @@ src/converter.C src/CutAndPaste.C src/debug.C src/exporter.C -src/ext_l10n.h src/FloatList.C src/frontends/controllers/biblio.C src/frontends/controllers/ButtonController.h diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 78e5740e92..124408dd78 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -77,6 +77,7 @@ #include "support/lyxfunctional.h" #include +#include #include #include diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index bb42570883..429df7b067 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -30,7 +30,7 @@ class LyXView; class WorkArea; class LyXScreen; - + /// struct BufferView::Pimpl : public boost::signals::trackable { /// @@ -133,11 +133,12 @@ private: */ Box insetDimensions(LyXText const & text, LyXCursor const & cursor) const; /** - * check if the given co-ordinates are inside an inset at the given cursor, - * if one exists. If so, the inset is returned, and the co-ordinates are - * made relative. Otherwise, 0 is returned. + * check if the given co-ordinates are inside an inset at the + * given cursor, if one exists. If so, the inset is returned, + * and the co-ordinates are made relative. Otherwise, 0 is returned. */ - Inset * checkInset(LyXText const & text, LyXCursor const & cursor, int & x, int & y) const; + Inset * checkInset(LyXText const & text, LyXCursor const & cursor, + int & x, int & y) const; /// friend class BufferView; /// open and lock an updatable inset diff --git a/src/ChangeLog b/src/ChangeLog index 9569e3105f..4c27a3ef7a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,19 @@ +2002-07-28 Lars Gullik Bjønnes + + * PrinterParams.h: remove extern containsOnly, and include + support/lstrings.h instead. + + * LaTeX.C (scanAuxFile): modify because of strip changes + (deplog): ditto + * buffer.C (makeLaTeXFile): ditto + * bufferparams.C (writeFile): ditt + * lyxfont.C (stateText): ditto + * lyxserver.C (read_ready): ditto + * vc-backend.C (scanMaster): ditto + + * BufferView_pimpl.h: ws changes + + * BufferView_pimpl.C: inlude boost/signals/connection.hpp 2002-07-26 André Pönitz @@ -26,10 +42,10 @@ 2002-07-25 John Levon * MenuBackend.C: using std::max - + 2002-07-25 Jean-Marc Lasgouttes - * MenuBackend.C (expandToc): + * MenuBackend.C (expandToc): (expandToc2): code moved from xforms menu frontend. It is now generic and TOCs are transparent to menu frontends. @@ -83,7 +99,7 @@ * LyXAction.C: * commandtags.h: * lyxfunc.C: remove LFUN_ADD_TO_TOOLBAR - + 2002-07-22 John Levon * LyXAction.C: diff --git a/src/LaTeX.C b/src/LaTeX.C index b1817790ea..cf2f884fe9 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -430,7 +430,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) regex reg4("\\\\@input\\{([^}]+)\\}"); while (getline(ifs, token)) { - token = strip(token, '\r'); + token = strip(token, "\r"); smatch sub; if (regex_match(token, sub, reg1)) { string data = sub[1]; @@ -679,7 +679,7 @@ void LaTeX::deplog(DepTable & head) string foundfile; string token; getline(ifs, token); - token = strip(token, '\r'); + token = strip(token, "\r"); if (token.empty()) continue; smatch sub; diff --git a/src/PrinterParams.h b/src/PrinterParams.h index 71253ce75e..8b6150552f 100644 --- a/src/PrinterParams.h +++ b/src/PrinterParams.h @@ -18,8 +18,8 @@ #include "lyxrc.h" #ifdef ENABLE_ASSERTIONS +#include "support/lstrings.h" #include "support/LAssert.h" -extern bool containsOnly(string const &, char const *); #endif diff --git a/src/buffer.C b/src/buffer.C index 5b1d4c3625..2810843d66 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -2338,7 +2338,7 @@ void Buffer::makeLaTeXFile(ostream & os, string strOptions(options.str().c_str()); if (!strOptions.empty()) { - strOptions = strip(strOptions, ','); + strOptions = strip(strOptions, ","); os << '[' << strOptions << ']'; } diff --git a/src/bufferparams.C b/src/bufferparams.C index 0d73595781..504e9c9eed 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -81,7 +81,7 @@ void BufferParams::writeFile(ostream & os) const // then the the preamble if (!preamble.empty()) { // remove '\n' from the end of preamble - string const tmppreamble = strip(preamble, '\n'); + string const tmppreamble = strip(preamble, "\n"); os << "\\begin_preamble\n" << tmppreamble << "\n\\end_preamble\n"; diff --git a/src/exporter.C b/src/exporter.C index 898d6301a9..c82a0aa9b8 100644 --- a/src/exporter.C +++ b/src/exporter.C @@ -39,7 +39,7 @@ bool Exporter::Export(Buffer * buffer, string const & format, if (bv) { // Remove all error insets if (bv->removeAutoInsets()) { -#warning repaint() or update() or nothing ? +#warning repaint() or update() or nothing ? bv->repaint(); bv->fitCursor(); } diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index 7635b1b40f..c5529e938a 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2002-07-28 Lars Gullik Bjønnes + + * biblio.C (parseBibTeX): modify because of strip changes + 2002-07-24 Juergen Spitzmueller * ControlFloat.[Ch]: Implement Wide Float toggle @@ -6,7 +10,7 @@ 2002-07-22 Herbert Voss * ControlGraphics.C: small changes - + 2002-07-21 Jean-Marc Lasgouttes * ControlToc.C: remove getType @@ -14,26 +18,26 @@ 2002-07-20 John Levon * ControlCommandBuffer.C: don't add "" to history - + 2002-07-20 John Levon * ControlRef.C: fix dispatch call nicely - + 2002-07-19 John Levon * Makefile.am: * ControlCommandBuffer.h: * ControlCommandBuffer.C: add controller for command (mini) buffer handling - + 2002-07-19 John Levon * ControlRef.C: fix dispatch call - + 2002-07-17 John Levon * ControlCharacter.C: use view_state_changed not setState - + 2002-07-15 Jean-Marc Lasgouttes * biblio.C (parseBibTeX): use ascii_lowercase instead of lowercase diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C index 7ae01ac0fa..629e495c48 100644 --- a/src/frontends/controllers/biblio.C +++ b/src/frontends/controllers/biblio.C @@ -451,10 +451,10 @@ string const parseBibTeX(string data, string const & findkey) // Clean-up. // 1. Spaces - data = strip(data, ' '); + data = strip(data); // 2. if there is no opening '{' then a closing '{' is probably cruft. if (!contains(data, '{')) - data = strip(data, '}'); + data = strip(data, "}"); // happens, when last keyword string::size_type const idx = !data.empty() ? data.find('=') : string::npos; @@ -469,7 +469,7 @@ string const parseBibTeX(string data, string const & findkey) return string(); } else { // delete '=' and the following spaces - data = frontStrip(frontStrip(data,'=')); + data = frontStrip(frontStrip(data, "=")); if (data.length() < 2) { return data; // not long enough to find delimiters } else { @@ -482,7 +482,7 @@ string const parseBibTeX(string data, string const & findkey) } else { // no {} and no "", pure data but with a // possible ',' at the end - return strip(data,','); + return strip(data, ","); } string tmp = data.substr(keypos); while (tmp.find('{') != string::npos && diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C index 952edde402..b21382e0f2 100644 --- a/src/frontends/qt2/lyx_gui.C +++ b/src/frontends/qt2/lyx_gui.C @@ -8,21 +8,21 @@ */ #include - + #include "support/lyxlib.h" #include "support/os.h" #include "support/filetools.h" #include "debug.h" #include "gettext.h" - + #include #include - + #include "lyx_gui.h" #include "lyx_main.h" #include "lyxrc.h" #include "lyxfont.h" - + // FIXME: move this stuff out again #include "bufferlist.h" #include "lyxfunc.h" @@ -34,14 +34,14 @@ #include #include #include - + #include "QtView.h" #include "QLImage.h" #include "qfont_loader.h" -#include "io_callback.h" - +#include "io_callback.h" + #include - + #ifndef CXX_GLOBAL_CSTD using std::exit; #endif @@ -49,30 +49,30 @@ using std::exit; using std::vector; using std::hex; using std::endl; - + extern BufferList bufferlist; - + // FIXME: wrong place ! LyXServer * lyxserver; - + void lyx_gui::parse_init(int & argc, char * argv[]) { static QApplication a(argc, argv); - + using namespace grfx; Image::newImage = boost::bind(&QLImage::newImage); Image::loadableFormats = boost::bind(&QLImage::loadableFormats); } - + void lyx_gui::parse_lyxrc() { - // FIXME !!!! + // FIXME !!!! lyxrc.dpi = 95; } - + void lyx_gui::start(string const & batch, vector files) { // initial geometry @@ -80,17 +80,17 @@ void lyx_gui::start(string const & batch, vector files) int ypos = -1; unsigned int width = 690; unsigned int height = 510; - + QtView view(width, height); view.show(xpos, ypos, "LyX"); view.init(); Buffer * last = 0; - + // FIXME: some code below needs moving lyxserver = new LyXServer(view.getLyXFunc(), lyxrc.lyxpipes); - + vector::const_iterator cit = files.begin(); vector::const_iterator end = files.end(); for (; cit != end; ++cit) { @@ -111,18 +111,18 @@ void lyx_gui::start(string const & batch, vector files) } qApp->exec(); - + // FIXME delete lyxserver; } - - + + void lyx_gui::exit() { qApp->exit(0); } - + string const lyx_gui::hexname(LColor::color col) { QColor color(lcolor.getX11Name(col).c_str()); diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index 54f4454512..eb0fc4ce88 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -679,8 +679,8 @@ ButtonPolicy::SMInput FormGraphics::input(FL_OBJECT * ob, long) setEnabled(lyxview_->check_lyxaspectratio, 1); setEnabled(lyxview_->input_lyxscale, 0); } else if (ob == lyxview_->button_latex_values) { - if (contains(fl_get_choice_text(size_->choice_width),'%') || - contains(fl_get_choice_text(size_->choice_height),'%')) + if (contains(fl_get_choice_text(size_->choice_width), '%') || + contains(fl_get_choice_text(size_->choice_height), '%')) Alert::alert(_("Warning!"), _("The %-units are not allowed here."), _("Cannot use the values from LaTeX size!")); diff --git a/src/frontends/xforms/XMiniBuffer.h b/src/frontends/xforms/XMiniBuffer.h index 2d0bd6b144..a01fb692a1 100644 --- a/src/frontends/xforms/XMiniBuffer.h +++ b/src/frontends/xforms/XMiniBuffer.h @@ -34,7 +34,7 @@ public: /// ~XMiniBuffer(); - + /// create drop down void dd_init(); diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C index 01458e8e48..b424142506 100644 --- a/src/frontends/xforms/lyx_gui.C +++ b/src/frontends/xforms/lyx_gui.C @@ -155,7 +155,7 @@ void lyx_gui::parse_init(int & argc, char * argv[]) XSetErrorHandler(LyX_XErrHandler); lyxColorHandler.reset(new LyXColorHandler()); - + using namespace grfx; #ifdef USE_XFORMS_IMAGE_LOADER @@ -317,7 +317,7 @@ void lyx_gui::exit() finished = true; } - + string const lyx_gui::hexname(LColor::color col) { string const name = lcolor.getX11Name(col); @@ -367,7 +367,7 @@ namespace { extern "C" void C_read_callback(int, void * data) { - LyXComm * comm = static_cast(data); + LyXComm * comm = static_cast(data); comm->read_ready(); } diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index b6ef29dc1a..baccf95342 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,8 @@ +2002-07-28 Lars Gullik Bjønnes + + * PreviewLoader.C (setAscentFractions): modify because of strip + changes + 2002-07-22 Lars Gullik Bjønnes * GraphicsConverter.C (build_script): take a ostream as a more diff --git a/src/graphics/PreviewLoader.C b/src/graphics/PreviewLoader.C index 14eb559e3d..cea9a7f523 100644 --- a/src/graphics/PreviewLoader.C +++ b/src/graphics/PreviewLoader.C @@ -737,7 +737,7 @@ void setAscentFractions(vector & ascent_fractions, if (!ifs.good() || page != "%%Page" || - !isStrUnsignedInt(strip(page_id, ':'))) { + !isStrUnsignedInt(strip(page_id, ":"))) { lyxerr[Debug::GRAPHICS] << "setAscentFractions(" << metrics_file << ")\n" << "Error reading file!" diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 2222e9549b..032d120859 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,9 @@ +2002-07-28 Lars Gullik Bjønnes + + * insetbib.C (latex): modify because of strip changes + (getKeys): ditto + * insetnote.C (InsetNote): ditto + 2002-07-26 Juergen Vigna * insettabular.C (searchForward): check for lastcell if we @@ -12,13 +18,13 @@ 2002-07-25 Dekel Tsur * insetfloat.C (read, write): Allow default placement - (floatPlacement_ is empty). + (floatPlacement_ is empty). 2002-07-23 Jean-Marc Lasgouttes - * insetminipage.h (noFontChange): - * insettabular.h (noFontChange): - * insetfootlike.h (noFontChange): + * insetminipage.h (noFontChange): + * insettabular.h (noFontChange): + * insetfootlike.h (noFontChange): * insetfloat.h (noFontChange): return true * inset.h (noFontChange): new method, defaulting to false @@ -41,19 +47,19 @@ * insetgraphicsParams.h: do not include "lyxlex.h" and "buffer.h" - * insetquotes.C: - * insetlatexaccent.C: - * insetgraphics.C: - * insetexternal.C: - * insetert.C: + * insetquotes.C: + * insetlatexaccent.C: + * insetgraphics.C: + * insetexternal.C: + * insetert.C: * insetbib.C: #include "lyxlex.h" - * insetinclude.C: - * insetfloat.C: - * insetert.C: - * insetbib.C: + * insetinclude.C: + * insetfloat.C: + * insetert.C: + * insetbib.C: * insettext.C: use BufferParams::getLyXTextClass - + * insetfloat.C (addToToc): new method. Add to toclist the entries corresponding to Caption layouts @@ -66,7 +72,7 @@ 2002-07-21 Jean-Marc Lasgouttes - * insettoc.C (ascii): + * insettoc.C (ascii): * insetfloatlist.C (ascii): change to use the new Toc functions instead of stuff that was in Buffer @@ -80,7 +86,7 @@ * insetgraphicsParams.C (as_grfxParams): use the new keepLyXAspectRatio parameter. Note that this is an adaptation of a 1.2.0 patch, and I do not really know how to adapt it to the new - grfx::Cache world. Angus, please could you have a look? + grfx::Cache world. Angus, please could you have a look? 2002-05-01 Herbert Voss @@ -101,7 +107,7 @@ 2002-07-17 John Levon * insettext.C: use view_state_changed, switchKeyMap - + 2002-07-17 Herbert Voss * insetgraphics.C (prepareFile): keep the extension when @@ -109,13 +115,13 @@ 2002-07-15 Jean-Marc Lasgouttes - * insetcite.C (getNatbibLabel): + * insetcite.C (getNatbibLabel): * insetbib.C (getKeys): use ascii_lowercase instead of lowercase 2002-07-15 John Levon * insetgraphics.C: use ->isDrawable() - + 2002-07-12 Angus Leeming * insetgraphics.C: use the new smart loading capabilities of the image @@ -124,7 +130,7 @@ 2002-07-13 Dekel Tsur * insettabular.C (edit): Move into correct cell when entering a - tabular in + tabular in * insettext.C (unlockInsetInInset): Correct cursor behaviour for RTL paragraphs. diff --git a/src/insets/insetbib.C b/src/insets/insetbib.C index 1525c4d274..738e4ecd92 100644 --- a/src/insets/insetbib.C +++ b/src/insets/insetbib.C @@ -152,10 +152,10 @@ int InsetBibtex::latex(Buffer const * buffer, ostream & os, // Style-Options string style = getOptions(); // maybe empty! and with bibtotoc string bibtotoc; - if (prefixIs(style,"bibtotoc")) { + if (prefixIs(style, "bibtotoc")) { bibtotoc = "bibtotoc"; - if (contains(style,',')) { - style = split(style,bibtotoc,','); + if (contains(style, ',')) { + style = split(style, bibtotoc, ','); } } @@ -206,7 +206,7 @@ int InsetBibtex::latex(Buffer const * buffer, ostream & os, db_out += ','; db_in= split(db_in, adb,','); } - db_out = strip(db_out, ','); + db_out = strip(db_out, ","); os << "\\bibliography{" << db_out << "}\n"; return 2; } @@ -264,7 +264,7 @@ vector > const InsetBibtex::getKeys(Buffer const * buffer) && !prefixIs(tmp, "@preamble")) { linebuf = split(linebuf, tmp, ','); tmp = frontStrip(tmp); - tmp = frontStrip(tmp,'\t'); + tmp = frontStrip(tmp,"\t"); if (!tmp.empty()) { keys.push_back(pair(tmp,string())); } diff --git a/src/insets/insetcite.C b/src/insets/insetcite.C index ecd9aa7705..f4a5f41bb8 100644 --- a/src/insets/insetcite.C +++ b/src/insets/insetcite.C @@ -44,7 +44,7 @@ namespace { // reload the bibkey list std::map loading_buffer; -string const getNatbibLabel(Buffer const * buffer, +string const getNatbibLabel(Buffer const * buffer, string const & citeType, string const & keyList, string const & before, string const & after, bool numerical) @@ -66,7 +66,7 @@ string const getNatbibLabel(Buffer const * buffer, InfoType::const_iterator bit = bibkeys.begin(); InfoType::const_iterator bend = bibkeys.end(); - + biblio::InfoMap infomap; for (; bit != bend; ++bit) { infomap[bit->first] = bit->second; @@ -76,7 +76,7 @@ string const getNatbibLabel(Buffer const * buffer, cached_keys[buffer] = infomap; } - + biblio::InfoMap infomap = cached_keys[buffer]; // the natbib citation-styles @@ -90,12 +90,12 @@ string const getNatbibLabel(Buffer const * buffer, // We don't currently use the full or forceUCase fields. // bool const forceUCase = citeType[0] == 'C'; - bool const full = citeType[citeType.size()-1] == '*'; + bool const full = citeType[citeType.size() - 1] == '*'; string const cite_type = full ? - ascii_lowercase(citeType.substr(0,citeType.size()-1)) : + ascii_lowercase(citeType.substr(0, citeType.size() - 1)) : ascii_lowercase(citeType); - + string before_str; if (!before.empty()) { // In CITET and CITEALT mode, the "before" string is @@ -106,7 +106,7 @@ string const getNatbibLabel(Buffer const * buffer, if (cite_type == "citet" || cite_type == "citealt" || cite_type == "citep" || - cite_type == "citealp" || + cite_type == "citealp" || cite_type == "citeyearpar") before_str = before + ' '; } @@ -120,17 +120,18 @@ string const getNatbibLabel(Buffer const * buffer, // One day, these might be tunable (as they are in BibTeX). char const op = '('; // opening parenthesis. char const cp = ')'; // closing parenthesis. - char const sep = ';'; // puctuation mark separating citation entries. + // puctuation mark separating citation entries. + char const * const sep = ";"; string const op_str(string(1, ' ') + string(1, op)); string const cp_str(string(1, cp) + string(1, ' ')); - string const sep_str(string(1, sep) + string(1, ' ')); + string const sep_str(string(sep) + " "); string label; vector keys = getVectorFromString(keyList); vector::const_iterator it = keys.begin(); vector::const_iterator end = keys.end(); - for (; it != end; ++it) { + for (; it != end; ++it) { // get the bibdata corresponding to the key string const author(biblio::getAbbreviatedAuthor(infomap, *it)); string const year(biblio::getYear(infomap, *it)); @@ -176,7 +177,7 @@ string const getNatbibLabel(Buffer const * buffer, if (!after_str.empty()) { if (cite_type == "citet") { // insert "after" before last ')' - label.insert(label.size()-1, after_str); + label.insert(label.size() - 1, after_str); } else { bool const add = !(numerical && (cite_type == "citeauthor" || @@ -187,7 +188,7 @@ string const getNatbibLabel(Buffer const * buffer, } if (!before_str.empty() && (cite_type == "citep" || - cite_type == "citealp" || + cite_type == "citealp" || cite_type == "citeyearpar")) { label = before_str + label; } @@ -217,7 +218,7 @@ string const getBasicLabel(string const & keyList, string const & after) if (!after.empty()) label += ", " + after; - + return "[" + label + "]"; } @@ -248,7 +249,7 @@ string const InsetCitation::generateLabel(Buffer const * buffer) const else cmd = "citet"; } - label = getNatbibLabel(buffer, cmd, getContents(), + label = getNatbibLabel(buffer, cmd, getContents(), before, after, buffer->params.use_numerical_citations); } @@ -350,14 +351,24 @@ int InsetCitation::latex(Buffer const * buffer, ostream & os, os << getCmdName(); else os << "cite"; - + +#warning What is this code supposed to do? (Lgb) + +#if 1 + // The current strange code + string const before = string(); string const after = getOptions(); if (!before.empty() && buffer->params.use_natbib) os << "[" << before << "][" << after << "]"; else if (!after.empty()) os << "[" << after << "]"; - +#else + // and the cleaned up equvalent, should it just be changed? (Lgb) + string const after = getOptions(); + if (!after.empty()) + os << "[" << after << "]"; +#endif string::const_iterator it = getContents().begin(); string::const_iterator end = getContents().end(); // Paranoia check: make sure that there is no whitespace in here diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C index 21c1e9770f..b060e91901 100644 --- a/src/insets/insetnote.C +++ b/src/insets/insetnote.C @@ -77,7 +77,7 @@ InsetNote::InsetNote(Buffer const * buf, string const & contents, font.setLanguage(default_language); lyx::pos_type pos = 0; - buf->insertStringAsLines(par, pos, font, strip(contents, '\n')); + buf->insertStringAsLines(par, pos, font, strip(contents, "\n")); } diff --git a/src/lyxfont.C b/src/lyxfont.C index 362253b678..e684207226 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -571,8 +571,7 @@ string const LyXFont::stateText(BufferParams * params) const ost << _(" Number ") << _(GUIMiscNames[number()]); string buf(ost.str().c_str()); - buf = strip(buf, ' '); - buf = strip(buf, ','); + buf = strip(buf, ", "); return buf; } diff --git a/src/lyxfunc.C b/src/lyxfunc.C index 26344401ad..9856b6331a 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -684,7 +684,7 @@ FuncStatus LyXFunc::getStatus(kb_action action, if (action == LFUN_SEQUENCE) { // argument contains ';'-terminated commands const int ac = lyxaction.LookupFunc(token(argument, ';', 0)); - flag = getStatus(ac); + flag = getStatus(ac); } return flag; @@ -1284,7 +1284,7 @@ void LyXFunc::dispatch(kb_action action, string argument, bool verbose) owner->view()->setCursorFromRow(row); owner->view()->center(); - // see BufferView_pimpl::center() + // see BufferView_pimpl::center() owner->view()->updateScrollbar(); } break; @@ -1316,7 +1316,7 @@ void LyXFunc::dispatch(kb_action action, string argument, bool verbose) owner->view_state_changed(); owner->view()->center(); - // see BufferView_pimpl::center() + // see BufferView_pimpl::center() owner->view()->updateScrollbar(); } break; @@ -1531,18 +1531,18 @@ void LyXFunc::sendDispatchMessage(string const & msg, kb_action action, string c { owner->updateMenubar(); owner->updateToolbar(); - + if (action == LFUN_SELFINSERT || !verbose) { lyxerr[Debug::ACTION] << "dispatch msg is " << msg << endl; if (!msg.empty()) owner->message(msg); return; } - + string dispatch_msg(msg); if (!dispatch_msg.empty()) dispatch_msg += " "; - + string comname = lyxaction.getActionName(action); int pseudoaction = action; @@ -1578,7 +1578,7 @@ void LyXFunc::sendDispatchMessage(string const & msg, kb_action action, string c owner->message(dispatch_msg); } - + void LyXFunc::setupLocalKeymap() { keyseq.stdmap = keyseq.curmap = toplevel_keymap.get(); @@ -1863,6 +1863,6 @@ string const LyXFunc::view_status_message() if (!owner->view()->available()) return _("Welcome to LyX!"); - + return currentState(owner->view()); } diff --git a/src/lyxlength.C b/src/lyxlength.C index fea213df89..af8d8734e8 100644 --- a/src/lyxlength.C +++ b/src/lyxlength.C @@ -37,15 +37,15 @@ LyXLength::LyXLength(double v, LyXLength::UNIT u) #ifndef NO_PEXTRA_REALLY -// compatibility stuff < version 1.2.0pre and for +// compatibility stuff < version 1.2.0pre and for // "old" 1.2.0 files before the pre namespace { -string const convertOldRelLength(string const & oldLength) +string const convertOldRelLength(string const & oldLength) { // we can have only one or none of the following if (oldLength.find("c%") != string::npos) { return subst(oldLength,"c%","col%"); - + } else if (oldLength.find("t%") != string::npos) { if (oldLength.find("text%") != string::npos || oldLength.find("height%") != string::npos) diff --git a/src/lyxserver.C b/src/lyxserver.C index db90e46190..ed4948919c 100644 --- a/src/lyxserver.C +++ b/src/lyxserver.C @@ -270,7 +270,7 @@ void LyXComm::read_ready() while ((status = read(infd, charbuf, CMDBUFLEN-1))) { if (status > 0) { charbuf[status]= '\0'; // turn it into a c string - lsbuf += strip(charbuf, '\r'); + lsbuf += strip(charbuf, "\r"); // commit any commands read while (lsbuf.find('\n') != string::npos) { // split() grabs the entire string if @@ -474,7 +474,7 @@ void LyXServer::callback(LyXServer * serv, string const & msg) serv->func->dispatch(cmd + ' ' + arg); string const rval = serv->func->getMessage(); - + //modified june 1999 stefano@zool.su.se: //all commands produce an INFO or ERROR message //in the output pipe, even if they do not return diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 306f2f372d..671a420d53 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,7 @@ +2002-07-28 Lars Gullik Bjønnes + + * math_nestinset.C: add using std::vector + 2002-07-23 Angus Leeming * formula.C (descent): add an arbitrary 12 pixels to the descent when @@ -26,17 +30,17 @@ 2002-07-12 Angus Leeming * formula.C: use the new smart loading capabilities of the image - loader. + loader. 2002-07-14 John Levon * mathformula.C: use Lsstream.h not sstream - + 2002-07-12 John Levon * math_support.C: * math_factory.C: use lyx_gui::font_available() - + 2002-07-09 Angus Leeming * math_braceinset.h: diff --git a/src/mathed/formula.C b/src/mathed/formula.C index d2c32a2e49..8f6ee33d0f 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -78,7 +78,7 @@ struct InsetFormula::PreviewImpl : public boost::signals::trackable { * signal. */ void previewReady(grfx::PreviewImage const &); - + /// A helper method. string const latexString() const; @@ -102,8 +102,8 @@ InsetFormula::InsetFormula() InsetFormula::InsetFormula(InsetFormula const & other) - : InsetFormulaBase(other), - par_(other.par_), + : InsetFormulaBase(other), + par_(other.par_), preview_(new PreviewImpl(*this)) {} diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C index dd328b8312..639553660b 100644 --- a/src/mathed/math_nestinset.C +++ b/src/mathed/math_nestinset.C @@ -12,6 +12,8 @@ #include "graphics/PreviewLoader.h" #include "graphics/Previews.h" +using std::vector; + MathNestInset::MathNestInset(idx_type nargs) : MathDimInset(), cells_(nargs), lock_(false) @@ -212,10 +214,10 @@ void MathNestInset::drawMarkers(MathPainterInfo & pi, int x, int y) const return; int t = x + width() - 1; int d = y + descent(); - pi.pain.line(x, d - 3, x, d, LColor::mathframe); - pi.pain.line(t, d - 3, t, d, LColor::mathframe); - pi.pain.line(x, d, x + 3, d, LColor::mathframe); - pi.pain.line(t - 2, d, t, d, LColor::mathframe); + pi.pain.line(x, d - 3, x, d, LColor::mathframe); + pi.pain.line(t, d - 3, t, d, LColor::mathframe); + pi.pain.line(x, d, x + 3, d, LColor::mathframe); + pi.pain.line(t - 2, d, t, d, LColor::mathframe); } @@ -223,13 +225,13 @@ void MathNestInset::drawMarkers2(MathPainterInfo & pi, int x, int y) const { if (!editing()) return; - drawMarkers(pi, x, y); + drawMarkers(pi, x, y); int t = x + width() - 1; int a = y - ascent(); - pi.pain.line(x, a + 3, x, a, LColor::mathframe); - pi.pain.line(t, a + 3, t, a, LColor::mathframe); - pi.pain.line(x, a, x + 3, a, LColor::mathframe); - pi.pain.line(t - 2, a, t, a, LColor::mathframe); + pi.pain.line(x, a + 3, x, a, LColor::mathframe); + pi.pain.line(t, a + 3, t, a, LColor::mathframe); + pi.pain.line(x, a, x + 3, a, LColor::mathframe); + pi.pain.line(t - 2, a, t, a, LColor::mathframe); } diff --git a/src/support/ChangeLog b/src/support/ChangeLog index 7785c10a8d..c499c11ed3 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,17 @@ +2002-07-28 Lars Gullik Bjønnes + + * filetools.C (GetEnvPath): modify because of strip changes + (createDirectory): ditto + (findtexfile): ditto + * lstrings.[Ch] (isStrInt): ditto + (isStrUnsignedInt): ditto + (strToInt): ditto + (strToUnsignedInt): ditto + (isStrDbl): ditto + (contains): removed unneeded version of contains + (containsOnly): removed uneeded versions of containsOnly + (strip, frontStrip): removed unneded versions, changed argument types. + 2002-07-22 Dekel Tsur * filetools.C (RunCommand): Made public @@ -5,7 +19,7 @@ 2002-07-22 John Levon * limited_stack.h: fix comment, remove un-needed header - + 2002-07-21 Jean-Marc Lasgouttes * lstrings.h: correct comments for token and tokenPos @@ -37,7 +51,7 @@ (IsSGMLFilename): use ascii_lowercase instead of lowercase * lstrings.[Ch] (ascii_lowercase): new function - + 2002-07-16 André Pönitz * FileInfo.Ch: remove unneeded code @@ -46,7 +60,7 @@ * filetools.[C] (readExtFromContents): add support for (x)fig format images - + 2002-06-26 André Pönitz * filetools.[Ch]: small whitespace, more compact 'return' statement @@ -60,7 +74,7 @@ * filetools.[C]: (readBB_from_PSFile) add a helperfunc (readBB_lyxerrMessage) to get better lyxerr messages (getExtFromContents) test epsi files in the right way - + * DestroxLyXTmpDir.C: changed to true, to delete the temporary unzipped files, too. diff --git a/src/support/filetools.C b/src/support/filetools.C index a63806850f..1a8fc16363 100644 --- a/src/support/filetools.C +++ b/src/support/filetools.C @@ -364,7 +364,7 @@ string const GetEnvPath(string const & name) #else string const pathlist = os::slashify_path(GetEnv(name)); #endif - return strip(pathlist, ';'); + return strip(pathlist, ";"); } @@ -554,17 +554,17 @@ string const CreateLyXTmpDir(string const & deflt) } -// FIXME: no need for separate method like this ... +// FIXME: no need for separate method like this ... int DestroyLyXTmpDir(string const & tmpdir) { - return DestroyTmpDir(tmpdir, true); + return DestroyTmpDir(tmpdir, true); } // Creates directory. Returns true if succesfull bool createDirectory(string const & path, int permission) { - string temp(strip(os::slashify_path(path), '/')); + string temp(strip(os::slashify_path(path), "/")); if (temp.empty()) { Alert::alert(_("Internal error!"), @@ -1022,7 +1022,7 @@ string const getExtFromContents(string const & filename) if (filename.empty() || !IsFileReadable(filename)) return string(); - + ifstream ifs(filename.c_str()); if (!ifs) // Couldn't open file... @@ -1139,7 +1139,7 @@ string const getExtFromContents(string const & filename) else if (contains(str,"%!PS-Adobe")) { // eps or ps ifs >> str; - if (contains(str,"EPSF")) + if (contains(str,"EPSF")) format = "eps"; else format = "ps"; @@ -1352,10 +1352,10 @@ string const findtexfile(string const & fil, string const & /*format*/) cmd_ret const c = RunCommand(kpsecmd); lyxerr[Debug::LATEX] << "kpse status = " << c.first << "\n" - << "kpse result = `" << strip(c.second, '\n') + << "kpse result = `" << strip(c.second, "\n") << "'" << endl; if (c.first != -1) - return os::internal_path(strip(strip(c.second, '\n'), '\r')); + return os::internal_path(strip(strip(c.second, "\n"), "\r")); else return string(); } @@ -1376,10 +1376,10 @@ void removeAutosaveFile(string const & filename) } -void readBB_lyxerrMessage(string const & file, bool & zipped, - string const & message) +void readBB_lyxerrMessage(string const & file, bool & zipped, + string const & message) { - lyxerr[Debug::GRAPHICS] << "[readBB_from_PSFile] " + lyxerr[Debug::GRAPHICS] << "[readBB_from_PSFile] " << message << std::endl; if (zipped) lyx::unlink(file); @@ -1401,7 +1401,7 @@ string const readBB_from_PSFile(string const & file) string const format = getExtFromContents(file_); if (format != "eps" && format != "ps") { - readBB_lyxerrMessage(file_, zipped,"no(e)ps-format"); + readBB_lyxerrMessage(file_, zipped,"no(e)ps-format"); return string(); } diff --git a/src/support/lstrings.C b/src/support/lstrings.C index d5af3d18c1..71efb39559 100644 --- a/src/support/lstrings.C +++ b/src/support/lstrings.C @@ -120,7 +120,7 @@ bool isStrInt(string const & str) if (str.empty()) return false; // Remove leading and trailing white space chars. - string const tmpstr = frontStrip(strip(str, ' '), ' '); + string const tmpstr = frontStrip(strip(str)); if (tmpstr.empty()) return false; string::const_iterator cit = tmpstr.begin(); @@ -138,7 +138,7 @@ bool isStrUnsignedInt(string const & str) if (str.empty()) return false; // Remove leading and trailing white space chars. - string const tmpstr = frontStrip(strip(str, ' '), ' '); + string const tmpstr = frontStrip(strip(str)); if (tmpstr.empty()) return false; string::const_iterator cit = tmpstr.begin(); @@ -154,7 +154,7 @@ int strToInt(string const & str) { if (isStrInt(str)) { // Remove leading and trailing white space chars. - string const tmpstr = frontStrip(strip(str, ' '), ' '); + string const tmpstr = frontStrip(strip(str)); // Do the conversion proper. return lyx::atoi(tmpstr); } else { @@ -167,7 +167,7 @@ unsigned int strToUnsignedInt(string const & str) { if (isStrUnsignedInt(str)) { // Remove leading and trailing white space chars. - string const tmpstr = frontStrip(strip(str, ' '), ' '); + string const tmpstr = frontStrip(strip(str)); // Do the conversion proper. return lyx::atoi(tmpstr); } else { @@ -181,7 +181,7 @@ bool isStrDbl(string const & str) if (str.empty()) return false; // Remove leading and trailing white space chars. - string const tmpstr = frontStrip(strip(str, ' '), ' '); + string const tmpstr = frontStrip(strip(str)); if (tmpstr.empty()) return false; // if (1 < tmpstr.count('.')) return false; @@ -210,7 +210,7 @@ double strToDbl(string const & str) { if (isStrDbl(str)) { // Remove leading and trailing white space chars. - string const tmpstr = frontStrip(strip(str, ' '), ' '); + string const tmpstr = frontStrip(strip(str)); // Do the conversion proper. return ::atof(tmpstr.c_str()); } else { @@ -371,22 +371,6 @@ bool suffixIs(string const & a, string const & suf) } -bool contains(char const * a, string const & b) -{ - lyx::Assert(a); - string const at(a); - return contains(at, b); -} - - -bool contains(string const & a, char const * b) -{ - lyx::Assert(b); - string const bt(b); - return contains(a, bt); -} - - bool contains(string const & a, string const & b) { if (a.empty()) @@ -403,45 +387,12 @@ bool contains(string const & a, char b) } -bool contains(char const * a, char const * b) -{ - lyx::Assert(a && b); - string const at(a); - string const bt(b); - return contains(at, bt); -} - - -bool containsOnly(string const & s, char const * cset) -{ - lyx::Assert(cset); - - return s.find_first_not_of(cset) == string::npos; -} - - bool containsOnly(string const & s, string const & cset) { return s.find_first_not_of(cset) == string::npos; } -bool containsOnly(char const * s, char const * cset) -{ - lyx::Assert(s && cset); - - return string(s).find_first_not_of(cset) == string::npos; -} - - -bool containsOnly(char const * s, string const & cset) -{ - lyx::Assert(s); - - return string(s).find_first_not_of(cset) == string::npos; -} - - // ale970405+lasgoutt-970425 // rewritten to use new string (Lgb) string const token(string const & a, char delim, int n) @@ -543,23 +494,26 @@ string const subst(string const & a, } -string const strip(string const & a, char c) +string const strip(string const & a, char const * p) { - if (a.empty()) return a; + lyx::Assert(p); + + if (a.empty() || !*p) return a; string tmp(a); - string::size_type i = tmp.find_last_not_of(c); + string::size_type i = tmp.find_last_not_of(p); if (i == a.length() - 1) return tmp; // no c's at end of a if (i != string::npos) tmp.erase(i + 1, string::npos); #if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD) + // Ok This code is now suspect... (Lgb) /// Needed for broken string::find_last_not_of - else if (tmp[0] != c) { + else if (tmp[0] != p[0]) { if (a.length() == 1) return tmp; tmp.erase(1, string::npos); } #endif else - tmp.erase(); // only c in the whole string + tmp.erase(); // only chars from p in the whole string return tmp; } @@ -577,17 +531,6 @@ string const frontStrip(string const & a, char const * p) } -string const frontStrip(string const & a, char c) -{ - if (a.empty()) return a; - string tmp(a); - string::size_type i = tmp.find_first_not_of(c); - if (i > 0) - tmp.erase(0, i); - return tmp; -} - - string const split(string const & a, string & piece, char delim) { string tmp; diff --git a/src/support/lstrings.h b/src/support/lstrings.h index e20d0d80e5..f47d592c83 100644 --- a/src/support/lstrings.h +++ b/src/support/lstrings.h @@ -16,9 +16,6 @@ #pragma interface #endif -//#include -//#include -//#include #include #include "Lsstream.h" @@ -134,21 +131,12 @@ bool suffixIs(string const &, char const *); /// Does the string end with this suffix? bool suffixIs(string const &, string const &); -/// -bool contains(char const * a, string const & b); - -/// -bool contains(string const & a, char const * b); - /// bool contains(string const & a, string const & b); /// bool contains(string const & a, char b); -/// -bool contains(char const * a, char const * b); - /// This should probably we rewritten to be more general. class contains_functor { public: @@ -162,18 +150,9 @@ public: }; -/// -bool containsOnly(string const &, char const *); - /// bool containsOnly(string const &, string const &); -/// -bool containsOnly(char const *, char const *); - -/// -bool containsOnly(char const *, string const &); - /** Extracts a token from this string at the nth delim. Doesn't modify the original string. Similar to strtok. Example: @@ -215,24 +194,17 @@ string const subst(string const & a, /** Strips characters off the end of a string. \code - "abccc".strip('c') = "ab". + strip("abccc", "c") == "ab". \endcode */ -string const strip(string const & a, char c = ' '); - -/** Strips characters of the beginning of a string. - \code - "cccba".frontstrip('c') = "ba" - \endcode -*/ -string const frontStrip(string const & a, char c = ' '); +string const strip(string const & a, char const * p = " "); /** Strips characters off the beginning of a string. \code - "ababcdef".frontstrip("ab") = "cdef" + frontstrip("ababcdef", "ab") = "cdef" \endcode */ -string const frontStrip(string const & a, char const * p); +string const frontStrip(string const & a, char const * p = " "); /** Splits the string by the first delim. Splits the string by the first appearance of delim. diff --git a/src/vc-backend.C b/src/vc-backend.C index 671afdd36c..a998ac85c4 100644 --- a/src/vc-backend.C +++ b/src/vc-backend.C @@ -107,7 +107,7 @@ void RCS::scanMaster() // get version here string tmv; ifs >> tmv; - tmv = strip(tmv, ';'); + tmv = strip(tmv, ";"); version_ = tmv; lyxerr[Debug::LYXVC] << "LyXVC: version found to be " << tmv << endl; @@ -127,7 +127,7 @@ void RCS::scanMaster() string s2; do { ifs >> tmpt; - s1 = strip(tmpt, ';'); + s1 = strip(tmpt, ";"); // tmp is now in the format : s1 = split(s1, s2, ':'); // s2 is user, and s1 is version @@ -265,7 +265,7 @@ void CVS::scanMaster() FileInfo fi(file_); // FIXME: must double check file is stattable/existing time_t mod = fi.getModificationTime(); - string mod_date = strip(asctime(gmtime(&mod)), '\n'); + string mod_date = strip(asctime(gmtime(&mod)), "\n"); lyxerr[Debug::LYXVC] << "Date in Entries: `" << file_date << "'\nModification date of file: `"