X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibtex.cpp;h=8f33a2de3c37ca2c2c1501cc7028aaedac1b0c11;hb=3588f2f69675df8dbf829800b0ed6e4a455c68b4;hp=dc022f1e242670cff834b56ed0bf9c2006a69b33;hpb=840f2baf9185ca50d3ea94b0eea668cd56647d65;p=lyx.git diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp index dc022f1e24..8f33a2de3c 100644 --- a/src/insets/InsetBibtex.cpp +++ b/src/insets/InsetBibtex.cpp @@ -19,6 +19,7 @@ #include "Cursor.h" #include "DispatchResult.h" #include "Encoding.h" +#include "Exporter.h" #include "Format.h" #include "FuncRequest.h" #include "FuncStatus.h" @@ -57,14 +58,17 @@ namespace os = support::os; InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p) : InsetCommand(buf, p) { - buffer().invalidateBibinfoCache(); + buffer().invalidateBibfileCache(); + buffer().removeBiblioTempFiles(); } InsetBibtex::~InsetBibtex() { - if (isBufferLoaded()) + if (isBufferLoaded()) { buffer().invalidateBibfileCache(); + buffer().removeBiblioTempFiles(); + } } @@ -99,13 +103,15 @@ void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd) if (message.type_ == WarningException) { Alert::warning(message.title_, message.details_); cur.noScreenUpdate(); - } else + } else throw message; break; } - // + + cur.recordUndo(); setParams(p); buffer().invalidateBibfileCache(); + buffer().removeBiblioTempFiles(); cur.forceBufferUpdate(); break; } @@ -209,7 +215,7 @@ docstring InsetBibtex::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/) tip += _("all uncited references"); else tip += _("all cited references"); - + if (toc) { tip += ", "; tip += _("included in TOC"); @@ -234,15 +240,7 @@ static string normalizeName(Buffer const & buffer, } -void InsetBibtex::updateBuffer(ParIterator const &, UpdateType) -{ - if (buffer().isBibInfoCacheValid()) - return; - parseBibTeXFiles(); -} - - -int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const +void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const { // the sequence of the commands: // 1. \bibliographystyle{style} @@ -270,6 +268,9 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const odocstringstream dbs; bool didone = false; + // determine the export format + string const tex_format = flavor2format(runparams.flavor); + for (; it != en; ++it) { string utf8input = to_utf8(*it); string database = @@ -285,7 +286,6 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const database = removeExtension(in_file.mangledFileName()); FileName const out_file = makeAbsPath(database + ".bib", buffer().masterBuffer()->temppath()); - bool const success = in_file.copyTo(out_file); if (!success) { lyxerr << "Failed to copy '" << in_file @@ -293,6 +293,7 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const << endl; } } else if (!runparams.inComment && runparams.nice && not_from_texmf) { + runparams.exportdata->addExternalFile(tex_format, try_in_file, database + ".bib"); if (!isValidLaTeXFileName(database)) { frontend::Alert::warning(_("Invalid filename"), _("The following filename will cause troubles " @@ -310,7 +311,7 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const if (didone) dbs << ','; - else + else didone = true; // FIXME UNICODE dbs << from_utf8(latex_path(database)); @@ -335,12 +336,12 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const style = split(style, bibtotoc, ','); } - // line count - int nlines = 0; + if (style == "default") + style = buffer().params().biblio_style; if (!style.empty()) { string base = normalizeName(buffer(), runparams, style, ".bst"); - FileName const try_in_file = + FileName const try_in_file = makeAbsPath(base + ".bst", buffer().filePath()); bool const not_from_texmf = try_in_file.isReadableFile(); // If this style does not come from texmf and we are not @@ -365,7 +366,6 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const os << "\\bibliographystyle{" << from_utf8(latex_path(normalizeName(buffer(), runparams, base, ".bst"))) << "}\n"; - nlines += 1; } // Post this warning only once. @@ -385,7 +385,6 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const btprint = from_ascii("btPrintCited"); os << "\\" << btprint << "\n" << "\\end{btSect}\n"; - nlines += 3; } // bibtotoc-Option @@ -403,13 +402,9 @@ int InsetBibtex::latex(odocstream & os, OutputParams const & runparams) const docstring btprint = getParam("btprint"); if (btprint == "btPrintAll") { os << "\\nocite{*}\n"; - nlines += 1; } os << "\\bibliography{" << db_out << "}\n"; - nlines += 1; } - - return nlines; } @@ -417,9 +412,9 @@ support::FileNameList InsetBibtex::getBibFiles() const { FileName path(buffer().filePath()); support::PathChanger p(path); - + support::FileNameList vec; - + vector bibfilelist = getVectorFromString(getParam("bibfiles")); vector::const_iterator it = bibfilelist.begin(); vector::const_iterator en = bibfilelist.end(); @@ -431,7 +426,7 @@ support::FileNameList InsetBibtex::getBibFiles() const else LYXERR0("Couldn't find " + to_utf8(*it) + " in InsetBibtex::getBibFiles()!"); } - + return vec; } @@ -490,7 +485,7 @@ namespace { /// @return true if a string of length > 0 could be read. /// bool readTypeOrKey(docstring & val, ifdocstream & ifs, - docstring const & delimChars, docstring const & illegalChars, + docstring const & delimChars, docstring const & illegalChars, charCase chCase) { char_type ch; @@ -510,10 +505,10 @@ namespace { // read value bool legalChar = true; - while (ifs && !isSpace(ch) && + while (ifs && !isSpace(ch) && delimChars.find(ch) == docstring::npos && (legalChar = (illegalChars.find(ch) == docstring::npos)) - ) + ) { if (chCase == makeLowerCase) val += lowercase(ch); @@ -521,7 +516,7 @@ namespace { val += ch; ifs.get(ch); } - + if (!legalChar) { ifs.putback(ch); return false; @@ -563,13 +558,13 @@ namespace { return false; // check for field type - if (isDigit(ch)) { + if (isDigitASCII(ch)) { // read integer value do { val += ch; ifs.get(ch); - } while (ifs && isDigit(ch)); + } while (ifs && isDigitASCII(ch)); if (!ifs) return false; @@ -582,33 +577,33 @@ namespace { do { ifs.get(ch); } while (ifs && isSpace(ch)); - + if (!ifs) return false; - + // We now have the first non-whitespace character // We'll collapse adjacent whitespace. bool lastWasWhiteSpace = false; - + // inside this delimited text braces must match. // Thus we can have a closing delimiter only // when nestLevel == 0 int nestLevel = 0; - + while (ifs && (nestLevel > 0 || ch != delim)) { if (isSpace(ch)) { lastWasWhiteSpace = true; ifs.get(ch); continue; } - // We output the space only after we stop getting + // We output the space only after we stop getting // whitespace so as not to output any whitespace // at the end of the value. if (lastWasWhiteSpace) { lastWasWhiteSpace = false; val += ' '; } - + val += ch; // update nesting level @@ -618,7 +613,7 @@ namespace { break; case '}': --nestLevel; - if (nestLevel < 0) + if (nestLevel < 0) return false; break; } @@ -775,13 +770,13 @@ void InsetBibtex::parseBibTeXFiles() const // next char must be an equal sign ifs.get(ch); if (!ifs || ch != '=') { - lyxerr << "BibTeX Parser: No `=' after string name: " << + lyxerr << "BibTeX Parser: No `=' after string name: " << name << "." << std::endl; continue; } if (!readValue(value, ifs, strings)) { - lyxerr << "BibTeX Parser: Unable to read value for string: " << + lyxerr << "BibTeX Parser: Unable to read value for string: " << name << "." << std::endl; continue; } @@ -816,7 +811,7 @@ void InsetBibtex::parseBibTeXFiles() const } ///////////////////////////////////////////// - // now we have a key, so we will add an entry + // now we have a key, so we will add an entry // (even if it's empty, as bibtex does) // // we now read the field = value pairs. @@ -827,13 +822,13 @@ void InsetBibtex::parseBibTeXFiles() const docstring value; docstring data; BibTeXInfo keyvalmap(key, entryType); - + bool readNext = removeWSAndComma(ifs); - + while (ifs && readNext) { // read field name - if (!readTypeOrKey(name, ifs, from_ascii("="), + if (!readTypeOrKey(name, ifs, from_ascii("="), from_ascii("{}(),"), makeLowerCase) || !ifs) break; @@ -879,7 +874,7 @@ void InsetBibtex::parseBibTeXFiles() const FileName InsetBibtex::getBibTeXPath(docstring const & filename, Buffer const & buf) { string texfile = changeExtension(to_utf8(filename), "bib"); - // note that, if the filename can be found directly from the path, + // note that, if the filename can be found directly from the path, // findtexfile will just return a FileName object for that path. FileName file(findtexfile(texfile, "bib")); if (file.empty()) @@ -928,30 +923,27 @@ void InsetBibtex::validate(LaTeXFeatures & features) const // It'd be better to be able to get this from an InsetLayout, but at present // InsetLayouts do not seem really to work for things that aren't InsetTexts. if (features.runparams().flavor == OutputParams::HTML) - features.addPreambleSnippet(""); + "span.bibtexlabel:after{ content: \"] \"; }"); } -// FIXME +// FIXME // docstring InsetBibtex::entriesAsXHTML(vector const & entries) // And then here just: entriesAsXHTML(buffer().masterBibInfo().citedEntries()) docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const { BiblioInfo const & bibinfo = buffer().masterBibInfo(); vector const & cites = bibinfo.citedEntries(); - CiteEngine const engine = buffer().params().citeEngine(); - bool const numbers = - (engine == ENGINE_BASIC || engine == ENGINE_NATBIB_NUMERICAL); + CiteEngineType const engine_type = buffer().params().citeEngineType(); + bool const numbers = (engine_type == ENGINE_TYPE_NUMERICAL); docstring reflabel = from_ascii("References"); Language const * l = buffer().params().language; if (l) reflabel = translateIfPossible(reflabel, l->code()); - + xs << html::StartTag("h2", "class='bibtex'") << reflabel << html::EndTag("h2") @@ -968,7 +960,8 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const xs << html::StartTag("div", "class='bibtexentry'"); // FIXME XHTML // The same name/id problem we have elsewhere. - string const attr = "id='" + to_utf8(entry.key()) + "'"; + string const attr = + "id='LyXCite-" + to_utf8(html::cleanAttr(entry.key())) + "'"; xs << html::CompTag("a", attr); docstring citekey; if (numbers) @@ -992,21 +985,21 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const // FIXME Right now, we are calling BibInfo::getInfo on the key, // which will give us all the cross-referenced info. But for every // entry, so there's a lot of repitition. This should be fixed. - xs << html::StartTag("span", "class='bibtexinfo'") - << XHTMLStream::ESCAPE_AND - << bibinfo.getInfo(entry.key(), buffer(), true) - << html::EndTag("span") - << html::EndTag("div"); - xs.cr(); + xs << html::StartTag("span", "class='bibtexinfo'") + << XHTMLStream::ESCAPE_AND + << bibinfo.getInfo(entry.key(), buffer(), true) + << html::EndTag("span") + << html::EndTag("div") + << html::CR(); } xs << html::EndTag("div"); return docstring(); } -docstring InsetBibtex::contextMenuName() const +string InsetBibtex::contextMenuName() const { - return from_ascii("context-bibtex"); + return "context-bibtex"; }