Small updates

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

diff --git a/ChangeLog b/ChangeLog
index 58148de7aae6c48929cbaefdb8d45f3147677c3f..e1b0e370c6aa60dc906e29672f37b818988decb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-06-06  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * NEWS: update.
+
+       * lib/CREDITS: update entry for Martin Vermeer.
+
+2000-06-06  Dekel Tsur  <dekel@math.tau.ac.il>
+
+       * src/text.C (draw): Draw foreign language bars at the bottom of
+       the row instead of at the baseline.
+
+       * lib/examples/Minipage.lyx: Use the new multi-lingual support.
+
 2000-06-06  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * lib/bind/de_menus.bind: updated
@@ -6,9 +19,6 @@
 
        * forms/lyx.fd: Correct gravity for objects in form_toc and form_ref
 
-2000-06-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
-  
-       * src/bufferlist.C (close): test of buf->getuser() == NULL
 2000-06-05  Dekel Tsur  <dekel@math.tau.ac.il>
 
        * src/menus.C (Limit_string_length): New function
@@ -18,6 +28,7 @@
        * src/paragraph.C (String): Correct result for a paragraph inside
        a footnote.
 
+>>>>>>> 1.359
 2000-06-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/bufferlist.C (close): test of buf->getuser() == NULL

diff --git a/NEWS b/NEWS
index 1e9422def75accc4997cb0dcb95e1f0315c6618b..a0d98eefe183ea787af3e990ad1d0c5cd19c39e1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,20 +21,30 @@ User-visible changes:
 - Right-to-Left support for Hebrew and Arabic, this is a first attempt
   only and is likely to improve in future versions.
 
-- New visual feedback for environment depth of paragraphs (also the !
-  in the margin for margin notes has been removed). 
-
 - Per-paragraph spacing, currently only settable from the
   command-line/window:
       paragraph-spacing (default,single,onehalf,double,other) [float]
 
-- More accurate error reporting from LaTeX runs.
+- New visual feedback for environment depth of paragraphs (also the !
+  in the margin for margin notes has been removed). 
+
+- End-of-proof box, for layouts where it makes sense.
+
+- labels are now editable (not in equations, though).
 
 - Much faster spellchecking (50x faster!).
 
+- The parsing of the LaTex log has improved flagging more errors that
+  earlier versions of LyX did not see at all. So if you suddenly have
+  errors in documents that used to have none, this might be the casue.
+  (And you probably had the error always.)
+
 - Better definition for LyXList style.
 
-- End-of-proof box, for layouts where it makes sense.
+- hollywood.layout and broadway.layout have improved. New classes
+  LLNCS (Lecture Notes in Computer Science), svjog (Journal of Geodesy)
+
+- support for varioref and pretty ref (preliminary support)
 
 - A couple of changes to the LyX format, so that files written with
   1.1.5 will not be parsed correctly by older LyX versions if protected
@@ -54,14 +64,6 @@ User-visible changes:
   by lyx should be stored, and \override_x_deadkeys to tell whether 
   lyx should provide its own accent keys handling (default is true). 
 
-- hollywood.layout and broadway.layout have improved.
-
-- support for varioref and pretty ref (preliminary support)
-
-- The parsing of the LaTex log has improved flagging more errors that
-  earlier versions of LyX did not see at all. So if you suddenly have
-  errors in documents that used to have none, this might be the casue.
-  (And you probably had the error always.)
 
 What's new in LyX version 1.1.4?
 --------------------------------

diff --git a/lib/CREDITS b/lib/CREDITS
index 3acc5bc329bd81269952f7ea1f404a9899941ded..3aab2e421daa82174aa5150c50b548e1ea0af225 100644 (file)
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -163,7 +163,7 @@
    turkish kbmaps
 @bMartin Vermeer
 @iE-mail: mv@fgi.fi
-   ejour2 document class
+   svjour/svjog, egs and llncs document classes
 @bJuergen Vigna
 @iE-mail: jug@sad.it
    Fax- and Ascii-Export support

diff --git a/lib/examples/Minipage.lyx b/lib/examples/Minipage.lyx
index 944a4b1f8fc227f067c4a50f623685de38e93331..7c87e6f282e3bc28391866054e3ad762f18662d9 100644 (file)
--- a/lib/examples/Minipage.lyx
+++ b/lib/examples/Minipage.lyx
@@ -1,6 +1,5 @@
-#This file was created by <larsbj> Sun Dec  5 17:47:25 1999
-#LyX 1.0 (C) 1995-1999 Matthias Ettrich and the LyX Team
-\lyxformat 2.15
+#LyX 1.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 2.16
 \textclass article
 \language default
 \inputencoding latin1
@@ -238,27 +237,30 @@ I use the following when I have to write bilingual text (I live in a region
 \layout Standard
 \pextra_type 2 \pextra_alignment 0 \pextra_hfill 1 \pextra_start_minipage 1 \pextra_widthp 45
 
+
+\lang german
 Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.
- Dies ist ein deut\SpecialChar \-
-scher Text.
- Dies ist ein deut\SpecialChar \-
-scher Text.
  Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.
- Dies ist ein deut\SpecialChar \-
-scher Text
+ Dies ist ein deutscher Text.
+ Dies ist ein deutscher Text.
+ Dies ist ein deutscher Text
 \begin_float footnote 
 \layout Standard
 
+
+\lang german
 Dies ist eine Fußnote
 \end_float 
+
+\lang german
 .
  Dies ist ein deutscher Text.
  Dies ist ein deutscher Text.

diff --git a/po/de.po b/po/de.po
index 6962f7f00f845202645650543636bb8e5d1274a8..2cddce9af4c599a2dd21352a342f2f5555b339af 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5422,3 +5422,6 @@ msgstr "Die Tabelle kann nicht ausgeschnitten werden."
 #: src/text.C:4624
 msgid "Float would include float!"
 msgstr "Float Objekt würde ein weiteres enthalten!"
+
+#~ msgid "EM|aA#a#A"
+#~ msgstr "EM|Ii#i#I"

diff --git a/src/text.C b/src/text.C
index fdcff33627b4be4797984305c9fe6e566568a660..f5739615e80d7bb9c37b027184ddea643f9096ee 100644 (file)
--- a/src/text.C
+++ b/src/text.C
@@ -551,7 +551,7 @@ void LyXText::draw(Row const * row,
 
                if (lyxrc.mark_foreign_language &&
                    font.language() != buffer->params.language_info) {
-                       int y = offset + row->baseline + 2;
+                       int y = offset + row->height - 1;
                        pain.line(int(tmpx), y, int(x), y,
                                  LColor::language);
                }
@@ -643,7 +643,7 @@ void LyXText::draw(Row const * row,
                
        } else if (lyxrc.mark_foreign_language &&
            font.language() != buffer->params.language_info) {
-               int y = offset + row->baseline + 2;
+               int y = offset + row->height - 1;
                pain.line(int(tmpx), y, int(x), y,
                          LColor::language);
        }