do not include language.h and gettext.h in lyxfont.h and lyxparagraph.h

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

po/POTFILES.in

@@ -10,8 +10,8 @@ src/CutAndPaste.C
 src/debug.C
 src/exporter.C
 src/ext_l10n.h
-src/figure_form.C
 src/figureForm.C
+src/figure_form.C
 src/FontLoader.C
 src/frontends/controllers/ButtonController.h
 src/frontends/controllers/character.C
@@ -89,67 +89,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

src/BufferView2.C

@@ -32,6 +32,7 @@
 #include "BufferView_pimpl.h"
 #include "insets/insetcommand.h" //ChangeRefs
 #include "support/lyxfunctional.h" //equal_1st_in_pair
+#include "language.h"
 
 extern BufferList bufferlist;
 

src/ChangeLog

@@ -1,3 +1,27 @@
+2001-04-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* exporter.C: 
+	* paragraph.C: 
+	* screen.C: 
+	* tabular.C: 
+	* CutAndPaste.C: include gettext.h
+
+	* lyxfont.h: remove old hack with ON and OFF.
+
+	* lyxparagraph.h: 
+	* lyxfont.h: do not include language.h...
+
+	* BufferView2.C: 
+	* LaTeXFeatures.C: 
+	* Painter.C: 
+	* bufferview_funcs.C: 
+	* font.C: 
+	* lyxfont.C: 
+	* text.C: 
+	* text2.C: 
+	* trans_mgr.C: 
+	* paragraph.C: ... but do it here instead
+
 2001-04-04  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* text2.C (SetLayout): split in NEW_INSETS and non NEW_INSETS version
@@ -5,7 +29,7 @@
 	* tabular.C: small reformat
 
 	* paragraph.C (GetFontSettings): split in NEW_INSETS and non
-	NEW_INSETS verison
+	NEW_INSETS version
 	(GetChar): ditto
 	(BreakParagraph): ditto
 	(SetOnlyLayout): ditto
@@ -35,7 +59,7 @@
 	* lyxrow.C (par): moved
 	(height): moved
 	(next): moved
-	* lyxrox.h: as inlines here
+	* lyxrow.h: as inlines here
 
 	* lyxfont.h (shape): moved from lyxfont.C
 	(emph): moved from lyxfont.C

src/CutAndPaste.C

@@ -16,6 +16,7 @@
 #include "insets/inseterror.h"
 #include "lyx_gui_misc.h"
 #include "lyxcursor.h"
+#include "gettext.h"
 
 #ifdef __GNUG__
 #pragma implementation

src/LaTeXFeatures.C

@@ -24,6 +24,7 @@
 #include "layout.h"
 #include "support/filetools.h"
 #include "FloatList.h"
+#include "language.h"
 
 using std::endl;
 

src/Painter.C

@@ -32,6 +32,7 @@
 #include "ColorHandler.h"
 #include "lyxrc.h"
 #include "encoding.h"
+#include "language.h"
 
 #include "frontends/support/LyXImage.h"
 

src/bufferview_funcs.C

@@ -25,7 +25,7 @@
 #include "buffer.h"
 #include "support/lstrings.h"
 #include "lyx_cb.h"
-
+#include "language.h"
 
 #ifndef NEW_INSETS
 void Foot(BufferView * bv)

src/exporter.C

@@ -23,6 +23,7 @@
 #include "lyxrc.h"
 #include "converter.h"
 #include "lyx_gui_misc.h" //WriteAlert
+#include "gettext.h"
 
 using std::vector;
 using std::find;

src/font.C

@@ -20,6 +20,7 @@
 #include "FontLoader.h"
 #include "lyxrc.h"
 #include "encoding.h"
+#include "language.h"
 
 namespace {
 

src/frontends/controllers/ChangeLog

@@ -1,3 +1,17 @@
+2001-04-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* ControlToc.C: 
+	* ControlSearch.C: 
+	* ControlPrint.C: 
+	* ControlPreamble.C: 
+	* ControlInclude.C: 
+	* ControlGraphics.C: 
+	* ControlExternal.C: 
+	* ControlCopyright.C: include gettext.h
+
+	* ControlCharacter.C: 
+	* character.C: include gettext.h and language.h
+
 2001-04-03  John Levon  <moz@compsoc.man.ac.uk>
 
 	* ButtonController.h:

src/frontends/controllers/ControlCharacter.C

@@ -20,6 +20,8 @@
 #include "Liason.h"
 #include "LyXView.h"
 #include "bufferview_funcs.h" // ToggleAndShow
+#include "gettext.h"
+#include "language.h"
 
 using Liason::setMinibuffer;
 using SigC::slot;

src/frontends/controllers/ControlCopyright.C

@@ -17,6 +17,7 @@
 #include "Dialogs.h"
 #include "LyXView.h"
 #include "BufferView.h"
+#include "gettext.h"
 
 using SigC::slot;
 

src/frontends/controllers/ControlExternal.C

@@ -30,6 +30,7 @@
 #include "support/filetools.h"
 #include "frontends/FileDialog.h"
 #include "lyx_gui_misc.h" // WriteAlert
+#include "gettext.h"
 
 using std::make_pair;
 using std::vector;

src/frontends/controllers/ControlGraphics.C

@@ -22,6 +22,7 @@
 #include "Dialogs.h"
 #include "lyxfunc.h"
 #include "LyXView.h"
+#include "gettext.h"
 
 #include "insets/insetgraphics.h"
 

src/frontends/controllers/ControlInclude.C

@@ -20,6 +20,7 @@
 #include "Dialogs.h"
 #include "lyxfunc.h"
 #include "LyXView.h"
+#include "gettext.h"
 
 #include "helper_funcs.h"
 #include "lyxrc.h"

src/frontends/controllers/ControlPreamble.C

@@ -18,6 +18,7 @@
 #include "buffer.h"
 #include "lyxrc.h"
 #include "Liason.h"
+#include "gettext.h"
 
 
 ControlPreamble::ControlPreamble(LyXView & lv, Dialogs & d)

src/frontends/controllers/ControlPrint.C

@@ -27,6 +27,7 @@
 #include "Liason.h"
 #include "helper_funcs.h" // browseFile
 #include "lyx_gui_misc.h" // WriteAlert
+#include "gettext.h"
 
 using Liason::printBuffer;
 using Liason::getPrinterParams;

src/frontends/controllers/ControlSearch.C

@@ -24,6 +24,7 @@
 #include "buffer.h"
 #include "lyxfind.h"
 #include "debug.h"
+#include "gettext.h"
 
 using Liason::setMinibuffer;
 using SigC::slot;

src/frontends/controllers/ControlToc.C

@@ -23,6 +23,7 @@
 #include "LyXView.h"
 #include "lyxfunc.h"
 #include "support/lstrings.h" // tostr
+#include "gettext.h"
 
 using std::vector;
 using SigC::slot;

src/frontends/controllers/character.C

@@ -18,7 +18,9 @@
 #pragma implementation
 #endif
 
+#include "gettext.h"
 #include "character.h"
+#include "language.h"
 
 using std::vector;
 

src/frontends/xforms/ChangeLog

@@ -1,3 +1,7 @@
+2001-04-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* Menubar_pimpl.C: include gettext.h
+
 2001-04-05  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* xforms_helpers.C (formatted): constify length

src/frontends/xforms/Menubar_pimpl.C

@@ -26,6 +26,7 @@
 #include "LyXView.h"
 #include "MenuBackend.h"
 #include "Menubar_pimpl.h"
+#include "gettext.h"
 
 using std::endl;
 using std::vector;

src/insets/ChangeLog

@@ -1,3 +1,19 @@
+2001-04-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* lyxinset.h: do not include gettext.h...
+
+	* inset.C:
+	* insetcaption.C:
+	* insetexternal.C:
+	* insetgraphics.C:
+	* insetindex.C:
+	* insetlabel.C:
+	* insetlatexaccent.C:
+	* insetminipage.C:
+	* insetquotes.C:
+	* insettabular.C:
+	* inseturl.C: ... and do it here instead
+
 2001-04-05  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* insetcollapsable.[Ch] (getLabelList): add std:: on vector<string>

src/insets/inset.C

@@ -21,6 +21,7 @@
 #include "Painter.h"
 #include "commandtags.h"
 #include "support/lstrings.h"
+#include "gettext.h"
 
 using std::endl;
 

src/insets/insetcaption.C

@@ -21,6 +21,7 @@
 #include "FloatList.h"
 #include "insets/insetfloat.h"
 #include "debug.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::endl;

src/insets/insetexternal.C

@@ -29,6 +29,7 @@
 #include "support/lstrings.h"
 #include "support/path.h"
 #include "support/syscall.h"
+#include "gettext.h"
 
 using std::endl;
 

src/insets/insetgraphics.C

@@ -145,6 +145,7 @@ TODO Extended features:
 #include <algorithm> // For the std::max
 #include "support/lyxmanip.h"
 #include "debug.h"
+#include "gettext.h"
 
 extern string system_tempdir;
 

src/insets/insetindex.C

@@ -9,6 +9,7 @@
 #include "LyXView.h"
 #include "frontends/Dialogs.h"
 #include "LaTeXFeatures.h"
+#include "gettext.h"
 
 InsetIndex::InsetIndex(InsetCommandParams const & p)
 	: InsetCommand(p)

src/insets/insetlabel.C

@@ -20,6 +20,7 @@
 #include "support/lstrings.h" //frontStrip, strip
 #include "lyxtext.h"
 #include "buffer.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::vector;

src/insets/insetlatexaccent.C

@@ -21,6 +21,7 @@
 #include "BufferView.h"
 #include "Painter.h"
 #include "font.h"
+#include "language.h"
 
 using std::ostream;
 using std::endl;

src/insets/insetminipage.C

@@ -24,6 +24,7 @@
 #include "support/LOstream.h"
 #include "support/lstrings.h"
 #include "debug.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::endl;

src/insets/insetquotes.C

@@ -24,6 +24,7 @@
 #include "support/lstrings.h"
 #include "Painter.h"
 #include "font.h"
+#include "language.h"
 
 using std::ostream;
 using std::endl;

src/insets/insettabular.C

@@ -36,6 +36,8 @@
 #include "debug.h"
 #include "lyxfunc.h"
 #include "WorkArea.h"
+#include "gettext.h"
+#include "language.h"
 
 using std::ostream;
 using std::ifstream;

src/insets/inseturl.C

@@ -10,6 +10,7 @@
 #include "LyXView.h"
 #include "debug.h"
 #include "frontends/Dialogs.h"
+#include "gettext.h"
 
 using std::ostream;
 

src/insets/lyxinset.h

@@ -19,7 +19,6 @@
 
 #include <X11/Xlib.h>
 
-#include "gettext.h"
 #include "lyxfont.h"
 #include "lyxlex.h"
 #include "commandtags.h"

src/lyxfont.C

@@ -19,6 +19,7 @@
 
 #include "gettext.h"
 #include "lyxfont.h"
+#include "language.h"
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"

src/lyxfont.h

@@ -19,24 +19,11 @@
 #include <iosfwd>
 
 #include "LString.h"
-#include "language.h"
 #include "LColor.h"
 
-// It might happen that locale.h defines ON and OFF. This is not good
-// for us, since we use these names below. But of course this is due
-// to some old compilers. Than is broken when it comes to C++ scoping.
-#include "gettext.h" // so that we are sure tht it won't be included
-// later. 
-#ifdef ON
-#undef ON
-#endif
-
-#ifdef OFF
-#undef OFF
-#endif
-
 class LyXLex;
 class BufferParams;
+class Language;
 
 ///
 class LyXFont {

src/lyxparagraph.h

@@ -23,7 +23,6 @@
 #include <boost/array.hpp>
 
 #include "insets/lyxinset.h"
-#include "language.h"
 #include "ParagraphParameters.h"
 
 class BufferParams;
@@ -32,6 +31,7 @@ class TexRow;
 struct LaTeXFeatures;
 class InsetBibKey;
 class BufferView;
+class Language;
 
 // I dare you to enable this and help me find all the bugs that then show
 // up. (Lgb)

src/lyxrc.C

@@ -31,6 +31,7 @@
 #include "support/filetools.h"
 #include "lyxtext.h"
 #include "converter.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::ofstream;

src/paragraph.C

@@ -22,6 +22,7 @@
 #include "support/textutils.h"
 #include "lyxrc.h"
 #include "layout.h"
+#include "language.h"
 #include "tex-strings.h"
 #include "buffer.h"
 #include "bufferparams.h"
@@ -39,6 +40,7 @@
 #include "BufferView.h"
 #include "encoding.h"
 #include "ParameterStruct.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::endl;

src/screen.C

@@ -25,6 +25,7 @@
 #include "font.h"
 #include "insets/insettext.h"
 #include "ColorHandler.h"
+#include "language.h"
 
 using std::max;
 using std::min;

src/tabular.C

@@ -32,6 +32,7 @@
 #include "support/lyxmanip.h"
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
+#include "gettext.h"
 
 using std::ostream;
 using std::istream;

src/text.C

@@ -34,6 +34,7 @@
 #include "encoding.h"
 #include "lyxscreen.h"
 #include "bufferview_funcs.h"
+#include "language.h"
 
 using std::max;
 using std::min;

src/text2.C

@@ -43,6 +43,7 @@
 #include "debug.h"
 #include "lyxrc.h"
 #include "FloatList.h"
+#include "language.h"
 
 using std::copy;
 using std::find;

src/trans_mgr.C

@@ -15,6 +15,7 @@
 #include "buffer.h"
 #include "lyxrc.h"
 #include "support/lstrings.h"
+#include "language.h"
 
 using std::endl;
 using std::pair;