X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_sty.h;h=2608967da013bbcabdec78abf6edc647f0669551;hb=ba62665f966508db5a4de6864f4aa7374c5a5356;hp=56def33a5de92d2332b0f50da2d75601bf674ac1;hpb=4b2a999762c83627476428e595d3c1e3704a3da0;p=lyx.git

diff --git a/src/lyx_sty.h b/src/lyx_sty.h
index 56def33a5d..2608967da0 100644
--- a/src/lyx_sty.h
+++ b/src/lyx_sty.h
@@ -1,51 +1,64 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file lyx_sty.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ *
+ * A number of LaTeX command definitions for various
+ * things. The name of this file is a holdover from the
+ * days of yore.
+ */
 
 #ifndef LYX_STY_H
 #define LYX_STY_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "LString.h"
-
-// This seems to be fixed now (JMarc)
-//#ifdef WITH_WARNINGS
-//#warning README!!
-//#endif
-// I suddenly began to get segfaults in guilsinglleft_def and had no clue
-// on why this happened, then I tried a rewrite and added lyx_sty.C. Now
-// the segfault has moved to bibcombox... It seems that we(or gcc) have a
-// problem with static (non-pointer) objects , if someone knows why please
-// tell me. I am using gcc 2.7.2.1 (Linux) and when I get this segfault it
-// always has to do with a static object of some kind... I tried to rewrite
-// the objects causing the segfault, but the segfault then just moves to
-// another object. I'll let some others have a look now... (Lgb)
-
-// include this always
-extern string const lyx_def;
-extern string const lyxline_def;
-extern string const noun_def;
-extern string const lyxarrow_def;
-extern string const quotedblbase_def;
-extern string const quotesinglbase_def;
-extern string const guillemotleft_def;
-extern string const guillemotright_def;
-extern string const guilsinglleft_def;
-extern string const guilsinglright_def;
-extern string const paragraphindent_def;
-extern string const floatingfootnote_def;
-extern string const minipageindent_def;
-extern string const boldsymbol_def;
-extern string const binom_def;
-
-#endif
+#include <string>
+
+
+namespace lyx {
+
+///
+extern std::string const lyx_def;
+///
+extern std::string const lyxline_def;
+///
+extern std::string const noun_def;
+///
+extern std::string const lyxarrow_def;
+///
+extern std::string const quotedblbase_def;
+///
+extern std::string const quotesinglbase_def;
+///
+extern std::string const guillemotleft_def;
+///
+extern std::string const guillemotright_def;
+///
+extern std::string const guilsinglleft_def;
+///
+extern std::string const guilsinglright_def;
+///
+extern std::string const paragraphleftindent_def;
+///
+extern std::string const floatingfootnote_def;
+///
+extern std::string const boldsymbol_def;
+///
+extern std::string const binom_def;
+///
+extern std::string const mathcircumflex_def;
+///
+extern std::string const tabularnewline_def;
+///
+extern std::string const lyxgreyedout_def;
+///
+extern std::string const lyxdot_def;
+
+
+} // namespace lyx
+
+#endif // LYX_STY_H