X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibtex.cpp;h=13c91b0739e6b5a25cb5b853bd6b6991fbf76cd4;hb=860accd01fb8115ec7c6ad80b054f1046e19c62f;hp=26f0de41f90b7920febfe564bf6821a982fb7cf4;hpb=cd17d87e47d522c3c848a49ac63602a0a8a1b635;p=lyx.git diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp index 26f0de41f9..13c91b0739 100644 --- a/src/insets/InsetBibtex.cpp +++ b/src/insets/InsetBibtex.cpp @@ -27,6 +27,7 @@ #include "output_xhtml.h" #include "OutputParams.h" #include "PDFOptions.h" +#include "texstream.h" #include "TextClass.h" #include "frontends/alert.h" @@ -40,7 +41,7 @@ #include "support/gettext.h" #include "support/lstrings.h" #include "support/os.h" -#include "support/Path.h" +#include "support/PathChanger.h" #include "support/textutils.h" #include @@ -103,7 +104,7 @@ void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd) Alert::warning(message.title_, message.details_); cur.noScreenUpdate(); } else - throw message; + throw; break; } @@ -173,21 +174,16 @@ docstring InsetBibtex::screenLabel() const docstring InsetBibtex::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/) const { - docstring item = from_ascii("* "); - docstring tip = _("Databases:") + "\n"; + docstring tip = _("Databases:"); vector bibfilelist = getVectorFromString(getParam("bibfiles")); - if (bibfilelist.empty()) { - tip += item; - tip += _("none"); - } else { - vector::const_iterator it = bibfilelist.begin(); - vector::const_iterator en = bibfilelist.end(); - for (; it != en; ++it) { - tip += item; - tip += *it + "\n"; - } - } + tip += "
    "; + if (bibfilelist.empty()) + tip += "
  • " + _("none") + "
    • "; + else + for (docstring const & bibfile : bibfilelist) + tip += "
  • " + bibfile + "
    • "; + tip += "
"; // Style-Options bool toc = false; @@ -199,14 +195,10 @@ docstring InsetBibtex::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/) style = split(style, bibtotoc, char_type(',')); } - tip += _("Style File:") +"\n"; - tip += item; - if (!style.empty()) - tip += style; - else - tip += _("none"); + tip += _("Style File:"); + tip += "
  • " + (style.empty() ? _("none") : style) + "
"; - tip += "\n" + _("Lists:") + " "; + tip += _("Lists:") + " "; docstring btprint = getParam("btprint"); if (btprint == "btPrintAll") tip += _("all references"); @@ -338,7 +330,7 @@ void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const if (style == "default") style = buffer().params().biblio_style; - if (!style.empty()) { + if (!style.empty() && !buffer().params().use_bibtopic) { string base = normalizeName(buffer(), runparams, style, ".bst"); FileName const try_in_file = makeAbsPath(base + ".bst", buffer().filePath()); @@ -377,7 +369,10 @@ void InsetBibtex::latex(otexstream & os, OutputParams const & runparams) const } if (!db_out.empty() && buffer().params().use_bibtopic) { - os << "\\begin{btSect}{" << db_out << "}\n"; + os << "\\begin{btSect}"; + if (!style.empty()) + os << "[" << style << "]"; + os << "{" << db_out << "}\n"; docstring btprint = getParam("btprint"); if (btprint.empty()) // default @@ -799,7 +794,7 @@ void InsetBibtex::parseBibTeXFiles() const docstring key; if (!readTypeOrKey(key, ifs, from_ascii(","), from_ascii("}"), keepCase)) { - lyxerr << "BibTeX Parser: Unable to read key for entry type:" << + lyxerr << "BibTeX Parser: Unable to read key for entry type:" << entryType << "." << std::endl; continue; } @@ -880,7 +875,7 @@ FileName InsetBibtex::getBibTeXPath(docstring const & filename, Buffer const & b file = FileName(makeAbsPath(texfile, buf.filePath())); return file; } - + bool InsetBibtex::addDatabase(docstring const & db) { @@ -928,44 +923,38 @@ void InsetBibtex::validate(LaTeXFeatures & features) const } -int InsetBibtex::plaintext(odocstream & os, OutputParams const &) const +int InsetBibtex::plaintext(odocstringstream & os, + OutputParams const & op, size_t max_length) const { + docstring const reflabel = buffer().B_("References"); + + // We could output more information here, e.g., what databases are included + // and information about options. But I don't necessarily see any reason to + // do this right now. + if (op.for_tooltip || op.for_toc || op.for_search) { + os << '[' << reflabel << ']' << '\n'; + return PLAINTEXT_NEWLINE; + } + BiblioInfo bibinfo = buffer().masterBibInfo(); bibinfo.makeCitationLabels(buffer()); vector const & cites = bibinfo.citedEntries(); - CiteEngineType const engine_type = buffer().params().citeEngineType(); - bool const numbers = (engine_type == ENGINE_TYPE_NUMERICAL); + size_t start_size = os.str().size(); docstring refoutput; - docstring const reflabel = buffer().B_("References"); - refoutput += reflabel + "\n\n"; // Now we loop over the entries vector::const_iterator vit = cites.begin(); vector::const_iterator const ven = cites.end(); for (; vit != ven; ++vit) { + if (start_size + refoutput.size() >= max_length) + break; BiblioInfo::const_iterator const biit = bibinfo.find(*vit); if (biit == bibinfo.end()) continue; BibTeXInfo const & entry = biit->second; - docstring citekey; - if (numbers) - citekey = entry.citeNumber(); - else { - docstring const auth = entry.getAbbreviatedAuthor(buffer(), false); - // we do it this way so as to access the xref, if necessary - // note that this also gives us the modifier - docstring const year = bibinfo.getYear(*vit, buffer(), true); - if (!auth.empty() && !year.empty()) - citekey = auth + ' ' + year; - } - if (citekey.empty()) { - citekey = entry.label(); - if (citekey.empty()) - citekey = entry.key(); - } - refoutput += "[" + citekey + "] "; + refoutput += "[" + entry.label() + "] "; // 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. @@ -982,9 +971,9 @@ int InsetBibtex::plaintext(odocstream & os, OutputParams const &) const docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const { BiblioInfo const & bibinfo = buffer().masterBibInfo(); - vector const & cites = bibinfo.citedEntries(); - CiteEngineType const engine_type = buffer().params().citeEngineType(); - bool const numbers = (engine_type == ENGINE_TYPE_NUMERICAL); + bool const all_entries = getParam("btprint") == "btPrintAll"; + vector const & cites = + all_entries ? bibinfo.getKeys() : bibinfo.citedEntries(); docstring const reflabel = buffer().B_("References"); @@ -1000,32 +989,19 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const BiblioInfo::const_iterator const biit = bibinfo.find(*vit); if (biit == bibinfo.end()) continue; + BibTeXInfo const & entry = biit->second; - xs << html::StartTag("div", "class='bibtexentry'"); - // FIXME XHTML - // The same name/id problem we have elsewhere. - string const attr = - "id='LyXCite-" + to_utf8(html::cleanAttr(entry.key())) + "'"; - xs << html::CompTag("a", attr); - docstring citekey; - if (numbers) - citekey = entry.citeNumber(); - else { - docstring const auth = entry.getAbbreviatedAuthor(buffer(), false); - // we do it this way so as to access the xref, if necessary - // note that this also gives us the modifier - docstring const year = bibinfo.getYear(*vit, buffer(), true); - if (!auth.empty() && !year.empty()) - citekey = auth + ' ' + year; + string const attr = "class='bibtexentry' id='LyXCite-" + + to_utf8(html::cleanAttr(entry.key())) + "'"; + xs << html::StartTag("div", attr); + + // don't print labels if we're outputting all entries + if (!all_entries) { + xs << html::StartTag("span", "class='bibtexlabel'") + << entry.label() + << html::EndTag("span"); } - if (citekey.empty()) { - citekey = entry.label(); - if (citekey.empty()) - citekey = entry.key(); - } - xs << html::StartTag("span", "class='bibtexlabel'") - << citekey - << html::EndTag("span"); + // 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. @@ -1041,6 +1017,12 @@ docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const } +void InsetBibtex::write(ostream & os) const +{ + params().Write(os, &buffer()); +} + + string InsetBibtex::contextMenuName() const { return "context-bibtex";