Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / LyX.h

diff --git a/src/LyX.h b/src/LyX.h
index 238fe38de0c708f05ee4c8432ae6d1cc4fe2fa93..70b8b7e8c6384f60aa93b92ac78b1ad613f4f3bf 100644 (file)
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -16,6 +16,8 @@
 
 #include "support/strfwd.h"
 
+#include <vector>
+
 namespace lyx {
 
 class BufferList;
@@ -26,6 +28,7 @@ class ErrorItem;
 class FuncRequest;
 class FuncStatus;
 class KeyMap;
+class LaTeXFonts;
 class Messages;
 class Mover;
 class Movers;
@@ -34,16 +37,27 @@ class ServerSocket;
 class Session;
 class SpellChecker;
 
+enum RunMode {
+       NEW_INSTANCE,
+       USE_REMOTE,
+       PREFERRED
+};
+
+enum OverwriteFiles {
+       NO_FILES,
+       MAIN_FILE,
+       ALL_FILES,
+       UNSPECIFIED
+};
+
 extern bool use_gui;
+extern RunMode run_mode;
+extern OverwriteFiles force_overwrite;
 
 namespace frontend {
 class Application;
 }
 
-namespace graphics {
-class Previews;
-}
-
 /// initial startup
 class LyX {
 public:
@@ -91,7 +105,9 @@ private:
         */
        bool queryUserLyXDir(bool explicit_userdir);
        /// read lyxrc/preferences
-       bool readRcFile(std::string const & name);
+       /// \param check_format: whether to try to convert the format of
+       /// the file, if there is a mismatch.
+       bool readRcFile(std::string const & name, bool check_format = false);
        /// read the given languages file
        bool readLanguagesFile(std::string const & name);
        /// read the encodings.
@@ -118,6 +134,7 @@ private:
        friend FuncStatus getStatus(FuncRequest const & action);
        friend void dispatch(FuncRequest const & action);
        friend void dispatch(FuncRequest const & action, DispatchResult & dr);
+       friend std::vector<std::string> & theFilesToLoad();
        friend BufferList & theBufferList();
        friend Server & theServer();
        friend ServerSocket & theServerSocket();
@@ -127,16 +144,15 @@ private:
        friend Messages const & getGuiMessages();
        friend KeyMap & theTopLevelKeymap();
        friend Movers & theMovers();
-       friend Mover const & getMover(std::string  const & fmt);
+       friend Mover const & getMover(std::string const & fmt);
        friend void setMover(std::string const & fmt, std::string const & command);
        friend Movers & theSystemMovers();
        friend frontend::Application * theApp();
-       friend graphics::Previews & thePreviews();
        friend Session & theSession();
+       friend LaTeXFonts & theLaTeXFonts();
        friend CmdDef & theTopLevelCmdDef();
        friend SpellChecker * theSpellChecker();
        friend void setSpellChecker();
-       friend void setRcGuiLanguage();
        friend void emergencyCleanup();
        friend void execBatchCommands();
        friend void lyx_exit(int exit_code);
@@ -149,8 +165,6 @@ void emergencyCleanup();
 /// \p exit_code is 0 by default, if a non zero value is passed,
 /// emergencyCleanup() will be called before exiting.
 void lyx_exit(int exit_code);
-/// Set the language defined by the user.
-void setRcGuiLanguage();
 /// Execute batch commands if available.
 void execBatchCommands();
 
@@ -166,4 +180,3 @@ void dispatch(FuncRequest const & action, DispatchResult & dr);
 } // namespace lyx
 
 #endif // LYX_H
-