anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2338 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-07-25 12:37:43 +00:00
parent e152ea21dc
commit 0563d2e80b
13 changed files with 134 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ChangeLog
View File

@ -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

9
lib/bind/math.bind
View File

@ -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"

25
lib/configure.m4
View File

@ -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"

102
po/POTFILES.in
View File

@ -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

6
src/ChangeLog
View File

@ -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

1
src/LyXAction.C
View File

@ -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 },

1
src/commandtags.h
View File

@ -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,

5
src/frontends/controllers/ChangeLog
View File

@ -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.

7
src/frontends/controllers/ControlInclude.C
View File

@ -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);
}

3
src/frontends/controllers/ControlInclude.h
View File

@ -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();

4
src/frontends/xforms/ChangeLog
View File

@ -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

1
src/frontends/xforms/FormInclude.C
View File

@ -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;
}

1
src/lyxfunc.C
View File

@ -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: