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

diff --git a/config/ChangeLog b/config/ChangeLog
index 9164d237dcf18070f0d2ee679525833722819855..5a36f4ca1536d4ed8cc060e19f1ee5a3f0ff8de8 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * lyxinclude.m4 (LYX_PATH_XFORMS): do not warn against xforms
+       0.89.5
+
 2001-07-05  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * lyxinclude.m4: remove LYX_CXX_NAMESPACE, LYX_CXX_MUTABLE

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 0ea40ce42b4db265ead5d7fd5fae312cc681a3cf..68bd87704cda76dbe0a8233ecd0860277595cf05 100644 (file)
--- 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 9192b18092ef2e52631aed0ce7f1b2bd80b032c5..2c0119a3aab0c95b6ef57c27f45ccf22fd8f1395 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-13  Yves Bastide  <stid@libd-pc11.univ-bpclermont.fr>
+
+       * lyxrc.C (set_font_norm_type): recognise ISO_8859_15.
+
+       * lyxrc.h: added ISO_8859_15 to enum FontEncoding.
+
 2001-07-18  Dekel Tsur  <dekelts@tau.ac.il>
 
        * buffer.C (readLyXformat2): Add filename to the error dialog

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index d820830910d2ccd39a804dcfc22a7492297f38ae..a47d2c98fbb78f646291891113a7ac5cde4bf263 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-13  Yves Bastide  <stid@libd-pc11.univ-bpclermont.fr>
+
+       * insetquotes.C (dispString): display french guillemets when using
+       ISO8859-15.
+
 2001-07-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * insetcollapsable.h: remove bogus return statements

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 2f917efe2012edc62d703ef1c0ba6e4c7496639f..387e4613338395b0bec93b91cb65e36f58f8f8c6 100644 (file)
--- 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 f93b56f4901fb9992b40235618aadccab9572f85..bc3b7d302ebf40235cff681c85ce36216d338e4b 100644 (file)
--- 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 e5f6dc8d6f7d7e15ca7008f55bf55629a823c0d8..d4f053a978b8dcbd2a922c09015846993f1b0d74 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -251,6 +251,8 @@ enum LyXRCTags {
                ///
                ISO_8859_9,
                ///
+               ISO_8859_15,
+               ///
                OTHER_ENCODING
        };
        ///