Allow literate documents other than noweb to work out of the box. Currently

[features.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 1084bc1014a43688662ff7a232e5c6ff4de5aa4a..50374145dc9a01ecd5a703106009f3b1ec3868bc 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;
@@ -459,10 +459,12 @@ string Buffer::logName(LogType * type) const
        FileName const fname(addName(temppath(),
                                     onlyFilename(changeExtension(filename,
                                                                  ".log"))));
+
+       // FIXME: how do we know this is the name of the build log?
        FileName const bname(
                addName(path, onlyFilename(
                        changeExtension(filename,
-                                       formats.extension("literate") + ".out"))));
+                                       formats.extension(bufferFormat()) + ".out"))));
 
        // If no Latex log or Build log is newer, show Build log
 
@@ -491,17 +493,9 @@ void Buffer::setReadonly(bool const flag)
 
 void Buffer::setFileName(string const & newfile)
 {
-       // bring the autosave file with us, just in case.
-       FileName const oldauto = getAutosaveFilename();
        d->filename = makeAbsPath(newfile);
        setReadonly(d->filename.isReadOnly());
        updateTitles();
-       FileName const newauto = getAutosaveFilename();
-       if (oldauto == newauto)
-               return;
-       if (oldauto.moveTo(newauto))
-               return;
-       LYXERR0("Unable to remove autosave file `" << oldauto << "'!");
 }
 
 
@@ -533,6 +527,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];
@@ -2424,9 +2419,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())
@@ -2448,14 +2443,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);
        }
 }
 
@@ -2615,7 +2612,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);
 }
@@ -2629,6 +2635,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
 {
@@ -2650,15 +2664,14 @@ void Buffer::autoSave() const
 
 string Buffer::bufferFormat() const
 {
-       if (isDocBook())
-               return "docbook";
-       if (isLiterate())
-               return "literate";
-       if (params().useXetex)
-               return "xetex";
-       if (params().encoding().package() == Encoding::japanese)
-               return "platex";
-       return "latex";
+       string format = params().documentClass().outputFormat();
+       if (format == "latex") {
+               if (params().useXetex)
+                       return "xetex";
+               if (params().encoding().package() == Encoding::japanese)
+                       return "platex";
+       }
+       return format;
 }
 
 
@@ -3132,7 +3145,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 {