empty file format change due to r29840.

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index cdc45a6dde11f873761b34439696e66ad0e0a5b6..cbda6b010a06eaf4c11fd53196681e3748072b0a 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -125,7 +125,7 @@ namespace {
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 354;  // jspitzm: support for \print[sub]index*
+int const LYX_FORMAT = 361;  // jspitzm: bibliography custom width
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -525,6 +525,7 @@ int Buffer::readHeader(Lexer & lex)
        params().clearRemovedModules();
        params().pdfoptions().clear();
        params().indiceslist().clear();
+       params().backgroundcolor = lyx::rgbFromHexName("#ffffff");
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -2416,9 +2417,9 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
        // No side effect of file copying and image conversion
        runparams.dryrun = true;
 
-       d->texrow.reset();
        if (full_source) {
                os << "% " << _("Preview source code") << "\n\n";
+               d->texrow.reset();
                d->texrow.newline();
                d->texrow.newline();
                if (isDocBook())
@@ -2440,14 +2441,16 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
                                        convert<docstring>(par_end - 1))
                           << "\n\n";
                }
-               d->texrow.newline();
-               d->texrow.newline();
+               TexRow texrow;
+               texrow.reset();
+               texrow.newline();
+               texrow.newline();
                // output paragraphs
                if (isDocBook())
                        docbookParagraphs(paragraphs(), *this, os, runparams);
                else 
                        // latex or literate
-                       latexParagraphs(*this, text(), os, d->texrow, runparams);
+                       latexParagraphs(*this, text(), os, texrow, runparams);
        }
 }
 
@@ -2607,7 +2610,16 @@ int AutoSaveBuffer::generateChild()
 
 FileName Buffer::getAutosaveFilename() const
 {
-       string const fpath = isUnnamed() ? lyxrc.document_path : filePath();
+       // if the document is unnamed try to save in the backup dir, else
+       // in the default document path, and as a last try in the filePath, 
+       // which will most often be the temporary directory
+       string fpath;
+       if (isUnnamed())
+               fpath = lyxrc.backupdir_path.empty() ? lyxrc.document_path
+                       : lyxrc.backupdir_path;
+       if (!isUnnamed() || fpath.empty() || !FileName(fpath).exists())
+               fpath = filePath();
+
        string const fname = "#" + d->filename.onlyFileName() + "#";
        return makeAbsPath(fname, fpath);
 }
@@ -2621,6 +2633,14 @@ void Buffer::removeAutosaveFile() const
 }
 
 
+void Buffer::moveAutosaveFile(support::FileName const & oldauto) const
+{
+       FileName const newauto = getAutosaveFilename();
+       if (!(oldauto == newauto || oldauto.moveTo(newauto)))
+               LYXERR0("Unable to remove autosave file `" << oldauto << "'!");
+}
+
+
 // Perfect target for a thread...
 void Buffer::autoSave() const
 {
@@ -3124,7 +3144,8 @@ static void setLabel(Buffer const & buf, ParIterator & it)
        // Compute the item depth of the paragraph
        par.itemdepth = getItemDepth(it);
 
-       if (layout.margintype == MARGIN_MANUAL) {
+       if (layout.margintype == MARGIN_MANUAL
+           || layout.latextype == LATEX_BIB_ENVIRONMENT) {
                if (par.params().labelWidthString().empty())
                        par.params().labelWidthString(par.translateIfPossible(layout.labelstring(), bp));
        } else {