#include "Format.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
+#include "Language.h"
#include "LaTeXFeatures.h"
-#include "MetricsInfo.h"
#include "output_xhtml.h"
#include "OutputParams.h"
+#include "PDFOptions.h"
#include "TextClass.h"
-#include "TocBackend.h"
#include "frontends/alert.h"
namespace os = support::os;
-InsetBibtex::InsetBibtex(Buffer const & buf, InsetCommandParams const & p)
- : InsetCommand(p, "bibtex")
+InsetBibtex::InsetBibtex(Buffer * buf, InsetCommandParams const & p)
+ : InsetCommand(buf, p)
{
- Inset::setBuffer(const_cast<Buffer &>(buf));
- buffer_->invalidateBibinfoCache();
+ buffer().invalidateBibinfoCache();
}
InsetBibtex::~InsetBibtex()
{
- if (isBufferValid())
- buffer_->invalidateBibinfoCache();
+ if (isBufferLoaded())
+ buffer().invalidateBibfileCache();
}
void InsetBibtex::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_EDIT:
editDatabases();
case LFUN_INSET_MODIFY: {
InsetCommandParams p(BIBTEX_CODE);
try {
- if (!InsetCommand::string2params("bibtex",
- to_utf8(cmd.argument()), p)) {
- cur.noUpdate();
+ if (!InsetCommand::string2params(to_utf8(cmd.argument()), p)) {
+ cur.noScreenUpdate();
break;
}
} catch (ExceptionMessage const & message) {
if (message.type_ == WarningException) {
Alert::warning(message.title_, message.details_);
- cur.noUpdate();
+ cur.noScreenUpdate();
} else
throw message;
break;
}
//
setParams(p);
- buffer().updateBibfilesCache();
+ buffer().invalidateBibfileCache();
+ cur.forceBufferUpdate();
break;
}
bool InsetBibtex::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
- switch (cmd.action) {
+ switch (cmd.action()) {
case LFUN_INSET_EDIT:
flag.setEnabled(true);
return true;
static string normalizeName(Buffer const & buffer,
OutputParams const & runparams, string const & name, string const & ext)
{
- string const fname = makeAbsPath(name, buffer.filePath()).absFilename();
+ string const fname = makeAbsPath(name, buffer.filePath()).absFileName();
if (FileName::isAbsolute(name) || !FileName(fname + ext).isReadableFile())
return name;
if (!runparams.nice)
if (!runparams.inComment && !runparams.dryrun && !runparams.nice &&
not_from_texmf) {
- // mangledFilename() needs the extension
+ // mangledFileName() needs the extension
DocFileName const in_file = DocFileName(try_in_file);
- database = removeExtension(in_file.mangledFilename());
+ database = removeExtension(in_file.mangledFileName());
FileName const out_file = makeAbsPath(database + ".bib",
buffer().masterBuffer()->temppath());
<< "' to '" << out_file << "'"
<< endl;
}
- } else if (!runparams.inComment && runparams.nice && not_from_texmf &&
- !isValidLaTeXFilename(database)) {
+ } else if (!runparams.inComment && runparams.nice && not_from_texmf) {
+ if (!isValidLaTeXFileName(database)) {
frontend::Alert::warning(_("Invalid filename"),
- _("The following filename is likely to cause trouble "
- "when running the exported file through LaTeX: ") +
- from_utf8(database));
+ _("The following filename will cause troubles "
+ "when running the exported file through LaTeX: ") +
+ from_utf8(database));
+ }
+ if (!isValidDVIFileName(database)) {
+ frontend::Alert::warning(_("Problematic filename for DVI"),
+ _("The following filename can cause troubles "
+ "when running the exported file through LaTeX "
+ "and opening the resulting DVI: ") +
+ from_utf8(database), true);
+ }
}
if (didone)
not_from_texmf) {
// use new style name
DocFileName const in_file = DocFileName(try_in_file);
- base = removeExtension(in_file.mangledFilename());
+ base = removeExtension(in_file.mangledFileName());
FileName const out_file = makeAbsPath(base + ".bst",
buffer().masterBuffer()->temppath());
bool const success = in_file.copyTo(out_file);
// bibtotoc-Option
if (!bibtotoc.empty() && !buffer().params().use_bibtopic) {
- if (buffer().params().documentClass().hasLaTeXLayout("chapter")) {
- if (buffer().params().sides == OneSide) {
- // oneside
- os << "\\clearpage";
- } else {
- // twoside
- os << "\\cleardoublepage";
- }
+ // set label for hyperref, see http://www.lyx.org/trac/ticket/6470
+ if (buffer().params().pdfoptions().use_hyperref)
+ os << "\\phantomsection";
+ if (buffer().params().documentClass().hasLaTeXLayout("chapter"))
os << "\\addcontentsline{toc}{chapter}{\\bibname}";
- } else if (buffer().params().documentClass().hasLaTeXLayout("section"))
+ else if (buffer().params().documentClass().hasLaTeXLayout("section"))
os << "\\addcontentsline{toc}{section}{\\refname}";
}
/// @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;
break;
case '}':
--nestLevel;
- if (nestLevel < 0) return false;
+ if (nestLevel < 0)
+ return false;
break;
}
- ifs.get(ch);
+ if (ifs)
+ ifs.get(ch);
}
if (!ifs)
return false;
+ // FIXME Why is this here?
ifs.get(ch);
if (!ifs)
docstring entryType;
if (!readTypeOrKey(entryType, ifs, from_ascii("{("), docstring(), makeLowerCase)) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Error reading entry type." << std::endl;
+ lyxerr << "BibTeX Parser: Error reading entry type." << std::endl;
continue;
}
if (!ifs) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
+ lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
continue;
}
ifs.get(ch);
if (!ifs) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
+ lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
break;
}
if ((ch != '(') && (ch != '{')) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Invalid entry delimiter." << std::endl;
+ lyxerr << "BibTeX Parser: Invalid entry delimiter." << std::endl;
ifs.putback(ch);
continue;
}
docstring value;
if (!readTypeOrKey(name, ifs, from_ascii("="), from_ascii("#{}(),"), makeLowerCase)) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Error reading string name." << std::endl;
+ lyxerr << "BibTeX Parser: Error reading string name." << std::endl;
continue;
}
if (!ifs) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
+ lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
continue;
}
// next char must be an equal sign
ifs.get(ch);
if (!ifs || ch != '=') {
- lyxerr << "InsetBibtex::fillWithBibKeys: No `=' after string name: " <<
+ lyxerr << "BibTeX Parser: No `=' after string name: " <<
name << "." << std::endl;
continue;
}
if (!readValue(value, ifs, strings)) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unable to read value for string: " <<
+ lyxerr << "BibTeX Parser: Unable to read value for string: " <<
name << "." << std::endl;
continue;
}
docstring value;
if (!readValue(value, ifs, strings)) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unable to read preamble value." << std::endl;
+ lyxerr << "BibTeX Parser: Unable to read preamble value." << std::endl;
continue;
}
docstring key;
if (!readTypeOrKey(key, ifs, from_ascii(","), from_ascii("}"), keepCase)) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unable to read key for entry type:" <<
+ lyxerr << "BibTeX Parser: Unable to read key for entry type:" <<
entryType << "." << std::endl;
continue;
}
if (!ifs) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
+ lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
continue;
}
// all items must be separated by a comma. If
// it is missing the scanning of this entry is
// stopped and the next is searched.
- docstring fields;
docstring name;
docstring value;
- docstring commaNewline;
docstring data;
BibTeXInfo keyvalmap(key, entryType);
break;
// next char must be an equal sign
+ // FIXME Whitespace??
ifs.get(ch);
if (!ifs) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unexpected end of file." << std::endl;
+ lyxerr << "BibTeX Parser: Unexpected end of file." << std::endl;
break;
}
if (ch != '=') {
- lyxerr << "InsetBibtex::fillWithBibKeys: Missing `=' after field name: " <<
+ lyxerr << "BibTeX Parser: Missing `=' after field name: " <<
name << ", for key: " << key << "." << std::endl;
ifs.putback(ch);
break;
// read field value
if (!readValue(value, ifs, strings)) {
- lyxerr << "InsetBibtex::fillWithBibKeys: Unable to read value for field: " <<
+ lyxerr << "BibTeX Parser: Unable to read value for field: " <<
name << ", for key: " << key << "." << std::endl;
break;
}
{
if (features.bufferParams().use_bibtopic)
features.require("bibtopic");
+ // FIXME XHTML
+ // 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("<style type=\"text/css\">\n"
+ "div.bibtexentry { margin-left: 2em; text-indent: -2em; }\n"
+ "span.bibtexlabel:before{ content: \"[\"; }\n"
+ "span.bibtexlabel:after{ content: \"] \"; }\n"
+ "</style>");
}
-namespace {
- // used in xhtml to sort a list of BibTeXInfo objects
- bool lSorter(BibTeXInfo const * lhs, BibTeXInfo const * rhs)
- {
- return lhs->getAbbreviatedAuthor() < rhs->getAbbreviatedAuthor();
- }
-}
-
-
-void InsetBibtex::xhtml(odocstream & os, OutputParams const &) const
+// FIXME
+// docstring InsetBibtex::entriesAsXHTML(vector<docstring> const & entries)
+// And then here just: entriesAsXHTML(buffer().masterBibInfo().citedEntries())
+docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
{
- // We are going to collect all the citation keys used in the document,
- // getting them from the TOC.
- Toc const & toc = buffer().tocBackend().toc("citation");
- Toc::const_iterator it = toc.begin();
- Toc::const_iterator en = toc.end();
- vector<docstring> citekeys;
- for (; it != en; ++it) {
- if (it->str().empty())
- continue;
- vector<docstring> keys = getVectorFromString(it->str());
- vector<docstring>::const_iterator dit = keys.begin();
- vector<docstring>::const_iterator den = keys.end();
- for (; dit != den; ++dit)
- citekeys.push_back(*dit);
- }
- if (citekeys.empty())
- return;
- sort(citekeys.begin(), citekeys.end());
- unique(citekeys.begin(), citekeys.end());
- // We now have a sorted, unique list of the keys used in this document.
- // We will now convert it to a list of the BibTeXInfo objects used in
- // this document...
- // FIXME We need to do something here about cross-references, if we
- // want to be able to display them AS cross-references. Probably the
- // easiest thing to do is to loop over the list again and add whatever
- // cross-references we find, then sort and unique it, planning just to
- // add the cross-references to the bibliography.
- vector<BibTeXInfo const *> binfo;
- vector<docstring>::const_iterator cit = citekeys.begin();
- vector<docstring>::const_iterator cen = citekeys.end();
- BiblioInfo const & bi = buffer().masterBibInfo();
- for (; cit != cen; ++cit) {
- BiblioInfo::const_iterator bt = bi.find(*cit);
- if (bt == bi.end())
- continue;
- binfo.push_back(&(bt->second));
- }
- // ...and sort it.
- sort(binfo.begin(), binfo.end(), lSorter);
- // Finally, then, we are ready for output.
- os << "<h2 class='bibliography'>" << _("References") << "</h2>\n";
- os << "<div class='bibliography'>\n";
- vector<BibTeXInfo const *>::const_iterator vit = binfo.begin();
- vector<BibTeXInfo const *>::const_iterator ven = binfo.end();
+ BiblioInfo const & bibinfo = buffer().masterBibInfo();
+ vector<docstring> const & cites = bibinfo.citedEntries();
+ CiteEngine const engine = buffer().params().citeEngine();
+ bool const numbers =
+ (engine == ENGINE_BASIC || engine == ENGINE_NATBIB_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")
+ << html::StartTag("div", "class='bibtex'");
+
// Now we loop over the entries
+ vector<docstring>::const_iterator vit = cites.begin();
+ vector<docstring>::const_iterator const ven = cites.end();
for (; vit != ven; ++vit) {
- BibTeXInfo const * bip = *vit;
- os << "<p class='bibliography'>";
- os << "<a name='" << html::htmlize(bip->key()) << "'></a>";
- docstring label = bip->label();
- if (label.empty())
- label = bip->key();
- os << "<span class='biblabel'>[" << label << "]</span> ";
+ 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='" + to_utf8(entry.key()) + "'";
+ xs << html::CompTag("a", attr);
+ docstring citekey;
+ if (numbers)
+ citekey = entry.citeNumber();
+ else {
+ docstring const auth = entry.getAbbreviatedAuthor();
+ // 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, true);
+ if (!auth.empty() && !year.empty())
+ citekey = auth + ' ' + year;
+ }
+ 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.
- os << "<span class='bibinfo'>" << bi.getInfo(bip->key()) << "</span>";
- os << "</p>\n";
+ // entry, so there's a lot of repitition. This should be fixed.
+ xs << html::StartTag("span", "class='bibtexinfo'")
+ << XHTMLStream::NextRaw()
+ << bibinfo.getInfo(entry.key(), buffer(), true)
+ << html::EndTag("span")
+ << html::EndTag("div");
+ xs.cr();
}
-
- os << "</div>\n";
+ xs << html::EndTag("div");
+ return docstring();
}