mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
fix external templates; fix bug 423
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4339 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
b27f7bdaf9
commit
4bad42dd2e
@ -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>
|
||||
|
||||
* templates/IEEEtran.lyx: update to 1.2.0 format from Michael
|
||||
|
@ -25,7 +25,7 @@ Template RasterImage
|
||||
Product "\\includegraphics{$$Basename.eps}"
|
||||
UpdateCommand "convert $$Parameters $$FName $$Basename.eps"
|
||||
UpdateResult "$$Basename.eps"
|
||||
Requirement "graphics"
|
||||
Requirement "graphicx"
|
||||
FormatEnd
|
||||
Format Ascii
|
||||
Product "$$Contents(\"$$Basename.asc\")"
|
||||
@ -70,7 +70,7 @@ Template XFig
|
||||
Product "\\begin{picture}(0,0)\\includegraphics{$$Basename.eps}\\end{picture}\\input{$$Basename.pstex_t}"
|
||||
UpdateCommand "python $$Sysdir/scripts/fig2pstex.py $$FName $$Parameters"
|
||||
UpdateResult "$$Basename.eps"
|
||||
Requirement "graphics"
|
||||
Requirement "graphicx"
|
||||
FormatEnd
|
||||
Format Ascii
|
||||
Product "$$Contents(\"$$Basename.asc\")"
|
||||
|
@ -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>
|
||||
|
||||
* insetert.C (get_new_label): add '...' for multi-paragraph ert
|
||||
|
@ -128,7 +128,7 @@ string const RemoveExtension(string const & filename)
|
||||
|
||||
namespace {
|
||||
|
||||
string const unique_id()
|
||||
string const uniqueID()
|
||||
{
|
||||
static unsigned int seed = 1000;
|
||||
|
||||
@ -143,7 +143,7 @@ string const unique_id()
|
||||
|
||||
|
||||
InsetGraphics::InsetGraphics()
|
||||
: graphic_label(unique_id()),
|
||||
: graphic_label(uniqueID()),
|
||||
cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0)
|
||||
|
||||
{}
|
||||
@ -153,7 +153,7 @@ InsetGraphics::InsetGraphics(InsetGraphics const & ig,
|
||||
string const & filepath,
|
||||
bool same_id)
|
||||
: Inset(ig, same_id),
|
||||
graphic_label(unique_id()),
|
||||
graphic_label(uniqueID()),
|
||||
cached_status_(grfx::ErrorUnknown), cache_filled_(false), old_asc(0)
|
||||
{
|
||||
setParams(ig.params(), filepath);
|
||||
|
@ -33,7 +33,7 @@ extern BufferList bufferlist;
|
||||
|
||||
namespace {
|
||||
|
||||
string const unique_id()
|
||||
string const uniqueID()
|
||||
{
|
||||
static unsigned int seed = 1000;
|
||||
|
||||
@ -48,12 +48,12 @@ string const unique_id()
|
||||
|
||||
|
||||
InsetInclude::InsetInclude(Params const & p)
|
||||
: params_(p), include_label(unique_id())
|
||||
: params_(p), include_label(uniqueID())
|
||||
{}
|
||||
|
||||
|
||||
InsetInclude::InsetInclude(InsetCommandParams const & p, Buffer const & b)
|
||||
: include_label(unique_id())
|
||||
: include_label(uniqueID())
|
||||
{
|
||||
params_.cparams = p;
|
||||
params_.masterFilename_ = b.fileName();
|
||||
|
Loading…
Reference in New Issue
Block a user