anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-09 02:28:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix external templates; fix bug 423

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4338 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-06-05 15:04:53 +00:00
parent 5bd374ae69
commit aa0f8a61dd
6 changed files with 25 additions and 9 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-06-05 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* external_templates: change the requirements of the xfig and
rasterimage templates to "graphicx" instead of "graphics".
2002-05-30 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-05-30 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* templates/IEEEtran.lyx: update to 1.2.0 format by Michael * templates/IEEEtran.lyx: update to 1.2.0 format by Michael

4
lib/external_templates
View File

@ -25,7 +25,7 @@ Template RasterImage
Product "\\includegraphics{$$Basename.eps}" Product "\\includegraphics{$$Basename.eps}"
UpdateCommand "convert $$Parameters $$FName $$Basename.eps" UpdateCommand "convert $$Parameters $$FName $$Basename.eps"
UpdateResult "$$Basename.eps" UpdateResult "$$Basename.eps"
Requirement "graphics" Requirement "graphicx"
FormatEnd FormatEnd
Format Ascii Format Ascii
Product "$$Contents(\"$$Basename.asc\")" Product "$$Contents(\"$$Basename.asc\")"
@ -70,7 +70,7 @@ Template XFig
Product "\\begin{picture}(0,0)\\includegraphics{$$Basename.eps}\\end{picture}\\input{$$Basename.pstex_t}" Product "\\begin{picture}(0,0)\\includegraphics{$$Basename.eps}\\end{picture}\\input{$$Basename.pstex_t}"
UpdateCommand "python $$Sysdir/scripts/fig2pstex.py $$FName $$Parameters" UpdateCommand "python $$Sysdir/scripts/fig2pstex.py $$FName $$Parameters"
UpdateResult "$$Basename.eps" UpdateResult "$$Basename.eps"
Requirement "graphics" Requirement "graphicx"
FormatEnd FormatEnd
Format Ascii Format Ascii
Product "$$Contents(\"$$Basename.asc\")" Product "$$Contents(\"$$Basename.asc\")"

6
src/insets/ChangeLog
View File

@ -1,3 +1,9 @@
2002-06-05 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* insetinclude.C (uniqueID):
* insetgraphics.C (uniqueID): renamed from unique_id, since this
conflicted with some AIX headers.
2002-05-31 Juergen Vigna <jug@sad.it> 2002-05-31 Juergen Vigna <jug@sad.it>
* insetert.C (get_new_label): add '...' for multi-paragraph ert * insetert.C (get_new_label): add '...' for multi-paragraph ert

6
src/insets/insetgraphics.C
View File

@ -128,7 +128,7 @@ string const RemoveExtension(string const & filename)
namespace { namespace {
string const unique_id() string const uniqueID()
{ {
static unsigned int seed = 1000; static unsigned int seed = 1000;
@ -143,7 +143,7 @@ string const unique_id()
InsetGraphics::InsetGraphics() InsetGraphics::InsetGraphics()
: graphic_label(unique_id()), : graphic_label(uniqueID()),
cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0) cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0)
{} {}
@ -154,7 +154,7 @@ InsetGraphics::InsetGraphics(InsetGraphics const & ig,
bool same_id) bool same_id)
: Inset(ig, same_id), : Inset(ig, same_id),
SigC::Object(), SigC::Object(),
graphic_label(unique_id()), graphic_label(uniqueID()),
cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0) cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0)
{ {
setParams(ig.params(), filepath); setParams(ig.params(), filepath);

6
src/insets/insetinclude.C
View File

@ -33,7 +33,7 @@ extern BufferList bufferlist;
namespace { namespace {
string const unique_id() string const uniqueID()
{ {
static unsigned int seed = 1000; static unsigned int seed = 1000;
@ -48,12 +48,12 @@ string const unique_id()
InsetInclude::InsetInclude(Params const & p) InsetInclude::InsetInclude(Params const & p)
: params_(p), include_label(unique_id()) : params_(p), include_label(uniqueID())
{} {}
InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b) InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b)
: include_label(unique_id()) : include_label(uniqueID())
{ {
params_.cparams = p; params_.cparams = p;
params_.masterFilename_ = b.fileName(); params_.masterFilename_ = b.fileName();

5
status.12x
View File

@ -43,6 +43,9 @@ What's new
- only use the amsmath package when it is needed - only use the amsmath package when it is needed
- make sure to use the graphicx package with the RasterBitmap and XFig
external templates.
- do not ignore zero-length vertical spacing with 'keep' flag. - do not ignore zero-length vertical spacing with 'keep' flag.
- fix interaction between sixpack and LyX via lyxserver - fix interaction between sixpack and LyX via lyxserver
@ -60,6 +63,8 @@ What's new
- fix support for alpha-based systems in boost library - fix support for alpha-based systems in boost library
- fix compilation on AIX (unique_id identifier)
- improve compilation with compaq cxx 6.5 (not there yet...) - improve compilation with compaq cxx 6.5 (not there yet...)
- fix "FADE OUT:" style in hollywood layout - fix "FADE OUT:" style in hollywood layout