Added new FINISED states FINISHED_RIGHT, FINISHED_UP, FINISHED_DOWN.

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index b021e805025398fe3a0a8fcdde22759c2569795b..6bcc718fa42e75f42161e455058137202685bf8e 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -538,15 +538,25 @@ LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
        while (par && par->getDepth() && !tmpfont.resolved()) {
                par = par->outerHook();
                if (par) {
+#ifndef INHERIT_LANGUAGE
+                       tmpfont.realize(textclasslist.
+                                       Style(bparams.textclass,
+                                             par->getLayout()).font);
+#else
                        tmpfont.realize(textclasslist.
                                        Style(bparams.textclass,
                                              par->getLayout()).font, bparams.language);
+#endif
                        par_depth = par->getDepth();
                }
        }
 
-       tmpfont.realize(textclasslist
-                       .TextClass(bparams.textclass)
+#ifndef INHERIT_LANGUAGE
+       tmpfont.realize(textclasslist.TextClass(bparams.textclass)
+                       .defaultfont());
+#else
+       tmpfont.realize(textclasslist.TextClass(bparams.textclass)
                        .defaultfont(), bparams.language);
+#endif
        return tmpfont; 
 }