small stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4359 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d5baed575ffe3af679ac32fa4bdfd957416a1ee..59f42ec907ebb6c49fc7efbad5dd6599304c8448 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-10  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+       * sp_spell.C: fdopen is not part of the C++ standard.
+
+       * paragraph.C (InsetIterator): use >= instead of ==
+
 2002-06-07  Angus Leeming  <leeming@lyx.org>
 
        Fixes needed to compile with Compaq cxx 6.5.
@@ -20,7 +26,7 @@
        * tabular-old.C:
        * tabular.C:
        Add a using std::abs declaration.
-       
+
        * kbmap.h (modifier_pair):
        * paragraph.h (InsetTable, InsetList):
        * lyxfont.h (FontBits):
@@ -42,8 +48,8 @@
 2002-06-05  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * xtl/*: get rid of xtl, which is not in use anyway
-       
-       * LyXAction.C (init): 
+
+       * LyXAction.C (init):
        * commandtags.h: remove BUFFER_PRINT and BUFFER_PARAMS_GET, which
        were unimplemented xtl experimentation
 
@@ -54,11 +60,11 @@
 2002-06-03  John Levon  <moz@compsoc.man.ac.uk>
 
        * converter.C: constify a bit
- 
+
 2002-06-02  John Levon  <moz@compsoc.man.ac.uk>
 
        * lyx_gui.C: check xforms version correctly
- 
+
 2002-04-30  Herbert Voss  <voss@lyx.org>
 
        * buffer.C (parseSingleLyXformat2Token): fix bug with ignored
@@ -68,42 +74,42 @@
 
        * lyxvc.C: fix bug 416 (make sure buffer is saved before
          attempt to register it with a VCS)
- 
+
 2002-05-30  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * lyx_main.C (init): honor variables LYX_DIR_13x and
-       LYX_USERDIR_13x 
+       LYX_USERDIR_13x
 
 2002-05-30  John Levon  <moz@compsoc.man.ac.uk>
 
-       * buffer.h: 
+       * buffer.h:
        * buffer.C:
        * lyx_main.C: fix a crash on bad command line,
          and give a useful exit status on error
 
        * lyxfunc.C (doImport): allow -i lyx to work
-  
+
 2002-03-30  André Pönitz <poenitz@gmx.net>
 
-       * lyxfunc.C: mathed font changes 
+       * lyxfunc.C: mathed font changes
 
 2002-05-30  John Levon  <moz@compsoc.man.ac.uk>
 
-       * LaTeX.C: 
+       * LaTeX.C:
        * importer.h:
        * importer.C:
        * lyx_sty.h:
-       * lyx_sty.C: 
-       * lyxlex.C: 
-       * lyxrow.h: 
-       * lyxtext.h: 
-       * paragraph.h: 
-       * paragraph.C: 
+       * lyx_sty.C:
+       * lyxlex.C:
+       * lyxrow.h:
+       * lyxtext.h:
+       * paragraph.h:
+       * paragraph.C:
        * texrow.h:
-       * texrow.C: 
+       * texrow.C:
        * text.C:
        * trans_mgr.h: srcdocs, and some minor cleanups
- 
+
 2002-05-29  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * paragraph_pimpl.C (isTextAt): rewrite to be much faster (do not

diff --git a/src/buffer.h b/src/buffer.h
index 4da4b29a3aca63ad493ee75496e1d8bc1fa5687e..ee644a0bd73f08560cde215545f0737d2d734d27 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -20,14 +20,14 @@
 #include "LString.h"
 #include "undo.h"
 #include "support/limited_stack.h"
- 
+
 #include "lyxvc.h"
 #include "bufferparams.h"
 #include "texrow.h"
 #include "paragraph.h"
 
 #include <boost/shared_ptr.hpp>
- 
+
 class BufferView;
 class LyXRC;
 class TeXErrors;
@@ -302,10 +302,10 @@ public:
 
        /// Does this mean that this is buffer local?
        limited_stack<boost::shared_ptr<Undo> > undostack;
-       
-       /// Does this mean that this is buffer local? 
+
+       /// Does this mean that this is buffer local?
        limited_stack<boost::shared_ptr<Undo> > redostack;
-       
+
        ///
        BufferParams params;
 

diff --git a/src/paragraph.C b/src/paragraph.C
index 301e7c918732fc3789b9915fe400e79627a8703b..4bb88f2b824be88429f5616c7777add205cba1c6 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -231,11 +231,11 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
        // Noindent?
        if (params().noindent())
                os << "\\noindent ";
-       
+
        // Do we have a manual left indent?
        if (!params().leftIndent().zero())
                os << "\\leftindent " << params().leftIndent().asString() << " ";
-       
+
        // Alignment?
        if (params().align() != LYX_ALIGN_LAYOUT) {
                int h = 0;
@@ -892,7 +892,7 @@ void Paragraph::breakParagraph(BufferParams const & bparams,
        }
 
        bool isempty = (textclasslist[bparams.textclass][layout()].keepempty &&
-                       !size());
+                       !size());
        if (!isempty && (size() > pos || !size() || flag == 2)) {
                tmp->layout(layout());
                tmp->params().align(params().align());
@@ -1220,7 +1220,7 @@ Paragraph::InsetIterator(pos_type pos)
        InsetList::iterator it = insetlist.begin();
        InsetList::iterator end = insetlist.end();
        for (; it != end; ++it) {
-               if (it->pos == pos)
+               if (it->pos >= pos)
                        break;
        }
 
@@ -1704,7 +1704,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                                }
                                if (moving_arg)
                                        os << "\\protect ";
- 
+
                                os << "\\\\\n";
                        }
                        texrow.newline();
@@ -1851,7 +1851,7 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
                        texrow.newline();
                }
        }
-       
+
        bool leftindent_open = false;
        if (!params().leftIndent().zero()) {
                os << "\\begin{LyXParagraphLeftIndent}{" <<
@@ -1916,7 +1916,7 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
                os << "\\end{LyXParagraphLeftIndent}\n";
                texrow.newline();
        }
-       
+
        lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
        return par;  // ale970302
 }

diff --git a/src/paragraph.h b/src/paragraph.h
index 3d1193eb5c99a25e46738ec5f0ac67c700f1f06f..47b1420752f3f33613a592ed2ecfafa0b808a15a 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -1,13 +1,10 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- *           LyX, The Document Processor
- *
- *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+/**
+ *  \file paragraph.h
+ *  Copyright 1995 Matthias Ettrich
+ *  Copyright 2002 the LyX Team
+ *  Read the file COPYING
+ */
 
 #ifndef PARAGRAPH_H
 #define PARAGRAPH_H
@@ -400,7 +397,7 @@ public:
        inset_iterator inset_iterator_begin();
        ///
        inset_iterator inset_iterator_end();
-       ///
+       /// returns inset iterator of the first inset at or after pos.
        inset_iterator InsetIterator(lyx::pos_type pos);
 
 private:

diff --git a/src/sp_spell.C b/src/sp_spell.C
index 9a41e26f9335182f07bbe7dfe3af23d26b60ad18..0963b46c30e872f6d07ecdc8d66350c4ec1acee4 100644 (file)
--- a/src/sp_spell.C
+++ b/src/sp_spell.C
@@ -21,7 +21,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <stdio.h>
+#include <cstdio>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -54,7 +54,6 @@
 #include "sp_ispell.h"
 
 #ifndef CXX_GLOBAL_CSTD
-using std::fdopen;
 using std::strcpy;
 using std::strlen;
 using std::strpbrk;