cosmetics. mainly replace #include "dostring.h" by #include "strfwd.h"

[features.git] / src / insets / InsetBibtex.cpp

diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 4c612bd4955c54acc2d03f6443e3b8362ec6c2e4..d5a076671fbcfc876690bc639bd6ed61cf8de43c 100644 (file)
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -26,6 +26,8 @@
 
 #include "frontends/alert.h"
 
+#include "support/ExceptionMessage.h"
+#include "support/docstream.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
@@ -46,7 +48,6 @@ using support::copy;
 using support::DocFileName;
 using support::FileName;
 using support::findtexfile;
-using support::isFileReadable;
 using support::isValidLaTeXFilename;
 using support::latex_path;
 using support::ltrim;
@@ -78,9 +79,19 @@ InsetBibtex::InsetBibtex(InsetCommandParams const & p)
 {}
 
 
-std::auto_ptr<Inset> InsetBibtex::doClone() const
+CommandInfo const * InsetBibtex::findInfo(std::string const & /* cmdName */)
 {
-       return std::auto_ptr<Inset>(new InsetBibtex(*this));
+       static const char * const paramnames[] = 
+               {"options", "btprint", "bibfiles", ""};
+       static const bool isoptional[] = {true, true, false};
+       static const CommandInfo info = {3, paramnames, isoptional};
+       return &info;
+}
+
+
+Inset * InsetBibtex::clone() const
+{
+       return new InsetBibtex(*this);
 }
 
 
@@ -89,13 +100,23 @@ void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action) {
 
        case LFUN_INSET_MODIFY: {
-               InsetCommandParams p("bibtex");
-               InsetCommandMailer::string2params("bibtex", to_utf8(cmd.argument()), p);
-               if (!p.getCmdName().empty()) {
-                       setParams(p);
-                       cur.buffer().updateBibfilesCache();
-               } else
-                       cur.noUpdate();
+               InsetCommandParams p(BIBTEX_CODE);
+               try {
+                       if (!InsetCommandMailer::string2params("bibtex", 
+                                       to_utf8(cmd.argument()), p)) {
+                               cur.noUpdate();
+                               break;
+                       }
+               } catch (support::ExceptionMessage const & message) {
+                       if (message.type_ == support::WarningException) {
+                               Alert::warning(message.title_, message.details_);
+                               cur.noUpdate();
+                       } else 
+                               throw message;
+                       break;
+               }
+               setParams(p);
+               cur.buffer().updateBibfilesCache();
                break;
        }
 
@@ -114,18 +135,18 @@ docstring const InsetBibtex::getScreenLabel(Buffer const &) const
 
 namespace {
 
-string normalize_name(Buffer const & buffer, OutputParams const & runparams,
+string normalizeName(Buffer const & buffer, OutputParams const & runparams,
                      string const & name, string const & ext)
 {
        string const fname = makeAbsPath(name, buffer.filePath()).absFilename();
-       if (absolutePath(name) || !isFileReadable(FileName(fname + ext)))
+       if (absolutePath(name) || !FileName(fname + ext).isFileReadable())
                return name;
-       else if (!runparams.nice)
+       if (!runparams.nice)
                return fname;
-       else
-               // FIXME UNICODE
-               return to_utf8(makeRelPath(from_utf8(fname),
-                                          from_utf8(buffer.getMasterBuffer()->filePath())));
+
+       // FIXME UNICODE
+       return to_utf8(makeRelPath(from_utf8(fname),
+                                        from_utf8(buffer.masterBuffer()->filePath())));
 }
 
 }
@@ -169,11 +190,11 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
        for (Tokenizer::const_iterator it = begin; it != end; ++it) {
                docstring const input = trim(*it);
                // FIXME UNICODE
-               string utf8input(to_utf8(input));
+               string utf8input = to_utf8(input);
                string database =
-                       normalize_name(buffer, runparams, utf8input, ".bib");
+                       normalizeName(buffer, runparams, utf8input, ".bib");
                FileName const try_in_file(makeAbsPath(database + ".bib", buffer.filePath()));
-               bool const not_from_texmf = isFileReadable(try_in_file);
+               bool const not_from_texmf = try_in_file.isFileReadable();
 
                if (!runparams.inComment && !runparams.dryrun && !runparams.nice &&
                    not_from_texmf) {
@@ -181,8 +202,8 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
                        // mangledFilename() needs the extension
                        DocFileName const in_file = DocFileName(try_in_file);
                        database = removeExtension(in_file.mangledFilename());
-                       FileName const out_file(makeAbsPath(database + ".bib",
-                                       buffer.getMasterBuffer()->temppath()));
+                       FileName const out_file = makeAbsPath(database + ".bib",
+                                       buffer.masterBuffer()->temppath());
 
                        bool const success = copy(in_file, out_file);
                        if (!success) {
@@ -214,7 +235,6 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
                Alert::warning(_("Export Warning!"),
                               _("There are spaces in the paths to your BibTeX databases.\n"
                                              "BibTeX will be unable to find them."));
-
        }
 
        // Style-Options
@@ -222,19 +242,17 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
        string bibtotoc;
        if (prefixIs(style, "bibtotoc")) {
                bibtotoc = "bibtotoc";
-               if (contains(style, ',')) {
+               if (contains(style, ','))
                        style = split(style, bibtotoc, ',');
-               }
        }
 
        // line count
        int nlines = 0;
 
        if (!style.empty()) {
-               string base =
-                       normalize_name(buffer, runparams, style, ".bst");
+               string base = normalizeName(buffer, runparams, style, ".bst");
                FileName const try_in_file(makeAbsPath(base + ".bst", buffer.filePath()));
-               bool const not_from_texmf = isFileReadable(try_in_file);
+               bool const not_from_texmf = try_in_file.isFileReadable();
                // If this style does not come from texmf and we are not
                // exporting to .tex copy it to the tmp directory.
                // This prevents problems with spaces and 8bit charcaters
@@ -245,7 +263,7 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
                        DocFileName const in_file = DocFileName(try_in_file);
                        base = removeExtension(in_file.mangledFilename());
                        FileName const out_file(makeAbsPath(base + ".bst",
-                                       buffer.getMasterBuffer()->temppath()));
+                                       buffer.masterBuffer()->temppath()));
                        bool const success = copy(in_file, out_file);
                        if (!success) {
                                lyxerr << "Failed to copy '" << in_file
@@ -255,7 +273,7 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
                }
                // FIXME UNICODE
                os << "\\bibliographystyle{"
-                  << from_utf8(latex_path(normalize_name(buffer, runparams, base, ".bst")))
+                  << from_utf8(latex_path(normalizeName(buffer, runparams, base, ".bst")))
                   << "}\n";
                nlines += 1;
        }
@@ -580,7 +598,7 @@ namespace {
 
 // This method returns a comma separated list of Bibtex entries
 void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
-               biblio::BibKeyList & keys, InsetIterator const & /*di*/) const
+               BiblioInfo & keylist, InsetIterator const & /*di*/) const
 {
        vector<FileName> const files = getFiles(buffer);
        for (vector<FileName>::const_iterator it = files.begin();
@@ -695,7 +713,7 @@ void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
                                docstring value;
                                docstring commaNewline;
                                docstring data;
-                               biblio::BibTeXInfo keyvalmap;
+                               BibTeXInfo keyvalmap;
                                keyvalmap.entryType = entryType;
                                
                                bool readNext = removeWSAndComma(ifs);
@@ -722,14 +740,16 @@ void InsetBibtex::fillWithBibKeys(Buffer const & buffer,
 
                                        keyvalmap[name] = value;
                                        data += "\n\n" + value;
-
+                                       keylist.fieldNames.insert(name);
                                        readNext = removeWSAndComma(ifs);
                                }
 
                                // add the new entry
+                               keylist.entryTypes.insert(entryType);
                                keyvalmap.allData = data;
                                keyvalmap.isBibTeX = true;
-                               keys[to_utf8(key)] = keyvalmap;
+                               keyvalmap.bibKey = key;
+                               keylist[key] = keyvalmap;
                        }
                } //< searching '@'
        } //< for loop over files