various fixes

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

diff --git a/po/POTFILES.in b/po/POTFILES.in
index c0e4828c9cae347af8478a88ef6e2db4cdff7047..ce1833e6897dd2097212e269e4d2a61cbbd608cd 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,8 +9,9 @@ src/converter.C
 src/CutAndPaste.C
 src/debug.C
 src/exporter.C
-src/figure_form.C
+src/ext_l10n.h
 src/figureForm.C
+src/figure_form.C
 src/FontLoader.C
 src/frontends/controllers/ButtonController.h
 src/frontends/controllers/character.C
@@ -89,67 +90,67 @@ src/frontends/qt2/paragraphdlgimpl.C
 src/frontends/qt2/tabularcreatedlgimpl.C
 src/frontends/xforms/combox.C
 src/frontends/xforms/FileDialog.C
-src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibitem.C
-src/frontends/xforms/form_bibtex.C
+src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibtex.C
+src/frontends/xforms/form_bibtex.C
 src/frontends/xforms/form_browser.C
-src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCharacter.C
-src/frontends/xforms/form_citation.C
+src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCitation.C
-src/frontends/xforms/form_copyright.C
+src/frontends/xforms/form_citation.C
 src/frontends/xforms/FormCopyright.C
-src/frontends/xforms/form_credits.C
+src/frontends/xforms/form_copyright.C
 src/frontends/xforms/FormCredits.C
-src/frontends/xforms/form_document.C
+src/frontends/xforms/form_credits.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/form_error.C
+src/frontends/xforms/form_document.C
 src/frontends/xforms/FormError.C
-src/frontends/xforms/form_external.C
+src/frontends/xforms/form_error.C
 src/frontends/xforms/FormExternal.C
-src/frontends/xforms/form_filedialog.C
+src/frontends/xforms/form_external.C
 src/frontends/xforms/FormFiledialog.C
-src/frontends/xforms/form_graphics.C
+src/frontends/xforms/form_filedialog.C
 src/frontends/xforms/FormGraphics.C
-src/frontends/xforms/form_include.C
+src/frontends/xforms/form_graphics.C
 src/frontends/xforms/FormInclude.C
-src/frontends/xforms/form_index.C
+src/frontends/xforms/form_include.C
 src/frontends/xforms/FormIndex.C
+src/frontends/xforms/form_index.C
 src/frontends/xforms/FormLog.C
 src/frontends/xforms/FormMathsBitmap.C
-src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDeco.C
-src/frontends/xforms/form_maths_delim.C
+src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDelim.C
-src/frontends/xforms/form_maths_matrix.C
+src/frontends/xforms/form_maths_delim.C
 src/frontends/xforms/FormMathsMatrix.C
-src/frontends/xforms/form_maths_panel.C
+src/frontends/xforms/form_maths_matrix.C
 src/frontends/xforms/FormMathsPanel.C
-src/frontends/xforms/form_maths_space.C
+src/frontends/xforms/form_maths_panel.C
 src/frontends/xforms/FormMathsSpace.C
-src/frontends/xforms/form_minipage.C
+src/frontends/xforms/form_maths_space.C
 src/frontends/xforms/FormMinipage.C
-src/frontends/xforms/form_paragraph.C
+src/frontends/xforms/form_minipage.C
 src/frontends/xforms/FormParagraph.C
-src/frontends/xforms/form_preamble.C
+src/frontends/xforms/form_paragraph.C
 src/frontends/xforms/FormPreamble.C
-src/frontends/xforms/form_preferences.C
+src/frontends/xforms/form_preamble.C
 src/frontends/xforms/FormPreferences.C
-src/frontends/xforms/form_print.C
+src/frontends/xforms/form_preferences.C
 src/frontends/xforms/FormPrint.C
-src/frontends/xforms/form_ref.C
+src/frontends/xforms/form_print.C
 src/frontends/xforms/FormRef.C
-src/frontends/xforms/form_search.C
+src/frontends/xforms/form_ref.C
 src/frontends/xforms/FormSearch.C
-src/frontends/xforms/form_tabular.C
+src/frontends/xforms/form_search.C
 src/frontends/xforms/FormTabular.C
-src/frontends/xforms/form_tabular_create.C
+src/frontends/xforms/form_tabular.C
 src/frontends/xforms/FormTabularCreate.C
-src/frontends/xforms/form_toc.C
+src/frontends/xforms/form_tabular_create.C
 src/frontends/xforms/FormToc.C
-src/frontends/xforms/form_url.C
+src/frontends/xforms/form_toc.C
 src/frontends/xforms/FormUrl.C
+src/frontends/xforms/form_url.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C

diff --git a/src/ChangeLog b/src/ChangeLog
index b2f3c44d357a91d8b77b1b819fe4df79b6702860..7745895ff4b5ab7b0362fa7d37233e92be0dc556 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2001-05-09  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * bufferlist.C (emergencyWrite): fix assert() call
+
+2001-05-04  Kayvan A. Sylvan  <kayvan@camel.internal.sylvan.com>
+
+       * text.C (InsertChar): Added trivial patch to only send the "you
+       can not do multiple spaces this way" message once during a
+       session.
+
+2001-05-08  Baruch Even  <baruch@lyx.org>
+
+       * Makefile.am: Changed order of libraries to get LyX to link properly
+       with the gnome frontend.
+
+2001-05-09  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * LaTeXFeatures.h: add a std:: qualifier
+
 2001-05-09  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * paragraph.C (String): use stringstream

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 2a40539e5e881bbab85129dd635de9fe2818d7da..1f26df092762e411ff7e0a90649157cf82637b9e 100644 (file)
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -44,7 +44,7 @@ struct LaTeXFeatures {
        ///
        string const getIncludedFiles(string const & fname) const;
        ///
-       void getFloatDefinitions(ostream & os) const;
+       void getFloatDefinitions(std::ostream & os) const;
 
        ///
        void showStruct() const;

diff --git a/src/Makefile.am b/src/Makefile.am
index 4396a9b7a01fcfa6568e53e0aa76ae5c3327233a..bc983144fa91a9101eb83239de54c16776720d1c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,9 +10,9 @@ bin_PROGRAMS = lyx
 lyx_DEPENDENCIES = mathed/libmathed.la insets/libinsets.la \
        graphics/libgraphics.la \
        frontends/libfrontends.la @FRONTEND_GUILIB@ \
-       frontends/libfrontends.la \
        frontends/controllers/libcontrollers.la \
        frontends/support/libfrontendsupport.la support/libsupport.la \
+       frontends/libfrontends.la \
        @INCLUDED_SIGC@
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(LYX_LIBS) $(SIGC_LIBS) \
        $(PSPELL_LIBS) @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 5720356deb12f6ff41c34be385f7ec59f44b2f0e..5dc320670da45f26abb4836f1af45ff6e559056b 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -287,7 +287,10 @@ void BufferList::emergencyWriteAll()
 
 void BufferList::emergencyWrite(Buffer * buf) 
 {
-       assert(buf); // use c assert to avoid a loop
+       // assert(buf) // this is not good since C assert takes an int
+                      // and a pointer is a long (JMarc)
+       assert(buf != 0); // use c assert to avoid a loop
+
        
        // No need to save if the buffer has not changed.
        if (buf->isLyxClean()) return;

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c6e99db8b694a7834fe4173df0231b5653fbfa2d..1de1ed789d2bf6a542dd7703b599e56b8a6f24d1 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-08  Baruch Even  <baruch@lyx.org>
+
+       * Menubar_pimpl.C: Fixed compilation problem.
+
 2001-05-04  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * Menubar_pimpl.C (add_toc): use name and not type with float.

diff --git a/src/frontends/xforms/Menubar_pimpl.h b/src/frontends/xforms/Menubar_pimpl.h
index f284f437786993ef4ecccfe0fc54e1bd2ce4159a..8ef8f6639d5482c08e9a076ac59c0ead9d644922 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.h
+++ b/src/frontends/xforms/Menubar_pimpl.h
@@ -26,11 +26,9 @@
 #include "LString.h"
 #include "frontends/Menubar.h"
 #include "commandtags.h"
+#include "MenuBackend.h"
 
 class LyXView;
-class MenuBackend;
-class MenuItem;
-class Menu;
 
 /** The LyX GUI independent menubar class
   The GUI interface is implemented in the corresponding Menubar_pimpl class. 

diff --git a/src/text.C b/src/text.C
index f86a5b68742f23fe8fd1bb2aaba73771a9700a70..075df005f7d354e404cb6afaa318ce4b13b0f69f 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -1778,10 +1778,14 @@ void LyXText::InsertChar(BufferView * bview, char c)
                    || (cursor.pos() > 0
                        && cursor.par()->IsNewline(cursor.pos() - 1))
                    || (cursor.pos() == 0)) {
-                       if (cursor.pos() == 0 )
-                               bview->owner()->message(_("You cannot insert a space at the beginning of a paragraph.  Please read the Tutorial."));
-                       else
-                               bview->owner()->message(_("You cannot type two spaces this way.  Please read the Tutorial."));
+                       static bool sent_space_message = false;
+                       if (!sent_space_message) {
+                               if (cursor.pos() == 0) 
+                                       bview->owner()->message(_("You cannot insert a space at the beginning of a paragraph.  Please read the Tutorial."));
+                               else
+                                       bview->owner()->message(_("You cannot type two spaces this way.  Please read the Tutorial."));
+                               sent_space_message = true;
+                       }
                        charInserted();
                        return;
                }