#include "support/types.h"
#include <boost/scoped_ptr.hpp>
-#include <boost/signals/signal0.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/signal.hpp>
#include <iosfwd>
#include <map>
class LyXVC;
class LaTeXFeatures;
class Language;
-class Messages;
+class MacroData;
class OutputParams;
class ParagraphList;
class ParConstIterator;
/// load a new file
bool readFile(std::string const & filename);
- bool readFile(std::string const & filename, lyx::par_type pit);
+ bool readFile(std::string const & filename, lyx::pit_type pit);
/// read the header, returns number of unknown tokens
int readHeader(LyXLex & lex);
\param par if != 0 insert the file.
\return \c false if file is not completely read.
*/
- bool readBody(LyXLex &);
+ bool readDocument(LyXLex &);
///
void insertStringAsLines(ParagraphList & plist,
- lyx::par_type &, lyx::pos_type &,
- LyXFont const &, std::string const &);
+ lyx::pit_type &, lyx::pos_type &,
+ LyXFont const &, std::string const &, bool);
///
ParIterator getParFromID(int id) const;
/// do we have a paragraph with this id?
bool hasParWithID(int id) const;
/// This signal is emitted when a parsing error shows up.
- boost::signal1<void, ErrorItem> error;
+ boost::signal<void(ErrorItem)> error;
/// This signal is emitted when some message shows up.
- boost::signal1<void, std::string> message;
+ boost::signal<void(std::string)> message;
/// This signal is emitted when the buffer busy status change.
- boost::signal1<void, bool> busy;
+ boost::signal<void(bool)> busy;
/// This signal is emitted when the buffer readonly status change.
- boost::signal1<void, bool> readonly;
+ boost::signal<void(bool)> readonly;
/// Update window titles of all users.
- boost::signal0<void> updateTitles;
+ boost::signal<void()> updateTitles;
/// Reset autosave timers for all users.
- boost::signal0<void> resetAutosaveTimers;
+ boost::signal<void()> resetAutosaveTimers;
/// This signal is emitting if the buffer is being closed.
- boost::signal0<void> closing;
+ boost::signal<void()> closing;
/** Save file.
///
InsetBase & inset() const;
+ //
+ // Macro handling
+ //
+ ///
+ void buildMacros();
+ ///
+ bool hasMacro(std::string const & name) const;
+ ///
+ MacroData const & getMacro(std::string const & name) const;
+ ///
+ void insertMacro(std::string const & name, MacroData const & data);
+
private:
/** Inserts a file into a document
\param par if != 0 insert the file.
\return \c false if method fails.
*/
bool readFile(LyXLex &, std::string const & filename,
- lyx::par_type pit);
+ lyx::pit_type pit);
bool do_writeFile(std::ostream & ofs) const;