X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=162151286aafe72ecc736621141c04a42b839611;hb=bbe09eada1de6edb7eb45213eaac4b4b09495f6e;hp=bc898d6b4c755561982b944ebe56c8c1c0e73038;hpb=16fd47ad8f5d78a3b7266520b0868c1e2bd0dcac;p=lyx.git

diff --git a/src/LyX.h b/src/LyX.h
index bc898d6b4c..162151286a 100644
--- a/src/LyX.h
+++ b/src/LyX.h
@@ -25,9 +25,11 @@ class CmdDef;
 class Converters;
 class DispatchResult;
 class ErrorItem;
+class Formats;
 class FuncRequest;
 class FuncStatus;
 class KeyMap;
+class LaTeXFonts;
 class Messages;
 class Mover;
 class Movers;
@@ -50,8 +52,11 @@ enum OverwriteFiles {
 };
 
 extern bool use_gui;
+extern bool verbose;
+extern bool ignore_missing_glyphs;
 extern RunMode run_mode;
 extern OverwriteFiles force_overwrite;
+extern double qt_scale_factor;
 
 namespace frontend {
 class Application;
@@ -59,8 +64,8 @@ class Application;
 
 /// initial startup
 class LyX {
+	friend class LyXConsoleApp;
 public:
-
 	LyX();
 	~LyX();
 
@@ -84,16 +89,12 @@ private:
 	*/
 	int init(int & argc, char * argv[]);
 
+	/// Execute commandline commands if no GUI was requested.
+	int execWithoutGui(int & argc, char * argv[]);
+
 	/// Execute batch commands if available.
 	void execCommands();
 
-	/// Load files passed at command-line.
-	/// return true on success false if we encounter an error
-	/**
-	This method is used only in non-GUI mode.
-	*/
-	bool loadFiles();
-
 	/// initial LyX set up
 	bool init();
 	/** Check for the existence of the user's support directory and,
@@ -131,7 +132,7 @@ private:
 	bool first_start;
 
 	friend FuncStatus getStatus(FuncRequest const & action);
-	friend void dispatch(FuncRequest const & action);
+	friend DispatchResult const & dispatch(FuncRequest const & action);
 	friend void dispatch(FuncRequest const & action, DispatchResult & dr);
 	friend std::vector<std::string> & theFilesToLoad();
 	friend BufferList & theBufferList();
@@ -139,15 +140,18 @@ private:
 	friend ServerSocket & theServerSocket();
 	friend Converters & theConverters();
 	friend Converters & theSystemConverters();
+	friend Formats & theFormats();
+	friend Formats & theSystemFormats();
 	friend Messages const & getMessages(std::string const & language);
 	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 Session & theSession();
+	friend LaTeXFonts & theLaTeXFonts();
 	friend CmdDef & theTopLevelCmdDef();
 	friend SpellChecker * theSpellChecker();
 	friend void setSpellChecker();
@@ -170,7 +174,7 @@ void execBatchCommands();
 FuncStatus getStatus(FuncRequest const & action);
 
 ///
-void dispatch(FuncRequest const & action);
+DispatchResult const & dispatch(FuncRequest const & action);
 
 ///
 void dispatch(FuncRequest const & action, DispatchResult & dr);
@@ -178,4 +182,3 @@ void dispatch(FuncRequest const & action, DispatchResult & dr);
 } // namespace lyx
 
 #endif // LYX_H
-