* InsetListings.cpp:

- do not switch the encoding with XeTeX (bug #6766)
	- some minor formatting

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34649 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2010-06-14 12:13:36 +00:00
parent c2e4c79f6e
commit 143ea9b490

View File

@ -73,7 +73,8 @@ Inset::DisplayType InsetListings::display() const
void InsetListings::updateBuffer(ParIterator const & it, UpdateType utype)
{
Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
Counters & cnts =
buffer().masterBuffer()->params().documentClass().counters();
string const saveflt = cnts.current_float();
// Tell to captions what the current float is
@ -141,9 +142,11 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
bool encoding_switched = false;
Encoding const * const save_enc = runparams.encoding;
if (!runparams.encoding->hasFixedWidth()) {
// We need to switch to a singlebyte encoding, since the listings
// package cannot deal with multiple-byte-encoded glyphs
if (runparams.flavor != OutputParams::XETEX
&& !runparams.encoding->hasFixedWidth()) {
// We need to switch to a singlebyte encoding, since the
// listings package cannot deal with multi-byte-encoded
// glyphs (not needed with XeTeX).
Language const * const outer_language =
(runparams.local_font != 0) ?
runparams.local_font->language()