From c55ff9a13d5baaadc29fe07d5b0d3e4f791fbc78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Vigna?= Date: Thu, 11 Apr 2002 13:35:03 +0000 Subject: [PATCH] Fixed \foreignlanguage outputs and small fix to x return on ERTInsets Button. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3969 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/ChangeLog | 2 ++ src/insets/ChangeLog | 4 ++++ src/insets/insetert.C | 1 - src/lyxfont.C | 2 +- src/paragraph.C | 12 +++++++++--- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 564ac4e52c..b1fc3c0582 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2002-04-11 Juergen Vigna + * paragraph.C (simpleTeXOnePar): fix closing of foreignlanguage tags. + * BufferView2.C (showLockedInsetCursor): use iy (fitLockedInsetCursor): ditto diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index da6133186a..cecce08e65 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,7 @@ +2002-04-11 Juergen Vigna + + * insetert.C (draw): fix the x return for collapsed version. + 2002-04-07 Herbert Voss * insetgraphic.C (readFigInset): fix bug with subcaption and diff --git a/src/insets/insetert.C b/src/insets/insetert.C index abfad1d8db..8471c83579 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -567,7 +567,6 @@ void InsetERT::draw(BufferView * bv, LyXFont const & f, if (!isOpen()) { draw_collapsed(pain, baseline, x); - x += TEXT_TO_INSET_OFFSET; return; } diff --git a/src/lyxfont.C b/src/lyxfont.C index 3a3b3f845b..4958015021 100644 --- a/src/lyxfont.C +++ b/src/lyxfont.C @@ -814,7 +814,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base, bool env = false; if (language()->babel() != base.language()->babel() && - language()->babel() != prev.language()->babel()) { + language() != prev.language()) { if (isRightToLeft() != prev.isRightToLeft()) { if (isRightToLeft()) { os << "\\R{"; diff --git a/src/paragraph.C b/src/paragraph.C index ae7a8a0f04..c702876d1d 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -1633,7 +1633,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, // Fully instantiated font LyXFont font = getFont(bparams, i); - LyXFont const & last_font = running_font; + LyXFont const last_font = running_font; // Spaces at end of font change are simulated to be // outside font change, i.e. we write "\textXX{text} " @@ -1647,7 +1647,10 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, } // We end font definition before blanks - if (font != running_font && open_font) { + if (open_font && + (font != running_font || + font.language() != running_font.language())) + { column += running_font.latexWriteEndChanges(os, basefont, (i == main_body-1) ? basefont : font); @@ -1665,7 +1668,10 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, } // Do we need to change font? - if (font != running_font && i != main_body - 1) { + if ((font != running_font || + font.language() != running_font.language()) && + i != main_body - 1) + { column += font.latexWriteStartChanges(os, basefont, last_font); running_font = font; -- 2.39.2