math-space; fixes to include inset dialog; autoconfiguration of gfx converters

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2b056c026716952da185b7e1b9013bdc1d673b04..9de9c5ae4b666cce14c1552f22c30e75e9725ddd 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-25  André Pönitz <poenitz@gmx.net>
+
+       * bind/math.bind:  new LFUN 'math-space'
+
+2001-07-23  Baruch Even <baruch@lyx.org>
+
+       * configure.m4: Added conversion of images support, used when
+       exporting images in formats (PDF)Latex cannot handle directly.
+
 2001-07-25  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * Makefile.am (dist-hook): only try to get lyxdoc if not already

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index c732b75f2c95b8b0d76c1f3c9ac488c7a4f8605a..3fe77e076c29bf0d4dac81bce2d2700c92d425d6 100644 (file)
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -90,9 +90,10 @@
 # Note: it's easy to insert binary relations like \pm, \mp, \neq, \geq, 
 # and \leq just by typing them. However it's easier to remember these:
 
-\bind "M-m ~S-plus"            "math-insert pm" 
-\bind "M-m ~S-equal"           "math-insert neq"
+\bind "M-m ~S-plus"    "math-insert pm" 
+\bind "M-m ~S-equal"   "math-insert neq"
 
-\bind "Escape"                 "escape"
-\bind "C-Tab"                  "tab-insert"
+\bind "Escape"         "escape"
+\bind "C-Tab"          "tab-insert"
+\bind "M-m space"      "math-space"
 

diff --git a/lib/configure.m4 b/lib/configure.m4
index 6cfa32a414bbb2f687d471e792ba447f465f0109..35c13144ff74165df630d362cf7ffa2956d2e764 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -331,6 +331,19 @@ case $TOHTML in
       hevea) latex_to_html_command="hevea -s \$\$i";;
 esac
 
+#### Search for image conversion ####
+SEARCH_PROG([for an Image -> EPS converter], TOEPS, convert pnmtops)
+case $TOEPS in
+       convert) gif_to_eps="convert GIF:\$\$i EPS:\$\$o" png_to_eps="convert PNG:\$\$i EPS:\$\$o" jpg_to_eps="convert JPG:\$\$i EPS:\$\$o";;
+       pnmtops) gif_to_eps="giftopnm \$\$i | pnmtops > \$\$o" png_to_eps="pngtopnm \$\$i | pnmtops >\$\$o" jpg_to_eps="jpegtopnm \$\$i | pnmtops >\$\$o";;
+esac
+
+SEARCH_PROG([for a GIF -> PNG converter], TOPNG, convert pnmtopng)
+case $TOPNG in
+       convert) gif_to_png="convert GIF:\$\$i PNG:\$\$o" eps_to_png="convert EPS:\$\$i PNG:\$\$o" jpg_to_png="convert JPG:\$\$i PNG:\$\$o";;
+       pnmtopng) gif_to_png="giftopnm \$\$i | pnmtopng >\$\$o" eps_to_png="pstopnm \$\$i| pnmtopng >\$\$o" jpg_to_png="jpegtopnm \$\$i | pnmtopng >\$\$o";;
+esac
+
 #### Explore the LaTeX configuration
 MSG_CHECKING(LaTeX configuration)
 # First, remove the files that we want to re-create
@@ -423,7 +436,6 @@ cat >lyxrc.defaults <<EOF
 \\Format program  ""   Program         ""
 \\Format word    doc   Word            W
 
-
 \\converter latex dvi "$LATEX \$\$i" "latex"
 \\converter latex pdf2 "$PDFLATEX \$\$i" "latex"
 \\converter latex html "$latex_to_html_command" "originaldir,needaux"
@@ -444,10 +456,13 @@ cat >lyxrc.defaults <<EOF
 \\converter html latex "$html_to_latex_command" ""
 \\converter word latex "$word_to_latex_command" ""
 
-\converter gif eps "$image_command" ""
-\converter png eps "$image_command" ""
-\converter jpg eps "$image_command" ""
-\converter gif png "$image_command" ""
+\\converter gif eps "$gif_to_eps" ""
+\\converter png eps "$png_to_eps" ""
+\\converter jpg eps "$jpg_to_eps" ""
+
+\\converter gif png "$gif_to_png" ""
+\\converter eps png "$eps_to_png" ""
+\\converter jpg png "$jpg_to_png" ""
 
 \\viewer dvi "$DVI_VIEWER"
 \\viewer html "$HTML_VIEWER"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1e07b1cca4c6e63a6e6eb2afffe7360c54d95b13..a9fb9d2c25ae53c05444a375e4f26603b20c715d 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,8 +10,8 @@ src/CutAndPaste.C
 src/debug.C
 src/exporter.C
 src/ext_l10n.h
-src/figure_form.C
 src/figureForm.C
+src/figure_form.C
 src/FontLoader.C
 src/frontends/controllers/biblio.C
 src/frontends/controllers/ButtonController.h
@@ -32,6 +32,47 @@ src/frontends/gnome/FormPrint.C
 src/frontends/gnome/FormRef.C
 src/frontends/gnome/FormToc.C
 src/frontends/gnome/Menubar_pimpl.C
+src/frontends/kde/citationdlg.C
+src/frontends/kde/dlg/citationdlgdata.C
+src/frontends/kde/dlg/copyrightdlgdata.C
+src/frontends/kde/dlg/docdlgdata.C
+src/frontends/kde/dlg/docextradlgdata.C
+src/frontends/kde/dlg/docgeometrydlgdata.C
+src/frontends/kde/dlg/doclanguagedlgdata.C
+src/frontends/kde/dlg/docsettingsdlgdata.C
+src/frontends/kde/dlg/indexdlgdata.C
+src/frontends/kde/dlg/lengthentry.C
+src/frontends/kde/dlg/logdlgdata.C
+src/frontends/kde/dlg/paraabovedlgdata.C
+src/frontends/kde/dlg/parabelowdlgdata.C
+src/frontends/kde/dlg/paradlgdata.C
+src/frontends/kde/dlg/paraextradlgdata.C
+src/frontends/kde/dlg/parageneraldlgdata.C
+src/frontends/kde/dlg/printdlgdata.C
+src/frontends/kde/dlg/tabcreatedlgdata.C
+src/frontends/kde/docdlg.C
+src/frontends/kde/FileDialog.C
+src/frontends/kde/FormCitation.C
+src/frontends/kde/FormCopyright.C
+src/frontends/kde/FormDocument.C
+src/frontends/kde/FormIndex.C
+src/frontends/kde/FormLog.C
+src/frontends/kde/FormParagraph.C
+src/frontends/kde/FormPrint.C
+src/frontends/kde/FormRef.C
+src/frontends/kde/FormTabularCreate.C
+src/frontends/kde/FormToc.C
+src/frontends/kde/FormUrl.C
+src/frontends/kde/FormVCLog.C
+src/frontends/kde/indexdlg.C
+src/frontends/kde/paradlg.C
+src/frontends/kde/paraextradlg.C
+src/frontends/kde/parageneraldlg.C
+src/frontends/kde/printdlg.C
+src/frontends/kde/refdlg.C
+src/frontends/kde/tabcreatedlg.C
+src/frontends/kde/tocdlg.C
+src/frontends/kde/urldlg.C
 src/frontends/qt2/FileDialog.C
 src/frontends/qt2/FormCharacter.C
 src/frontends/qt2/FormCitation.C
@@ -49,67 +90,67 @@ src/frontends/qt2/paragraphdlgimpl.C
 src/frontends/qt2/tabularcreatedlgimpl.C
 src/frontends/xforms/combox.C
 src/frontends/xforms/FileDialog.C
-src/frontends/xforms/form_aboutlyx.C
 src/frontends/xforms/FormAboutlyx.C
-src/frontends/xforms/form_bibitem.C
+src/frontends/xforms/form_aboutlyx.C
 src/frontends/xforms/FormBibitem.C
-src/frontends/xforms/form_bibtex.C
+src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibtex.C
+src/frontends/xforms/form_bibtex.C
 src/frontends/xforms/form_browser.C
-src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCharacter.C
-src/frontends/xforms/form_citation.C
+src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCitation.C
-src/frontends/xforms/form_document.C
+src/frontends/xforms/form_citation.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/form_error.C
+src/frontends/xforms/form_document.C
 src/frontends/xforms/FormError.C
-src/frontends/xforms/form_external.C
+src/frontends/xforms/form_error.C
 src/frontends/xforms/FormExternal.C
-src/frontends/xforms/form_filedialog.C
+src/frontends/xforms/form_external.C
 src/frontends/xforms/FormFiledialog.C
-src/frontends/xforms/form_graphics.C
+src/frontends/xforms/form_filedialog.C
 src/frontends/xforms/FormGraphics.C
-src/frontends/xforms/form_include.C
+src/frontends/xforms/form_graphics.C
 src/frontends/xforms/FormInclude.C
-src/frontends/xforms/form_index.C
+src/frontends/xforms/form_include.C
 src/frontends/xforms/FormIndex.C
+src/frontends/xforms/form_index.C
 src/frontends/xforms/FormLog.C
 src/frontends/xforms/FormMathsBitmap.C
-src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDeco.C
-src/frontends/xforms/form_maths_delim.C
+src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDelim.C
-src/frontends/xforms/form_maths_matrix.C
+src/frontends/xforms/form_maths_delim.C
 src/frontends/xforms/FormMathsMatrix.C
-src/frontends/xforms/form_maths_panel.C
+src/frontends/xforms/form_maths_matrix.C
 src/frontends/xforms/FormMathsPanel.C
-src/frontends/xforms/form_maths_space.C
+src/frontends/xforms/form_maths_panel.C
 src/frontends/xforms/FormMathsSpace.C
-src/frontends/xforms/form_minipage.C
+src/frontends/xforms/form_maths_space.C
 src/frontends/xforms/FormMinipage.C
-src/frontends/xforms/form_paragraph.C
+src/frontends/xforms/form_minipage.C
 src/frontends/xforms/FormParagraph.C
-src/frontends/xforms/form_preamble.C
+src/frontends/xforms/form_paragraph.C
 src/frontends/xforms/FormPreamble.C
-src/frontends/xforms/form_preferences.C
+src/frontends/xforms/form_preamble.C
 src/frontends/xforms/FormPreferences.C
-src/frontends/xforms/form_print.C
+src/frontends/xforms/form_preferences.C
 src/frontends/xforms/FormPrint.C
-src/frontends/xforms/form_ref.C
+src/frontends/xforms/form_print.C
 src/frontends/xforms/FormRef.C
-src/frontends/xforms/form_search.C
+src/frontends/xforms/form_ref.C
 src/frontends/xforms/FormSearch.C
-src/frontends/xforms/form_spellchecker.C
+src/frontends/xforms/form_search.C
 src/frontends/xforms/FormSpellchecker.C
-src/frontends/xforms/form_tabular.C
+src/frontends/xforms/form_spellchecker.C
 src/frontends/xforms/FormTabular.C
-src/frontends/xforms/form_tabular_create.C
+src/frontends/xforms/form_tabular.C
 src/frontends/xforms/FormTabularCreate.C
-src/frontends/xforms/form_toc.C
+src/frontends/xforms/form_tabular_create.C
 src/frontends/xforms/FormToc.C
-src/frontends/xforms/form_url.C
+src/frontends/xforms/form_toc.C
 src/frontends/xforms/FormUrl.C
+src/frontends/xforms/form_url.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C
@@ -130,7 +171,6 @@ src/insets/insetfoot.C
 src/insets/insetgraphics.C
 src/insets/insetinclude.C
 src/insets/insetindex.C
-src/insets/insetinfo.C
 src/insets/insetlabel.C
 src/insets/insetlist.C
 src/insets/insetmarginal.C

diff --git a/src/ChangeLog b/src/ChangeLog
index 66a690e6d53fa1e18538dc1a635592eab1d79419..b37a54c5cf50261ae1cf5c0e04173c356495f740 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-25  André Pönitz <poenitz@gmx.net>
+
+       * commandtags.h:
+       * LyXAction.C:
+       * lyxfunc.C:  new LFUN 'math-space'
+
 2001-07-25  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
        * text2.C (toggleInset): call open/close

diff --git a/src/LyXAction.C b/src/LyXAction.C
index c989a869f6844003c40ba115558a658b8870fe31..4aa64ccfa5eebcd48bd7cee789946af1eea8552f 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -293,6 +293,7 @@ void LyXAction::init()
                { LFUN_MATH_LIMITS, "math-limits", "", Noop },
                { LFUN_MATH_MACRO, "math-macro", "", Noop },
                { LFUN_MATH_MUTATE, "math-mutate", "", Noop },
+               { LFUN_MATH_SPACE, "math-space", "", Noop },
                { LFUN_MATH_IMPORT_SELECTION, "math-import-selection", "", Noop },
                { LFUN_MATH_MACROARG, "math-macro-arg", "", Noop },
                { LFUN_INSERT_MATRIX, "math-matrix", "", Noop },

diff --git a/src/commandtags.h b/src/commandtags.h
index 7c7b7015fca5fe852386d2ea6b8641216ea6b104..44fd580daa5d81d87898f085f553d06a3ee596a2 100644 (file)
--- a/src/commandtags.h
+++ b/src/commandtags.h
@@ -159,6 +159,7 @@ enum kb_action {
        LFUN_MATH_COLUMN_DELETE,    // Andre' 20010522
        LFUN_MATH_MUTATE,           // Andre' 20010523
        LFUN_MATH_IMPORT_SELECTION, // Andre' 20010704
+       LFUN_MATH_SPACE,            // Andre' 20010725
        LFUN_FIGURE,
        LFUN_DELETE_WORD_FORWARD,
        LFUN_DELETE_WORD_BACKWARD,

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 5bac989afb65e55fe6dca7736a7881beb655f5b8..cba478db16922cb3bd4b6855c806da89acb7c5e4 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-23  John Levon  <moz@compsoc.man.ac.uk>
+
+       * ControlInclude.h:
+       * ControlInclude.C: implement ability to load file
+ 
 2001-07-18  Juergen Vigna  <jug@sad.it>
 
        * ControlSearch.C (replace): changes to lyxfind.h function calls.

diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C
index 5c0ccf545f0c93e7e41a8ca10e4a881e7d7961fe..b81f539ea5c185efbe4faf681003dd2ed0afba17 100644 (file)
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -22,6 +22,7 @@
 #include "BufferView.h"
 #include "Dialogs.h"
 #include "LyXView.h"
+#include "lyxfunc.h"
 #include "gettext.h"
 
 #include "helper_funcs.h"
@@ -71,3 +72,9 @@ string const ControlInclude::Browse(string const & in_name, Type in_type)
        return browseFile(&lv_, in_name, title, pattern, dir1,
                          make_pair(string(), string()));
 }
+
+
+void ControlInclude::load(string const & file)
+{
+       lv_.getLyXFunc()->dispatch(LFUN_CHILDOPEN, file);
+}

diff --git a/src/frontends/controllers/ControlInclude.h b/src/frontends/controllers/ControlInclude.h
index 317644b7a1a60669626d16fdd72c620fe117e962..57a52a7d87c2313776afba4124540fd0147996b2 100644 (file)
--- a/src/frontends/controllers/ControlInclude.h
+++ b/src/frontends/controllers/ControlInclude.h
@@ -40,6 +40,9 @@ public:
        /// Browse for a file
        string const Browse(string const &, Type);
 
+       /// load a file
+       void load(string const & file); 
+
 private:
        /// Dispatch the changed parameters to the kernel.
        virtual void applyParamsToInset();

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index f16bf18ff5bcc285c2d13fd039d57f2e3657d442..8278b4a52b586fe188048d27e0c45c4619b9ac52 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-23  John Levon  <moz@compsoc.man.ac.uk>
+
+       * FormInclude.C: add load file facility back
+ 
 2001-07-23  John Levon  <moz@compsoc.man.ac.uk>
 
        * FormCharacter.C: disable resizing as it doesn't work

diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C
index 42015d2d3e15da46964ef74baefe8278fc38e35b..4387b41262a4a70012b6a0ea6a3188b57877bfd2 100644 (file)
--- a/src/frontends/xforms/FormInclude.C
+++ b/src/frontends/xforms/FormInclude.C
@@ -129,6 +129,7 @@ ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
                string const in_name = fl_get_input(dialog_->input_filename);
                if (!strip(in_name).empty()) {
                        ApplyButton();
+                       controller().load(strip(in_name));
                        action = ButtonPolicy::SMI_NOOP;
                }
 

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 9e9cb27303d3ef93bcdd1195936a35ea0b4c5ce8..bc964a50ca9572da5eb52a67a2a7e902ad4020ec 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -580,6 +580,7 @@ func_status::value_type LyXFunc::getStatus(int ac,
 
        // we just need to be in math mode to enable that
        case LFUN_MATH_SIZE: 
+       case LFUN_MATH_SPACE:
        case LFUN_MATH_LIMITS: 
        case LFUN_MATH_NONUMBER: 
        case LFUN_MATH_NUMBER: