anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 4665:

Browse Source 
http://bugzilla.lyx.org/show_bug.cgi?id=4665


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@24090 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2008-04-01 21:07:38 +00:00
parent 70ba715571
commit 31ce8f79de
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/output_latex.cpp
View File

@ -684,16 +684,12 @@ TeXOnePar(Buffer const & buf,
}
// If this is the last paragraph, and a local_font was set upon entering
// the inset, the encoding should be set back to that local_font's
// encoding. We don't use switchEncoding(), because no explicit encoding
// switch command is needed, since latex will automatically revert to it
// when this inset closes.
// This switch is only necessary if we're using "auto" or "default"
// encoding.
if (boost::next(pit) == paragraphs.end() && runparams_in.local_font != 0) {
// the inset, and we're using "auto" or "default" encoding, the encoding
// should be set back to that local_font's encoding.
if (boost::next(pit) == paragraphs.end() && runparams_in.local_font != 0
&& (bparams.inputenc == "auto" || bparams.inputenc == "default")) {
runparams_in.encoding = runparams_in.local_font->language()->encoding();
if (bparams.inputenc == "auto" || bparams.inputenc == "default")
os << setEncoding(runparams_in.encoding->iconvName());
os << setEncoding(runparams_in.encoding->iconvName());
}
// Otherwise, the current encoding should be set for the next paragraph.

3
status.15x
View File

@ -93,6 +93,9 @@ What's new
- Move \label{} outside of listings option caption={} because the listings
package prefers a separate label={} option.
- After an inset, don't always revert to the language's default encoding for
latex output, but honor that specified in the document settings (bug 4665).
* USER INTERFACE: