small patch from dekel

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@718 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2000-05-05 11:42:00 +00:00
parent 8c818bc598
commit 1b10def63a
3 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2000-05-05 Lars Gullik Bjønnes <larsbj@lyx.org>
* 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 <Jean-Marc.Lasgouttes@inria.fr> 2000-05-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/text.C (draw): do not display an exclamation mark in the * src/text.C (draw): do not display an exclamation mark in the

View File

@ -663,7 +663,6 @@
#\kbmap_secondary hebrew #\kbmap_secondary hebrew
#\latex_command elatex #\latex_command elatex
#\font_encoding default #\font_encoding default
#\number_inset rtl
# You also need to bind a key for switching between Hebrew and English. # You also need to bind a key for switching between Hebrew and English.
# For example, # For example,
@ -687,7 +686,6 @@
#\kbmap true #\kbmap true
#\kbmap_primary null #\kbmap_primary null
#\kbmap_secondary arabic #\kbmap_secondary arabic
#\number_inset false
# You also need to bind a key for switching between Arabic and English. # You also need to bind a key for switching between Arabic and English.
# For example, # For example,

View File

@ -987,7 +987,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
if (next_token == "\\-") { if (next_token == "\\-") {
par->InsertChar(pos, '-'); par->InsertChar(pos, '-');
par->SetFont(pos, font); par->SetFont(pos, font);
} else if (next_token == "\\protected_separator") { } else if (next_token == "\\protected_separator"
|| next_token == '~') {
par->InsertChar(pos, ' '); par->InsertChar(pos, ' ');
par->SetFont(pos, font); par->SetFont(pos, font);
} else { } else {