From 7d4d2f9a1aeb977128bcee9ea4abfbc0398b1171 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 18 Jul 2001 16:33:26 +0000 Subject: [PATCH] latin9 update ; do not warn against xforms 0.89.5 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2273 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 5 +++++ config/lyxinclude.m4 | 2 +- src/ChangeLog | 6 ++++++ src/insets/ChangeLog | 5 +++++ src/insets/insetquotes.C | 3 ++- src/lyxrc.C | 2 ++ src/lyxrc.h | 2 ++ 7 files changed, 23 insertions(+), 2 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 9164d237dc..5a36f4ca15 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2001-07-18 Jean-Marc Lasgouttes + + * lyxinclude.m4 (LYX_PATH_XFORMS): do not warn against xforms + 0.89.5 + 2001-07-05 Jean-Marc Lasgouttes * lyxinclude.m4: remove LYX_CXX_NAMESPACE, LYX_CXX_MUTABLE diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 0ea40ce42b..68bd87704c 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -609,7 +609,7 @@ case "$lyx_cv_xfversion" in Version $lyx_cv_xfversion of xforms is not compatible with LyX. This version of LyX works best with versions 0.88 (recommended) and later.) ;; 0.88*) ;; - 0.89[012345]) LYX_WARNING(dnl + 0.89[01234]) LYX_WARNING(dnl LyX should work ok with version $lyx_cv_xfversion of xforms[,] but it is an unproven version and might still have some bugs. You should probably use version 0.89.6 (or 0.88) instead) ;; diff --git a/src/ChangeLog b/src/ChangeLog index 9192b18092..2c0119a3aa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-07-13 Yves Bastide + + * lyxrc.C (set_font_norm_type): recognise ISO_8859_15. + + * lyxrc.h: added ISO_8859_15 to enum FontEncoding. + 2001-07-18 Dekel Tsur * buffer.C (readLyXformat2): Add filename to the error dialog diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index d820830910..a47d2c98fb 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,8 @@ +2001-07-13 Yves Bastide + + * insetquotes.C (dispString): display french guillemets when using + ISO8859-15. + 2001-07-18 Jean-Marc Lasgouttes * insetcollapsable.h: remove bogus return statements diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C index 2f917efe20..387e461333 100644 --- a/src/insets/insetquotes.C +++ b/src/insets/insetquotes.C @@ -152,7 +152,8 @@ string const InsetQuotes::dispString() const if (times == InsetQuotes::DoubleQ) disp += disp; - if (lyxrc.font_norm_type == LyXRC::ISO_8859_1) + if (lyxrc.font_norm_type == LyXRC::ISO_8859_1 + || lyxrc.font_norm_type == LyXRC::ISO_8859_15) if (disp == "<<") disp = '«'; else if (disp == ">>") diff --git a/src/lyxrc.C b/src/lyxrc.C index f93b56f490..bc3b7d302e 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1608,6 +1608,8 @@ void LyXRC::set_font_norm_type() font_norm_type = ISO_8859_6_8; else if (font_norm == "iso8859-9") font_norm_type = ISO_8859_9; + else if (font_norm == "iso8859-15") + font_norm_type = ISO_8859_15; else font_norm_type = OTHER_ENCODING; } diff --git a/src/lyxrc.h b/src/lyxrc.h index e5f6dc8d6f..d4f053a978 100644 --- a/src/lyxrc.h +++ b/src/lyxrc.h @@ -251,6 +251,8 @@ enum LyXRCTags { /// ISO_8859_9, /// + ISO_8859_15, + /// OTHER_ENCODING }; /// -- 2.39.2