Adjust comments to the truth.

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index b702a0ee4807f6e557648102c0ab743594006855..97c339d198ea7bcafe7e1bf0495a54a447b7a7f7 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -102,8 +102,15 @@ public:
                ReadWrongVersion,
                ReadFileNotFound,
                ReadVCError,
-               ReadAutosaveFailure,
+               ReadAutosaveFailure,            
                ReadEmergencyFailure,
+               ReadNoLyXFormat,
+               ReadDocumentFailure,
+               // lyx2lyx
+               LyX2LyXNoTempFile,
+               LyX2LyXNotFound,
+               LyX2LyXOlderFormat,
+               LyX2LyXNewerFormat,
                // other
                ReadOriginal
        };
@@ -159,17 +166,23 @@ public:
 
        /// read a new document from a string
        bool readString(std::string const &);
-       /// load a new file
-       bool readFile(support::FileName const & filename);
-
+       
+       /// Reads the first tag of a LyX File and 
+       /// returns the file format number.
+       ReadStatus parseLyXFormat(Lexer & lex, 
+               support::FileName const & fn, int & file_format) const;
        /// read the header, returns number of unknown tokens
        int readHeader(Lexer & lex);
-
        /** Reads a file without header.
            \param par if != 0 insert the file.
            \return \c true if file is not completely read.
        */
        bool readDocument(Lexer &);
+       /// Convert the LyX file to the LYX_FORMAT using
+       /// the lyx2lyx script and returns the filename
+       /// of the temporary file to be read
+       ReadStatus convertLyXFormat(support::FileName const & fn, 
+               support::FileName & tmpfile, int from_format);
 
        ///
        DocIterator getParFromID(int id) const;
@@ -197,7 +210,9 @@ public:
        /// tries to extract the file from version control if it
        /// cannot be found. If it can be found, it will try to
        /// read an emergency save file or an autosave file.
-       ReadStatus loadLyXFile(support::FileName const & s);
+       ReadStatus loadLyXFile(support::FileName const & fn);
+       /// read a new file
+       ReadStatus readFile(support::FileName const & fn);
        /// Try to extract the file from a version control container
        /// before reading if the file cannot be found. This is only
        /// implemented for RCS.
@@ -548,8 +563,16 @@ public:
        void removeAutosaveFile() const;
        ///
        void moveAutosaveFile(support::FileName const & old) const;
-       ///
+       /// Get the filename of the autosave file associated with the Buffer
        support::FileName getAutosaveFileName() const;
+       /// Get the filename of the autosave file associated with \c fn
+       support::FileName getAutosaveFileNameFor(support::FileName const & fn)
+               const;
+       /// Get the filename of the emergency file associated with the Buffer
+       support::FileName getEmergencyFileName() const;
+       /// Get the filename of the emergency file associated with \c fn
+       support::FileName getEmergencyFileNameFor(support::FileName const & fn)
+               const;
 
        /// return the format of the buffer on a string
        std::string bufferFormat() const;
@@ -615,11 +638,6 @@ public:
 private:
        ///
        std::vector<std::string> backends() const;
-       /** Inserts a file into a document
-           \return \c false if method fails.
-       */
-       ReadStatus readFile(Lexer &, support::FileName const & filename,
-                           bool fromString = false);
        ///
        void getLanguages(std::set<Language const *> &) const;
        /// Update the list of all bibfiles in use (including bibfiles