mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-14 09:32:20 +00:00
Revert stupid commit (thanks Andre) and also revert inadvertent commit. My bad.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@24002 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
aff53a5a28
commit
f6d979f582
@ -313,8 +313,11 @@ int InsetBibtex::latex(Buffer const & buffer, odocstream & os,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
vector<FileName> const InsetBibtex::getFiles(Buffer const &) const
|
vector<FileName> const InsetBibtex::getFiles(Buffer const & buffer) const
|
||||||
{
|
{
|
||||||
|
FileName path(buffer.filePath());
|
||||||
|
support::Path p(path);
|
||||||
|
|
||||||
vector<FileName> vec;
|
vector<FileName> vec;
|
||||||
|
|
||||||
string tmp;
|
string tmp;
|
||||||
|
@ -418,16 +418,13 @@ void InsetCitation::textString(Buffer const & buf, odocstream & os) const
|
|||||||
// citations and then changes his mind, turning natbib support off. The output
|
// citations and then changes his mind, turning natbib support off. The output
|
||||||
// should revert to \cite[]{}
|
// should revert to \cite[]{}
|
||||||
int InsetCitation::latex(Buffer const & buffer, odocstream & os,
|
int InsetCitation::latex(Buffer const & buffer, odocstream & os,
|
||||||
OutputParams const & op) const
|
OutputParams const &) const
|
||||||
{
|
{
|
||||||
biblio::CiteEngine cite_engine = buffer.params().getEngine();
|
biblio::CiteEngine cite_engine = buffer.params().getEngine();
|
||||||
// FIXME UNICODE
|
// FIXME UNICODE
|
||||||
docstring const cite_str = from_utf8(
|
docstring const cite_str = from_utf8(
|
||||||
biblio::asValidLatexCommand(getCmdName(), cite_engine));
|
biblio::asValidLatexCommand(getCmdName(), cite_engine));
|
||||||
|
|
||||||
if (op.moving_arg)
|
|
||||||
os << "\\protect";
|
|
||||||
|
|
||||||
os << "\\" << cite_str;
|
os << "\\" << cite_str;
|
||||||
|
|
||||||
docstring const & before = getParam("before");
|
docstring const & before = getParam("before");
|
||||||
|
Loading…
Reference in New Issue
Block a user