From 1b10def63a57bfbec24d31b551115d0d610d9759 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 5 May 2000 11:42:00 +0000 Subject: [PATCH] small patch from dekel git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@718 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 7 +++++++ lib/lyxrc.example | 2 -- src/buffer.C | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d089185317..8e467d424b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-05-05 Lars Gullik Bjønnes + + * lib/lyxrc.example: remove obsolete entries. + + * src/buffer.C (parseSingleLyXformat2Token): patch from dekel, fix + reading of protected_separator for free_spacing. + 2000-05-05 Jean-Marc Lasgouttes * src/text.C (draw): do not display an exclamation mark in the diff --git a/lib/lyxrc.example b/lib/lyxrc.example index f62490d27a..d9ef76062e 100644 --- a/lib/lyxrc.example +++ b/lib/lyxrc.example @@ -663,7 +663,6 @@ #\kbmap_secondary hebrew #\latex_command elatex #\font_encoding default -#\number_inset rtl # You also need to bind a key for switching between Hebrew and English. # For example, @@ -687,7 +686,6 @@ #\kbmap true #\kbmap_primary null #\kbmap_secondary arabic -#\number_inset false # You also need to bind a key for switching between Arabic and English. # For example, diff --git a/src/buffer.C b/src/buffer.C index c3b8900d65..c7d38d9a50 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -987,7 +987,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par, if (next_token == "\\-") { par->InsertChar(pos, '-'); par->SetFont(pos, font); - } else if (next_token == "\\protected_separator") { + } else if (next_token == "\\protected_separator" + || next_token == '~') { par->InsertChar(pos, ' '); par->SetFont(pos, font); } else { -- 2.39.2