anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs 407 and 357

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4284 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-05-29 22:01:58 +00:00
parent d67471d971
commit 150086a47e
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ChangeLog
View File

@ -1,3 +1,8 @@
2002-05-29 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* configure.m4: fix handling of --with-version-suffix, so that
reLyX is still found. (bug #357)
2002-05-28 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* layouts/hollywood.layout: fix style "FADE_OUT:"

12
lib/configure.m4
View File

@ -100,7 +100,7 @@ rc_entries=
lyx_check_config=yes
lyx_keep_temps=no
srcdir=
lyx_suffix=
version_suffix=
#### Parse the command line
for ac_option do
@ -112,15 +112,15 @@ Options:
--help show this help lines
--keep-temps keep temporary files (for debug. purposes)
--without-latex-config do not run LaTeX to determine configuration
--with-lyx-suffix=suffix suffix of binary installed files
--with-version-suffix=suffix suffix of binary installed files
EOF
exit 0;;
--without-latex-config)
lyx_check_config=no ;;
--keep-temps)
lyx_keep_temps=yes ;;
--with-lyx-suffix*)
lyx_suffix=`echo "$ac_option" | sed 's,--with-lyx-suffix=,,;s,^,-,'`
--with-version-suffix*)
version_suffix=`echo "$ac_option" | sed 's,--with-version-suffix=,,'`
esac
done
@ -219,11 +219,11 @@ PATH=${PATH}:./reLyX/
SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command,reLyX)
PATH=${save_PATH}
test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i"
tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$lyx_suffix,"`
tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$version_suffix,"`
SEARCH_PROG([for a Noweb -> LyX converter],literate_to_lyx_command,noweb2lyx)
test $literate_to_lyx_command = "noweb2lyx" && literate_to_lyx_command="noweb2lyx \$\$i \$\$o"
literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$lyx_suffix,"`
literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$version_suffix,"`
# Search something to process a literate document
SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,noweave)

6
src/insets/ChangeLog
View File

@ -1,3 +1,9 @@
2002-05-29 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insetgraphicsParams.C (Read): use lyxlex::eatLine to read the
file name, in case there are weird characters like ',' in there.
(bug #407)
2002-05-15 John Levon <moz@compsoc.man.ac.uk>
* insettext.C: clear selection on paste (bug 393)

2
src/insets/insetgraphicsParams.C
View File

@ -218,7 +218,7 @@ void InsetGraphicsParams::Write(ostream & os) const
bool InsetGraphicsParams::Read(LyXLex & lex, string const& token)
{
if (token == "filename") {
lex.next();
lex.eatLine();
filename = lex.getString();
} else if (token == "BoundingBox") {
for (int i=0; i<4 ;i++) {