From f717cb6b22da066023e94ba6e8f40a66f53c5b42 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 12 Jan 2005 10:30:46 +0000 Subject: [PATCH] Get rid of extraneous whitespace. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9466 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView.h | 2 +- src/BufferView_pimpl.h | 2 +- src/coordcache.C | 6 +++--- src/frontends/ChangeLog | 2 +- src/frontends/qt2/qfont_metrics.C | 4 ++-- src/insets/insetgraphics.C | 4 ++-- src/insets/insetgraphicsParams.C | 2 +- src/lyx_main.C | 8 ++++---- src/support/ChangeLog | 2 +- src/tex2lyx/tex2lyx.C | 2 +- src/undo.C | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/BufferView.h b/src/BufferView.h index 8f18a25a38..130a263218 100644 --- a/src/BufferView.h +++ b/src/BufferView.h @@ -79,7 +79,7 @@ public: /** perform pending painting updates. \c fitcursor means first * to do a fitcursor, and to force an update if screen * position changes. \c forceupdate means to force an update - * in any case. + * in any case. */ void update(bool fitcursor = true, bool forceupdate = true); /// move the screen to fit the cursor. Only to be called with diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h index 815d9c6918..8f1b515bf0 100644 --- a/src/BufferView_pimpl.h +++ b/src/BufferView_pimpl.h @@ -56,7 +56,7 @@ struct BufferView::Pimpl : public boost::signals::trackable { void setBuffer(Buffer * buf); /// void resizeCurrentBuffer(); - // + // bool fitCursor(); /// void update(bool fitcursor = false, bool forceupdate = true); diff --git a/src/coordcache.C b/src/coordcache.C index ce01948905..d252fb0ee0 100644 --- a/src/coordcache.C +++ b/src/coordcache.C @@ -11,7 +11,7 @@ CoordCache theCoords; - + // just a helper to be able to set a breakpoint void lyxbreaker(void const * data, const char * hint, int size) { @@ -23,7 +23,7 @@ void lyxbreaker(void const * data, const char * hint, int size) void lyxaborter(int x, int y) { - lyxerr << "abort on x: " << x << " y: " << y << std::endl; + lyxerr << "abort on x: " << x << " y: " << y << std::endl; BOOST_ASSERT(false); } @@ -36,7 +36,7 @@ void CoordCache::clear() } -Point CoordCache::get(LyXText const * text, lyx::pit_type pit) +Point CoordCache::get(LyXText const * text, lyx::pit_type pit) { ParPosCache::iterator const it = pars_.find(text); BOOST_ASSERT(it != pars_.end()); diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index 9b44a18711..f6941bdc93 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -9,7 +9,7 @@ 2004-11-26 Alfredo Braunstein - * Painter.C: adjust + * Painter.C: adjust * screen.[Ch] (fitCursor): remove, (showCursor): adjust, (redraw): adjust diff --git a/src/frontends/qt2/qfont_metrics.C b/src/frontends/qt2/qfont_metrics.C index 95bf579857..5faadd1efc 100644 --- a/src/frontends/qt2/qfont_metrics.C +++ b/src/frontends/qt2/qfont_metrics.C @@ -66,7 +66,7 @@ int ascent(char c, LyXFont const & f) return 1; QRect const & r = metrics(f).boundingRect(c); // Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y - // value by the height: (x, -y-height, width, height). + // value by the height: (x, -y-height, width, height). // Other versions return: (x, -y, width, height) #if defined(Q_WS_WIN) && (QT_VERSION == 0x030201) return -(r.top() + r.height()); @@ -82,7 +82,7 @@ int descent(char c, LyXFont const & f) return 1; QRect const & r = metrics(f).boundingRect(c); // Qt/Win 3.2.1nc (at least) corrects the GetGlyphOutlineA|W y - // value by the height: (x, -y-height, width, height). + // value by the height: (x, -y-height, width, height). // Other versions return: (x, -y, width, height) #if defined(Q_WS_WIN) && (QT_VERSION == 0x030201) return r.bottom() + r.height() + 1; diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index d393a8f4a7..b33f48954b 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -316,7 +316,7 @@ string const InsetGraphics::createLatexOptions() const // Make sure rotation angle is not very close to zero; // a float can be effectively zero but not exactly zero. - if (!params().rotateAngle.empty() + if (!params().rotateAngle.empty() && !float_equal(strToDbl(params().rotateAngle), 0.0, 0.001)) { options << " angle=" << params().rotateAngle << ",\n"; if (!params().rotateOrigin.empty()) { @@ -409,7 +409,7 @@ string const InsetGraphics::createDocBookAttributes() const double const scl = strToDbl(params().scale); if (!params().scale.empty() && !float_equal(scl, 0.0, 0.05)) { if (!float_equal(scl, 100.0, 0.05)) - options << " scale=\"" + options << " scale=\"" << static_cast( (scl) + 0.5 ) << "\" "; } else { diff --git a/src/insets/insetgraphicsParams.C b/src/insets/insetgraphicsParams.C index 22ef15bf38..8e0496ef34 100644 --- a/src/insets/insetgraphicsParams.C +++ b/src/insets/insetgraphicsParams.C @@ -177,7 +177,7 @@ void InsetGraphicsParams::Write(ostream & os, string const & bufpath) const if (clip) // clip image os << "\tclip\n"; - if (!rotateAngle.empty() + if (!rotateAngle.empty() && !float_equal(strToDbl(rotateAngle), 0.0, 0.001)) os << "\trotateAngle " << rotateAngle << '\n'; if (!rotateOrigin.empty()) diff --git a/src/lyx_main.C b/src/lyx_main.C index 4e09a29474..5e1380ae1f 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -344,7 +344,7 @@ void LyX::init(bool gui) // SIGPIPE can be safely ignored. #if defined (USE_MACOSX_PACKAGING) - // Set PATH for LyX/Mac + // Set PATH for LyX/Mac // // LyX/Mac is a relocatable application bundle; here we add to // the PATH so it can find binaries like reLyX inside its own @@ -355,7 +355,7 @@ void LyX::init(bool gui) newpath += "/sw/bin:/usr/local/bin:" "/usr/local/teTeX/bin/powerpc-apple-darwin-current"; PutEnv(newpath); - lyxerr[Debug::INIT] << "Running from LyX/Mac bundle. " + lyxerr[Debug::INIT] << "Running from LyX/Mac bundle. " "Setting PATH to: " << GetEnv("PATH") << endl; #endif @@ -363,7 +363,7 @@ void LyX::init(bool gui) string const & locale_dir = package().locale_dir(); FileInfo fi(locale_dir); if (fi.isOK() && fi.isDir()) { - lyxerr[Debug::INIT] + lyxerr[Debug::INIT] << "Setting locale directory to " << locale_dir << endl; //gettext_init(locale_dir); @@ -382,7 +382,7 @@ void LyX::init(bool gui) lyxrc.tempdir_path = package().temp_dir(); lyxrc.document_path = package().document_dir(); - + if (lyxrc.template_path.empty()) { lyxrc.template_path = AddPath(package().system_support(), "templates"); diff --git a/src/support/ChangeLog b/src/support/ChangeLog index a63b9d3dc8..7b90e16ec8 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -32,7 +32,7 @@ 2005-01-07 Lars Gullik Bjonnes * convert.h: remove the specializations, don't included unneeded - headers + headers * convert.C: add specialization for unsigned long 2005-01-06 Lars Gullik Bjonnes diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C index 0c26d02d03..ae440bab13 100644 --- a/src/tex2lyx/tex2lyx.C +++ b/src/tex2lyx/tex2lyx.C @@ -129,7 +129,7 @@ void add_known_command(string const & command, string const & o1, // definition o1 o2 invocation result // \newcommand{\foo}{bar} "" false \foo bar // \newcommand{\foo}[1]{bar #1} "[1]" false \foo{x} bar x - // \newcommand{\foo}[1][]{bar #1} "[1]" true \foo bar + // \newcommand{\foo}[1][]{bar #1} "[1]" true \foo bar // \newcommand{\foo}[1][]{bar #1} "[1]" true \foo[x] bar x // \newcommand{\foo}[1][x]{bar #1} "[1]" true \foo[x] bar x unsigned int nargs = 0; diff --git a/src/undo.C b/src/undo.C index 92593be105..1517cf6360 100644 --- a/src/undo.C +++ b/src/undo.C @@ -175,7 +175,7 @@ bool textUndoOrRedo(BufferView & bv, Undo undo = stack.top(); stack.pop(); - // We will store in otherstack the part of the document under 'undo' + // We will store in otherstack the part of the document under 'undo' DocIterator cell_dit = undo.cell.asDocIterator(&bv.buffer()->inset()); recordUndo(Undo::ATOMIC, cell_dit, -- 2.39.2