#include "Cursor.h"
#include "DispatchResult.h"
#include "Encoding.h"
+#include "Exporter.h"
#include "Format.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
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();
+ }
}
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;
}
tip += _("all uncited references");
else
tip += _("all cited references");
-
+
if (toc) {
tip += ", ";
tip += _("included in TOC");
}
-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}
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 =
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
<< 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 "
if (didone)
dbs << ',';
- else
+ else
didone = true;
// FIXME UNICODE
dbs << from_utf8(latex_path(database));
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
os << "\\bibliographystyle{"
<< from_utf8(latex_path(normalizeName(buffer(), runparams, base, ".bst")))
<< "}\n";
- nlines += 1;
}
// Post this warning only once.
btprint = from_ascii("btPrintCited");
os << "\\" << btprint << "\n"
<< "\\end{btSect}\n";
- nlines += 3;
}
// bibtotoc-Option
docstring btprint = getParam("btprint");
if (btprint == "btPrintAll") {
os << "\\nocite{*}\n";
- nlines += 1;
}
os << "\\bibliography{" << db_out << "}\n";
- nlines += 1;
}
-
- return nlines;
}
{
FileName path(buffer().filePath());
support::PathChanger p(path);
-
+
support::FileNameList vec;
-
+
vector<docstring> bibfilelist = getVectorFromString(getParam("bibfiles"));
vector<docstring>::const_iterator it = bibfilelist.begin();
vector<docstring>::const_iterator en = bibfilelist.end();
else
LYXERR0("Couldn't find " + to_utf8(*it) + " in InsetBibtex::getBibFiles()!");
}
-
+
return vec;
}
/// @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;
// 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);
val += ch;
ifs.get(ch);
}
-
+
if (!legalChar) {
ifs.putback(ch);
return false;
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;
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
break;
case '}':
--nestLevel;
- if (nestLevel < 0)
+ if (nestLevel < 0)
return false;
break;
}
// 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;
}
}
/////////////////////////////////////////////
- // 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.
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;
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())
// 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"
+ features.addCSSSnippet("div.bibtexentry { margin-left: 2em; text-indent: -2em; }\n"
"span.bibtexlabel:before{ content: \"[\"; }\n"
- "span.bibtexlabel:after{ content: \"] \"; }\n"
- "</style>");
+ "span.bibtexlabel:after{ content: \"] \"; }");
}
-// FIXME
+// FIXME
// docstring InsetBibtex::entriesAsXHTML(vector<docstring> const & entries)
// And then here just: entriesAsXHTML(buffer().masterBibInfo().citedEntries())
docstring InsetBibtex::xhtml(XHTMLStream & xs, OutputParams const &) const
{
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);
+ 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")
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)
// 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";
}
projects / lyx.git / blobdiff