From 50cf230e42eda85fa486d28735ddbce7191625ca Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 9 May 2001 15:20:58 +0000 Subject: [PATCH] various fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1994 a592a061-630c-0410-9148-cb99ea01b6c8 --- po/POTFILES.in | 61 ++++++++++++++-------------- src/ChangeLog | 19 +++++++++ src/LaTeXFeatures.h | 2 +- src/Makefile.am | 2 +- src/bufferlist.C | 5 ++- src/frontends/xforms/ChangeLog | 4 ++ src/frontends/xforms/Menubar_pimpl.h | 4 +- src/text.C | 12 ++++-- 8 files changed, 69 insertions(+), 40 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index c0e4828c9c..ce1833e689 100644 --- 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 b2f3c44d35..7745895ff4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,22 @@ +2001-05-09 Jean-Marc Lasgouttes + + * bufferlist.C (emergencyWrite): fix assert() call + +2001-05-04 Kayvan A. Sylvan + + * 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 + + * Makefile.am: Changed order of libraries to get LyX to link properly + with the gnome frontend. + +2001-05-09 Jean-Marc Lasgouttes + + * LaTeXFeatures.h: add a std:: qualifier + 2001-05-09 Lars Gullik Bjønnes * paragraph.C (String): use stringstream diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h index 2a40539e5e..1f26df0927 100644 --- 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 4396a9b7a0..bc983144fa 100644 --- 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 5720356deb..5dc320670d 100644 --- 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 c6e99db8b6..1de1ed789d 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2001-05-08 Baruch Even + + * Menubar_pimpl.C: Fixed compilation problem. + 2001-05-04 Lars Gullik Bjønnes * 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 f284f43778..8ef8f6639d 100644 --- 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 f86a5b6874..075df005f7 100644 --- 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; } -- 2.39.2