anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add BufferParams::bibtexCommand()

Browse Source 
This function returns the real command (either per lyxrc or bufferparam)
This commit is contained in:
Juergen Spitzmueller 2017-01-01 10:49:22 +01:00
parent 5d58bfadbc
commit 8239e66c94
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BufferParams.cpp
View File

@ -3286,6 +3286,18 @@ vector<CitationStyle> BufferParams::citeStyles() const
return styles; return styles;
} }
string const & BufferParams::bibtexCommand() const
{
if (bibtex_command != "default")
return bibtex_command;
else if (encoding().package() == Encoding::japanese)
return lyxrc.jbibtex_command;
else
return lyxrc.bibtex_command;
}
void BufferParams::invalidateConverterCache() const void BufferParams::invalidateConverterCache() const
{ {
pimpl_->isExportCacheValid = false; pimpl_->isExportCacheValid = false;

3
src/BufferParams.h
View File

@ -462,6 +462,9 @@ public:
/// the available citation styles /// the available citation styles
std::vector<CitationStyle> citeStyles() const; std::vector<CitationStyle> citeStyles() const;
/// Return the actual bibtex command (lyxrc or buffer param)
std::string const & bibtexCommand() const;
/// Set the default BibTeX style file for the document /// Set the default BibTeX style file for the document
void setDefaultBiblioStyle(std::string const & s){ biblio_style = s; } void setDefaultBiblioStyle(std::string const & s){ biblio_style = s; }
/// Get the default BibTeX style file from the TextClass /// Get the default BibTeX style file from the TextClass

7
src/graphics/PreviewLoader.cpp
View File

@ -718,12 +718,7 @@ void PreviewLoader::Impl::startLoading(bool wait)
} }
cs << latexparam; cs << latexparam;
if (buffer_.params().bibtex_command != "default") cs << " --bibtex=" << quoteName(buffer_.params().bibtexCommand());
cs << " --bibtex=" << quoteName(buffer_.params().bibtex_command);
else if (buffer_.params().encoding().package() == Encoding::japanese)
cs << " --bibtex=" << quoteName(lyxrc.jbibtex_command);
else
cs << " --bibtex=" << quoteName(lyxrc.bibtex_command);
if (buffer_.params().bufferFormat() == "lilypond-book") if (buffer_.params().bufferFormat() == "lilypond-book")
cs << " --lilypond"; cs << " --lilypond";