The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit a78bed06eb3d9ee0b5644944450bad4fbcfd0474
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Mon May 20 12:31:46 2013 +0200

    revert parts of 53002538 which set wrong local_font

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 697a3b5..0b45b5a 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -573,7 +573,6 @@ void TeXOnePar(Buffer const & buf,
 
        if (style.pass_thru) {
                Font const outerfont = text.outerFont(pit);
-               runparams.local_font = &par.getFirstFontSettings(bparams);
                parStartCommand(par, os, runparams, style);
 
                par.latex(bparams, outerfont, os, runparams, start_pos, 
end_pos);
@@ -810,7 +809,6 @@ void TeXOnePar(Buffer const & buf,
                }
        }
 
-       runparams.local_font = &par.getFirstFontSettings(bparams);
        parStartCommand(par, os, runparams, style);
        Font const outerfont = text.outerFont(pit);
 
@@ -891,7 +889,7 @@ void TeXOnePar(Buffer const & buf,
                // not for ArabTeX
                && (par_language->lang() != "arabic_arabtex"
                    && outer_language->lang() != "arabic_arabtex")
-                    // have we opened and \L or \R environment?
+               // have we opened an \L or \R environment?
                && runparams.local_font != 0
                && runparams.local_font->isRightToLeft() != 
par_language->rightToLeft()
                // are we about to close the language?

-----------------------------------------------------------------------

Summary of changes:
 src/output_latex.cpp |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to