small fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2301 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/NEWS b/NEWS
index e21dfd9a7280010c270613693a1a4a4c031f8afb..1814ad9d8e3442e01acf4424c689329294068aab 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,52 @@
+What new in version 1.2.0?
+-------------------------
+
+LyX 1.2.0 is the version where many of changes in the 1.1.x series
+begin to really pay off. It should prove to be a very solid base for
+further developments. As of this version, we use (yet another) new
+versionning scheme: next major version will be 1.3.0, and 1.2.x will
+be just incremental fixes (like the fix series used to be for 1.1.5
+and 1.1.6). 
+
+Switch to the so-called 'new' insets:
+
+- floats, footnotes and margin notes are now real insets
+
+- most problems with the new table inset of 1.1.6 have been resolved
+  (memory consumption, spellchecking, search and replace...)
+- TeX mode has been superceded by the 666 (aka ERT) inset, which is
+  foldable
+
+- new graphics inset superceding the older figure inset [will that be
+  OK in 1.2.0?]
+
+- new minipage inset
+
+- notes inset can now contain arbitrary LyX constructs
+
+- new hyphenation break special character to 
+
+The math editor has been mostly rewritten, meaning more stability and
+the following new features:
+
+  [Andre, can you help here?]
+
+Most of the popups have been rewritten in the GUI-I framework:
+
+- [...]
+
+- the kde frontend has been dropped in favour of a new qt2 frontend.
+  Note that only the xforms front is really operational as of this
+  version. 
+
+Other changes include:
+
+- support for natbib for bibliography citations
+
+- updated documentation
+
+- 
+
 What's new in LyX version 1.1.6?
 --------------------------------
 

diff --git a/lib/ChangeLog b/lib/ChangeLog
index adc2ec4d6015b02bcdc300f5ba842877f19ecf4a..745f858ec336452f357861f42c0e742caa987150 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-23  juergen.sp@t-online.de  <Jürgen Spitzmüller>
+
+       * bind/*.bind: add binding for ligature-break-insert
+
 2001-07-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * ui/default.ui: 

diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index 8efd91810c4aa6cc7faf0b35b0ebb286f2d4f1bf..b04653d3243a5e34e610652d46fc59f7ee850453 100644 (file)
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -72,6 +72,7 @@
 \bind "M-S-Right"              "depth-increment"
 \bind "M-S-Left"               "depth-decrement"
 \bind "C-S-space"              "protected-space-insert"
+\bind "C-S-L"                  "ligature-break-insert"
 \bind "C-l"                    "ert-insert"            # 'l' for LaTeX
 
 #bind "F1"                     "help"                  # Not yet implemented!

diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index 5fc5be1554d53f37bc9a3d270f4facaadc464e2d..623132873e9a4efe56bad572a64135b94604bdba 100644 (file)
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -189,6 +189,7 @@
 \bind "C-BackSpace"            "word-delete-backward"
 \bind "M-Return"               "break-paragraph-keep-layout"
 \bind "C-Return"               "break-line"
+\bind "C-S-L"                  "ligature-break-insert"
 \bind "C-space"                        "protected-space-insert"
 \bind "C-period"               "end-of-sentence-period-insert"
 \bind "M-period"               "dots-insert"

diff --git a/lib/bind/sciword.bind b/lib/bind/sciword.bind
index bbfb95e6a71736b4015f65788752a654d9391252..6a6c504c0189f2f4f1550d5e591ae08eac0cdd91 100644 (file)
--- a/lib/bind/sciword.bind
+++ b/lib/bind/sciword.bind
@@ -223,6 +223,7 @@
 \bind "Return"                 "break-paragraph"
 \bind "M-Return"               "break-paragraph-keep-layout"
 \bind "C-Return"               "break-line"
+\bind "C-S-L"                  "ligature-break-insert"
 \bind "C-space"                "protected-space-insert"
 \bind "Escape"                 "cancel"
 \bind "F9"                     "meta-prefix"

diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind
index c1714331f6846b420e1952491b61d8b96c7505de..231f4a26ce65d56cb209fde913f6f0105afef805 100644 (file)
--- a/lib/bind/xemacs.bind
+++ b/lib/bind/xemacs.bind
@@ -199,6 +199,7 @@
 \bind "C-BackSpace"            "word-delete-backward"
 \bind "M-Return"               "break-paragraph-keep-layout"
 \bind "C-Return"               "break-line"
+\bind "C-S-L"                  "ligature-break-insert"
 \bind "C-space"                        "protected-space-insert"
 \bind "C-period"               "end-of-sentence-period-insert"
 \bind "M-period"               "dots-insert"

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 8f3241584074b82519fc93462b4940fbba14d98e..7a9ce5ee076a8a823c524cc7c7a86e0620caa41d 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-21  Yves Bastide  <stid@libd-pc11.univ-bpclermont.fr>
+
+       * insetquotes.C (latex): fix the handling of french double quotes
+       when not using the french pachage.
+
 2001-07-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * insetcollapsable.h: make WidthCollapsed mutable.

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index ecb30cb1433a4d808061ab5390cebab972b196e1..6ae646b0bb1867daede4e22284cbe4726c65fdec 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -254,18 +254,18 @@ int InsetQuotes::latex(Buffer const * buf, ostream & os,
        const int quoteind = quote_index[side_][language_];
        string qstr;
        
-       if (language_ == FrenchQ && times_ == DoubleQ) {
-               if (doclang == "frenchb") {
-                       if (side_ == LeftQ) 
-                               qstr = "\\og "; //the spaces are important here
-                       else 
-                               qstr = " \\fg{}"; //and here
-               } else if (doclang == "french") {
-                       if (side_ == LeftQ) 
-                               qstr = "<< "; //the spaces are important here
-                       else 
-                               qstr = " >>"; //and here
-               }                       
+       if (language_ == FrenchQ && times_ == DoubleQ
+           && doclang == "frenchb") {
+               if (side_ == LeftQ) 
+                       qstr = "\\og "; //the spaces are important here
+               else 
+                       qstr = " \\fg{}"; //and here
+       } else if (language_ == FrenchQ && times_ == DoubleQ
+                  && doclang == "french") {
+               if (side_ == LeftQ) 
+                       qstr = "<< "; //the spaces are important here
+               else 
+                       qstr = " >>"; //and here
        } else if (lyxrc.fontenc == "T1") {
                qstr = latex_quote_t1[times_][quoteind];
 #ifdef DO_USE_DEFAULT_LANGUAGE