support fig files; support entering cyrillic and greek characters

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4662 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-07-16 22:00:13 +00:00
parent 5ac90688da
commit 1f88697c3c
8 changed files with 45 additions and 4 deletions

View File

@ -1,3 +1,22 @@
2002-07-16 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* configure.m4: add formats fig and epsi with converters
2002-06-19 Herbert Voss <voss@perce.de>
* configure.m4: add converters for epsi and (x)fig
2002-07-16 Andrew Zabolotny <zap@cobra.ru>
* bind/emacs.bind:
* bind/xemacs.bind:
* bind/sciword.bind:
* bind/cua.bind: include greekkeys and cyrkeys bindings
* bind/greekkeys.bind:
* bind/cyrkeys.bind: bindings to enter cyrillic and greek
characters directly from keyboard
2002-07-16 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-07-16 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* bind/menus.bind: cleanup shortcuts for section layouts. Starred * bind/menus.bind: cleanup shortcuts for section layouts. Starred

View File

@ -177,3 +177,5 @@
\bind_file menus.bind \bind_file menus.bind
\bind_file math.bind \bind_file math.bind
\bind_file latinkeys.bind \bind_file latinkeys.bind
\bind_file cyrkeys.bind
\bind_file greekkeys.bind

View File

@ -224,3 +224,5 @@
\bind_file menus.bind \bind_file menus.bind
\bind_file math.bind \bind_file math.bind
\bind_file latinkeys.bind \bind_file latinkeys.bind
\bind_file cyrkeys.bind
\bind_file greekkeys.bind

View File

@ -491,3 +491,5 @@
\bind_file latinkeys.bind \bind_file latinkeys.bind
\bind_file cyrkeys.bind
\bind_file greekkeys.bind

View File

@ -325,3 +325,5 @@
\bind_file menus.bind \bind_file menus.bind
\bind_file math.bind \bind_file math.bind
\bind_file latinkeys.bind \bind_file latinkeys.bind
\bind_file cyrkeys.bind
\bind_file greekkeys.bind

View File

@ -414,6 +414,12 @@ case $GRACE in
done done
esac esac
SEARCH_PROG([for an FIG -> EPS/XPM converter], FIG2DEV, fig2dev)
if test "$FIG2DEV" = "fig2dev"; then
fig_to_eps="fig2dev -L eps \$\$i \$\$o"
fig_to_xpm="fig2dev -L xpm \$\$i \$\$o"
fi
#### Explore the LaTeX configuration #### Explore the LaTeX configuration
MSG_CHECKING(LaTeX configuration) MSG_CHECKING(LaTeX configuration)
# First, remove the files that we want to re-create # First, remove the files that we want to re-create
@ -492,6 +498,7 @@ cat >$outfile <<EOF
\\Format eps eps EPS "" \\Format eps eps EPS ""
\\Format epsi epsi EPSI "" \\Format epsi epsi EPSI ""
\\Format fax "" Fax "" \\Format fax "" Fax ""
\\Format fig fig XFig ""
\\Format fits fits FITS "" \\Format fits fits FITS ""
\\Format gif gif GIF "" \\Format gif gif GIF ""
\\Format agr agr GRACE "" \\Format agr agr GRACE ""
@ -540,6 +547,7 @@ cat >$outfile <<EOF
\\converter bmp eps "$bmp_to_eps" "" \\converter bmp eps "$bmp_to_eps" ""
\\converter fits eps "$fits_to_eps" "" \\converter fits eps "$fits_to_eps" ""
\\converter fig eps "$fig_to_eps" ""
\\converter gif eps "$gif_to_eps" "" \\converter gif eps "$gif_to_eps" ""
\\converter jpg eps "$jpg_to_eps" "" \\converter jpg eps "$jpg_to_eps" ""
\\converter pbm eps "$pbm_to_eps" "" \\converter pbm eps "$pbm_to_eps" ""
@ -562,6 +570,7 @@ cat >$outfile <<EOF
\\converter epsi png "$eps_to_png" "" \\converter epsi png "$eps_to_png" ""
\\converter jpg png "$jpg_to_png" "" \\converter jpg png "$jpg_to_png" ""
\\converter fig xpm "$fig_to_xpm" ""
\\converter gif xpm "$gif_to_xpm" "" \\converter gif xpm "$gif_to_xpm" ""
\\converter eps xpm "$eps_to_xpm" "" \\converter eps xpm "$eps_to_xpm" ""
\\converter epsi xpm "$eps_to_xpm" "" \\converter epsi xpm "$eps_to_xpm" ""

View File

@ -1,3 +1,8 @@
2002-06-20 Herbert Voss <voss@perce.de>
* filetools.[C]: (readExtFromCOntents) add support for
(x)fig format images
2002-07-15 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-07-15 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* filetools.C (IsLyXFilename): * filetools.C (IsLyXFilename):

View File

@ -992,6 +992,7 @@ string const GetExtension(string const & name)
// AGR Grace... // AGR Grace...
// BMP BM... // BMP BM...
// EPS %!PS-Adobe-3.0 EPSF... // EPS %!PS-Adobe-3.0 EPSF...
// FIG #FIG...
// FITS ...BITPIX... // FITS ...BITPIX...
// GIF GIF... // GIF GIF...
// JPG JFIF // JPG JFIF
@ -1052,10 +1053,6 @@ string const getExtFromContents(string const & filename)
} }
getline(ifs, str); getline(ifs, str);
lyxerr[Debug::GRAPHICS] << "Scanstring: " << str.substr(0,60)
<< endl;
string const stamp = str.substr(0,2); string const stamp = str.substr(0,2);
if (firstLine && str.size() >= 2) { if (firstLine && str.size() >= 2) {
// at first we check for a zipped file, because this // at first we check for a zipped file, because this
@ -1103,6 +1100,9 @@ string const getExtFromContents(string const & filename)
} else if (prefixIs(str,"%TGIF")) { } else if (prefixIs(str,"%TGIF")) {
format = "tgif"; format = "tgif";
} else if (prefixIs(str,"#FIG")) {
format = "fig";
} else if (prefixIs(str,"GIF")) { } else if (prefixIs(str,"GIF")) {
format = "gif"; format = "gif";