On Wed, Mar 26, 2008 at 10:38:42PM -0000, [EMAIL PROTECTED] wrote: > Author: forenr > Date: Wed Mar 26 23:38:41 2008 > New Revision: 23989 > > URL: http://www.lyx.org/trac/changeset/23989 > Log: > Fix bug 4665: > http://bugzilla.lyx.org/show_bug.cgi?id=4665
Jürgen, OK for branch? > Modified: > lyx-devel/trunk/src/output_latex.cpp > > Modified: lyx-devel/trunk/src/output_latex.cpp > URL: > http://www.lyx.org/trac/file/lyx-devel/trunk/src/output_latex.cpp?rev=23989 > ============================================================================== > --- lyx-devel/trunk/src/output_latex.cpp (original) > +++ lyx-devel/trunk/src/output_latex.cpp Wed Mar 26 23:38:41 2008 > @@ -699,16 +699,12 @@ > } > > // 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 (nextpit == 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 (nextpit == 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. > > > _______________________________________________ > Cvslog mailing list > [EMAIL PROTECTED] > http://www.lyx.org/mailman/listinfo/cvslog > -- Enrico
