X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBibtex.cpp;h=c925bfe3cc9bd3c30c1366c4327a7cbf4837bc2d;hb=e15d3d35cba7266d8a1a22c7e4cd92d12599e103;hp=d0f7636796ab5b527935c23ef832c1491d3c4481;hpb=14e01a92a4a8b3c861bec41d33a1743870844e63;p=lyx.git diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp index d0f7636796..c925bfe3cc 100644 --- a/src/insets/InsetBibtex.cpp +++ b/src/insets/InsetBibtex.cpp @@ -338,7 +338,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 +377,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 +802,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 +883,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 +931,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 +979,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 +997,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; - } - if (citekey.empty()) { - citekey = entry.label(); - if (citekey.empty()) - citekey = entry.key(); + 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"); } - 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.