remove support for epsi; fix size of insetnote button

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 465f6e4fbf0e48d12239f97fc9412206cae8b31d..576536ad5a16fc5e7e46c8d246ffbb59cd72014d 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * configure.m4: remove epsi format
+
 2002-11-22  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * bind/sciword.bind: big update: use menus.bind and maths.bind and

diff --git a/lib/configure.m4 b/lib/configure.m4
index 37b889388a602848dbf99db5338778844a36b223..a8545f0476a78273e48d61382167c512e645204e 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -440,7 +440,6 @@ cat >$outfile <<EOF
 \\Format bmp      bmp  BMP             ""
 \\Format dvi     dvi   DVI             D
 \\Format eps     eps   EPS             ""
-\\Format epsi    epsi  EPSI            ""
 \\Format fax     ""    Fax             ""
 \\Format fig     fig   XFig            ""
 \\Format agr      agr  GRACE           ""
@@ -529,15 +528,6 @@ cat >>$outfile <<EOF
 EOF
 fi
 
-SEARCH_PROG([for an EPSI ->  EPS/XPM converter], EPS2EPS, eps2eps)
-if test "$EPS2EPS" = "eps2eps"; then
-cat >>$outfile <<EOF
-\\converter epsi pdf "epstopdf --outfile=\$\$o \$\$i" ""
-\\converter epsi eps "eps2eps \$\$i \$\$o" ""
-\\converter epsi xpm "eps2eps -sOutputFile=- \$\$i dummy.eps | convert - \$\$o" ""
-EOF
-fi
-
 #### Add Grace conversions (xmgrace needs an Xserver, gracebat doesn't.)
 SEARCH_PROG([for a Grace -> Image converter], GRACE, gracebat)
 if test "$GRACE" = "gracebat"; then

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ff07cea59dc04a0c0a1fcfddfb672dfacc45fc77..8929543485cd95900702afd7d85d54bcaef00c56 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,17 +1,20 @@
-src/buffer.C
-src/bufferlist.C
 src/BufferView.C
-src/bufferview_funcs.C
 src/BufferView_pimpl.C
 src/Chktex.C
-src/converter.C
 src/CutAndPaste.C
+src/LColor.C
+src/LaTeX.C
+src/LyXAction.C
+src/MenuBackend.C
+src/buffer.C
+src/bufferlist.C
+src/bufferview_funcs.C
+src/converter.C
 src/debug.C
 src/exporter.C
 src/ext_l10n.h
-src/frontends/controllers/biblio.C
+src/frontends/LyXView.C
 src/frontends/controllers/ButtonController.h
-src/frontends/controllers/character.C
 src/frontends/controllers/ControlAboutlyx.C
 src/frontends/controllers/ControlBibtex.C
 src/frontends/controllers/ControlCharacter.C
@@ -27,13 +30,13 @@ src/frontends/controllers/ControlSearch.C
 src/frontends/controllers/ControlSpellchecker.C
 src/frontends/controllers/ControlThesaurus.C
 src/frontends/controllers/ControlVCLog.C
+src/frontends/controllers/biblio.C
+src/frontends/controllers/character.C
 src/frontends/controllers/frnt_lang.C
 src/frontends/controllers/helper_funcs.C
 src/frontends/gnome/GLog.C
-src/frontends/LyXView.C
 src/frontends/qt2/Alert_pimpl.C
 src/frontends/qt2/FileDialog.C
-src/frontends/qt2/lengthcombo.C
 src/frontends/qt2/QAbout.C
 src/frontends/qt2/QBibitem.C
 src/frontends/qt2/QBibtex.C
@@ -45,8 +48,8 @@ src/frontends/qt2/QCommandBuffer.C
 src/frontends/qt2/QDelimiterDialog.C
 src/frontends/qt2/QDocument.C
 src/frontends/qt2/QDocumentDialog.C
-src/frontends/qt2/QError.C
 src/frontends/qt2/QERT.C
+src/frontends/qt2/QError.C
 src/frontends/qt2/QExternal.C
 src/frontends/qt2/QExternalDialog.C
 src/frontends/qt2/QFloat.C
@@ -54,8 +57,8 @@ src/frontends/qt2/QGraphics.C
 src/frontends/qt2/QGraphicsDialog.C
 src/frontends/qt2/QInclude.C
 src/frontends/qt2/QIndex.C
-src/frontends/qt2/QLog.C
 src/frontends/qt2/QLPrintDialog.C
+src/frontends/qt2/QLog.C
 src/frontends/qt2/QMathDialog.C
 src/frontends/qt2/QMathMatrixDialog.C
 src/frontends/qt2/QMinipage.C
@@ -78,9 +81,9 @@ src/frontends/qt2/QToc.C
 src/frontends/qt2/QURL.C
 src/frontends/qt2/QVCLog.C
 src/frontends/qt2/QWrap.C
+src/frontends/qt2/lengthcombo.C
 src/frontends/xforms/Alert_pimpl.C
 src/frontends/xforms/ColorHandler.C
-src/frontends/xforms/combox.C
 src/frontends/xforms/FileDialog.C
 src/frontends/xforms/FormAboutlyx.C
 src/frontends/xforms/FormBase.C
@@ -89,8 +92,8 @@ src/frontends/xforms/FormBibtex.C
 src/frontends/xforms/FormCharacter.C
 src/frontends/xforms/FormCitation.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/FormError.C
 src/frontends/xforms/FormERT.C
+src/frontends/xforms/FormError.C
 src/frontends/xforms/FormExternal.C
 src/frontends/xforms/FormFiledialog.C
 src/frontends/xforms/FormFloat.C
@@ -123,14 +126,15 @@ src/frontends/xforms/FormToc.C
 src/frontends/xforms/FormUrl.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/FormWrap.C
-src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C
-src/frontends/xforms/xforms_helpers.C
 src/frontends/xforms/XMiniBuffer.C
+src/frontends/xforms/combox.C
+src/frontends/xforms/input_validators.C
+src/frontends/xforms/xforms_helpers.C
 src/gettext.h
 src/importer.C
-src/insets/insetbib.C
 src/insets/inset.C
+src/insets/insetbib.C
 src/insets/insetcaption.C
 src/insets/inseterror.C
 src/insets/insetert.C
@@ -157,15 +161,12 @@ src/insets/inseturl.C
 src/insets/insetwrap.C
 src/kbsequence.C
 src/language.C
-src/LaTeX.C
-src/LColor.C
 src/lengthcommon.C
-src/LyXAction.C
 src/lyx_cb.C
+src/lyx_main.C
 src/lyxfind.C
 src/lyxfont.C
 src/lyxfunc.C
-src/lyx_main.C
 src/lyxrc.C
 src/lyxtextclasslist.C
 src/lyxvc.C
@@ -174,11 +175,10 @@ src/mathed/formulamacro.C
 src/mathed/math_hullinset.C
 src/mathed/math_parboxinset.C
 src/mathed/ref_inset.C
-src/MenuBackend.C
 src/paragraph.C
 src/support/filetools.C
 src/tabular.C
+src/text.C
 src/text2.C
 src/text3.C
-src/text.C
 src/ext_l10n.h

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 966f0df7085742a7dddbd8265b9e21b99f13b9e7..15f699fb8d37f820bdc03ec209cfc8f19f4456c9 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * insetnote.C (init): make label font smaller
+
 2002-12-04  John Levon  <levon@movementarian.org>
 
        * insetinclude.C: ressurect setting of command name

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index f81d9b64b78b07617ceb1084ae61a5a8d5f49f38..1574c8fbc4834a85c405c160751dcadbc5624fd8 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -33,6 +33,7 @@ void InsetNote::init()
 {
        LyXFont font(LyXFont::ALL_SANE);
        font.decSize();
+       font.decSize();
        font.setColor(LColor::note);
        setLabelFont(font);
        setBackgroundColor(LColor::notebg);

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 56a0b11ca148648af339f964971338a28850f39e..b224f382217eac338bffd46094488b8efbbe4f09 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-04  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * filetools.C (getExtFromContents): remove detection of epsi
+
 2002-12-01  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * several files: ws changes

diff --git a/src/support/filetools.C b/src/support/filetools.C
index ffad788555efd50eb11dd9f222aac972c51d9f07..a52c53adee295a9a7dc8966597101bc96fc5416a 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -993,8 +993,6 @@ string const GetExtension(string const & name)
 // AGR Grace...
 // BMP BM...
 // EPS %!PS-Adobe-3.0 EPSF...
-// EPSI like EPS and with
-//      %%BeginPreview...
 // FIG #FIG...
 // FITS ...BITPIX...
 // GIF GIF...
@@ -1160,22 +1158,6 @@ string const getExtFromContents(string const & filename)
        }
 
        if (!format.empty()) {
-               // if we have eps than epsi is also possible
-               // we have to check for a preview
-               if (format == "eps") {
-                       lyxerr[Debug::GRAPHICS]
-                               << "\teps detected -> test for an epsi ..."
-                               << endl;
-                       while (count++ < max_count) {
-                               if (ifs.eof())
-                                       break;
-                               getline(ifs, str);
-                               if (contains(str, "BeginPreview")) {
-                                       format = "epsi";
-                                       count = max_count;
-                               }
-                       }
-               }
                lyxerr[Debug::GRAPHICS]
                        << "Recognised Fileformat: " << format << endl;
                return format;