2002-09-25 14:26:13 +00:00
|
|
|
/**
|
|
|
|
* \file insetgraphics.C
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
2002-03-21 17:09:55 +00:00
|
|
|
*
|
2002-01-29 09:26:24 +00:00
|
|
|
* \author Baruch Even
|
2002-09-25 14:26:13 +00:00
|
|
|
* \author Herbert Voss
|
|
|
|
*
|
|
|
|
* Full author contact details are available in file CREDITS
|
|
|
|
*/
|
2000-02-29 02:19:17 +00:00
|
|
|
|
2000-07-31 12:30:10 +00:00
|
|
|
/*
|
2002-07-18 14:01:42 +00:00
|
|
|
TODO
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2002-03-18 17:37:08 +00:00
|
|
|
* What advanced features the users want to do?
|
|
|
|
Implement them in a non latex dependent way, but a logical way.
|
|
|
|
LyX should translate it to latex or any other fitting format.
|
2000-07-31 12:30:10 +00:00
|
|
|
* Add a way to roll the image file into the file format.
|
2001-02-08 13:06:55 +00:00
|
|
|
* When loading, if the image is not found in the expected place, try
|
2002-03-18 17:37:08 +00:00
|
|
|
to find it in the clipart, or in the same directory with the image.
|
|
|
|
* The image choosing dialog could show thumbnails of the image formats
|
|
|
|
it knows of, thus selection based on the image instead of based on
|
|
|
|
filename.
|
|
|
|
* Add support for the 'picins' package.
|
|
|
|
* Add support for the 'picinpar' package.
|
|
|
|
* Improve support for 'subfigure' - Allow to set the various options
|
|
|
|
that are possible.
|
|
|
|
*/
|
2000-07-31 12:30:10 +00:00
|
|
|
|
|
|
|
/* NOTES:
|
|
|
|
* Fileformat:
|
|
|
|
* Current version is 1 (inset file format version), when changing it
|
|
|
|
* it should be changed in the Write() function when writing in one place
|
|
|
|
* and when reading one should change the version check and the error message.
|
|
|
|
* The filename is kept in the lyx file in a relative way, so as to allow
|
|
|
|
* moving the document file and its images with no problem.
|
2002-03-21 17:09:55 +00:00
|
|
|
*
|
2000-07-31 12:30:10 +00:00
|
|
|
*
|
|
|
|
* Conversions:
|
2001-07-29 06:04:20 +00:00
|
|
|
* Postscript output means EPS figures.
|
|
|
|
*
|
|
|
|
* PDF output is best done with PDF figures if it's a direct conversion
|
|
|
|
* or PNG figures otherwise.
|
2002-03-21 17:09:55 +00:00
|
|
|
* Image format
|
|
|
|
* from to
|
|
|
|
* EPS epstopdf
|
|
|
|
* PS ps2pdf
|
|
|
|
* JPG/PNG direct
|
|
|
|
* PDF direct
|
|
|
|
* others PNG
|
2000-07-31 12:30:10 +00:00
|
|
|
*/
|
|
|
|
|
2002-03-21 17:09:55 +00:00
|
|
|
#include <config.h>
|
2000-08-14 09:44:53 +00:00
|
|
|
|
2000-02-29 02:19:17 +00:00
|
|
|
#include "insets/insetgraphics.h"
|
2000-07-31 12:30:10 +00:00
|
|
|
#include "insets/insetgraphicsParams.h"
|
2003-06-12 08:52:36 +00:00
|
|
|
#include "insets/renderers.h"
|
2002-02-16 15:59:55 +00:00
|
|
|
|
2000-07-31 12:30:10 +00:00
|
|
|
#include "buffer.h"
|
2000-06-21 15:07:57 +00:00
|
|
|
#include "BufferView.h"
|
2000-10-12 10:46:06 +00:00
|
|
|
#include "converter.h"
|
2000-07-31 12:30:10 +00:00
|
|
|
#include "debug.h"
|
2003-03-07 18:44:57 +00:00
|
|
|
#include "format.h"
|
|
|
|
#include "funcrequest.h"
|
2001-04-05 12:26:41 +00:00
|
|
|
#include "gettext.h"
|
2002-02-27 09:59:52 +00:00
|
|
|
#include "LaTeXFeatures.h"
|
2003-05-22 18:59:10 +00:00
|
|
|
#include "latexrunparams.h"
|
2003-05-16 07:44:00 +00:00
|
|
|
#include "Lsstream.h"
|
2002-07-21 21:21:06 +00:00
|
|
|
#include "lyxlex.h"
|
2003-03-07 18:44:57 +00:00
|
|
|
#include "lyxrc.h"
|
2002-02-16 15:59:55 +00:00
|
|
|
|
2002-04-24 10:53:55 +00:00
|
|
|
#include "frontends/Alert.h"
|
2002-08-02 16:30:58 +00:00
|
|
|
#include "frontends/Dialogs.h"
|
2002-02-16 15:59:55 +00:00
|
|
|
|
|
|
|
#include "support/filetools.h"
|
2002-02-27 09:59:52 +00:00
|
|
|
#include "support/lyxalgo.h" // lyx::count
|
2002-10-24 11:53:46 +00:00
|
|
|
#include "support/lyxlib.h" // float_equal
|
2003-05-13 16:24:49 +00:00
|
|
|
#include "support/tostr.h"
|
2002-06-18 20:47:49 +00:00
|
|
|
#include "support/systemcall.h"
|
2000-03-09 23:58:55 +00:00
|
|
|
|
2002-06-25 15:59:10 +00:00
|
|
|
#include <boost/bind.hpp>
|
|
|
|
|
2002-02-27 09:59:52 +00:00
|
|
|
#include <algorithm> // For the std::max
|
2002-02-16 15:59:55 +00:00
|
|
|
|
2001-02-08 13:06:55 +00:00
|
|
|
extern string system_tempdir;
|
2003-03-31 02:59:34 +00:00
|
|
|
// set by Exporters
|
2000-03-09 23:58:55 +00:00
|
|
|
|
2003-06-30 23:56:22 +00:00
|
|
|
using namespace lyx::support;
|
|
|
|
|
2000-07-31 12:30:10 +00:00
|
|
|
using std::ostream;
|
2001-07-28 12:24:16 +00:00
|
|
|
using std::endl;
|
2003-07-25 17:11:25 +00:00
|
|
|
using std::auto_ptr;
|
2000-03-09 23:58:55 +00:00
|
|
|
|
2002-11-04 02:12:42 +00:00
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
2002-01-29 09:26:24 +00:00
|
|
|
///////////////////////////////////////////////////////////////////////////
|
2002-02-05 12:19:32 +00:00
|
|
|
int const VersionNumber = 1;
|
2002-01-29 09:26:24 +00:00
|
|
|
///////////////////////////////////////////////////////////////////////////
|
2001-07-29 06:04:20 +00:00
|
|
|
|
2001-02-08 13:06:55 +00:00
|
|
|
// This function is a utility function
|
2001-12-02 16:21:10 +00:00
|
|
|
// ... that should be with ChangeExtension ...
|
2001-02-08 13:06:55 +00:00
|
|
|
inline
|
|
|
|
string const RemoveExtension(string const & filename)
|
|
|
|
{
|
|
|
|
return ChangeExtension(filename, string());
|
|
|
|
}
|
2002-03-21 17:09:55 +00:00
|
|
|
|
2002-02-20 09:04:56 +00:00
|
|
|
|
2002-06-05 15:07:44 +00:00
|
|
|
string const uniqueID()
|
2002-02-20 09:04:56 +00:00
|
|
|
{
|
|
|
|
static unsigned int seed = 1000;
|
2003-05-13 16:24:49 +00:00
|
|
|
return "graph" + tostr(++seed);
|
2002-11-04 02:12:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-22 18:59:10 +00:00
|
|
|
string findTargetFormat(string const & suffix, LatexRunParams const & runparams)
|
2002-11-04 02:12:42 +00:00
|
|
|
{
|
2003-05-22 18:59:10 +00:00
|
|
|
// Are we using latex or pdflatex).
|
|
|
|
if (runparams.flavor == LatexRunParams::PDFLATEX) {
|
2002-11-04 02:12:42 +00:00
|
|
|
lyxerr[Debug::GRAPHICS] << "findTargetFormat: PDF mode\n";
|
|
|
|
if (contains(suffix, "ps") || suffix == "pdf")
|
|
|
|
return "pdf";
|
2003-02-26 16:05:35 +00:00
|
|
|
if (suffix == "jpg") // pdflatex can use jpeg
|
2002-11-04 02:12:42 +00:00
|
|
|
return suffix;
|
2003-02-26 16:05:35 +00:00
|
|
|
return "png"; // and also png
|
2002-11-04 02:12:42 +00:00
|
|
|
}
|
|
|
|
// If it's postscript, we always do eps.
|
|
|
|
lyxerr[Debug::GRAPHICS] << "findTargetFormat: PostScript mode\n";
|
2003-02-26 16:05:35 +00:00
|
|
|
if (suffix != "ps") // any other than ps
|
|
|
|
return "eps"; // is changed to eps
|
|
|
|
return suffix; // let ps untouched
|
2002-02-20 09:04:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace anon
|
|
|
|
|
|
|
|
|
2000-03-09 23:58:55 +00:00
|
|
|
InsetGraphics::InsetGraphics()
|
2002-06-05 15:07:44 +00:00
|
|
|
: graphic_label(uniqueID()),
|
2003-06-12 08:52:36 +00:00
|
|
|
graphic_(new GraphicRenderer)
|
2003-06-03 17:49:09 +00:00
|
|
|
{
|
|
|
|
graphic_->connect(boost::bind(&InsetGraphics::statusChanged, this));
|
|
|
|
}
|
2000-02-29 02:19:17 +00:00
|
|
|
|
2001-05-08 10:50:09 +00:00
|
|
|
|
2003-06-03 15:10:14 +00:00
|
|
|
InsetGraphics::InsetGraphics(InsetGraphics const & ig)
|
2003-05-26 09:13:55 +00:00
|
|
|
: Inset(ig),
|
2003-06-03 17:49:09 +00:00
|
|
|
boost::signals::trackable(),
|
2002-06-05 15:07:44 +00:00
|
|
|
graphic_label(uniqueID()),
|
2003-06-12 08:52:36 +00:00
|
|
|
graphic_(new GraphicRenderer(*ig.graphic_))
|
2001-07-14 20:11:35 +00:00
|
|
|
{
|
2003-06-03 17:49:09 +00:00
|
|
|
graphic_->connect(boost::bind(&InsetGraphics::statusChanged, this));
|
2003-06-03 15:10:14 +00:00
|
|
|
setParams(ig.params());
|
2001-07-14 20:11:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-25 17:11:25 +00:00
|
|
|
auto_ptr<InsetBase> InsetGraphics::clone() const
|
2003-02-26 16:05:35 +00:00
|
|
|
{
|
2003-07-25 17:11:25 +00:00
|
|
|
return auto_ptr<InsetBase>(new InsetGraphics(*this));
|
2003-02-26 16:05:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-07-31 12:30:10 +00:00
|
|
|
InsetGraphics::~InsetGraphics()
|
|
|
|
{
|
2003-06-03 17:49:09 +00:00
|
|
|
InsetGraphicsMailer(*this).hideDialog();
|
2003-03-07 18:44:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-06-03 17:49:09 +00:00
|
|
|
void InsetGraphics::statusChanged()
|
|
|
|
{
|
|
|
|
BufferView * bv = graphic_->view();
|
|
|
|
if (bv)
|
|
|
|
bv->updateInset(this);
|
|
|
|
}
|
2003-06-30 23:56:22 +00:00
|
|
|
|
2003-06-03 17:49:09 +00:00
|
|
|
|
2003-03-07 18:44:57 +00:00
|
|
|
dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd)
|
|
|
|
{
|
|
|
|
switch (cmd.action) {
|
|
|
|
case LFUN_INSET_MODIFY: {
|
2003-07-23 09:54:21 +00:00
|
|
|
Buffer const & buffer = *cmd.view()->buffer();
|
2003-03-07 18:44:57 +00:00
|
|
|
InsetGraphicsParams p;
|
2003-07-23 09:54:21 +00:00
|
|
|
InsetGraphicsMailer::string2params(cmd.argument, buffer, p);
|
2003-05-16 07:44:00 +00:00
|
|
|
if (!p.filename.empty()) {
|
2003-06-03 15:10:14 +00:00
|
|
|
setParams(p);
|
2003-05-16 07:44:00 +00:00
|
|
|
cmd.view()->updateInset(this);
|
|
|
|
}
|
|
|
|
return DISPATCHED;
|
2003-03-07 18:44:57 +00:00
|
|
|
}
|
|
|
|
|
2003-05-26 09:13:55 +00:00
|
|
|
case LFUN_INSET_DIALOG_UPDATE:
|
2003-05-16 07:44:00 +00:00
|
|
|
InsetGraphicsMailer(*this).updateDialog(cmd.view());
|
|
|
|
return DISPATCHED;
|
2003-03-07 18:44:57 +00:00
|
|
|
|
2003-05-16 07:44:00 +00:00
|
|
|
case LFUN_INSET_EDIT:
|
2003-03-09 09:38:47 +00:00
|
|
|
case LFUN_MOUSE_RELEASE:
|
2003-05-16 07:44:00 +00:00
|
|
|
InsetGraphicsMailer(*this).showDialog(cmd.view());
|
|
|
|
return DISPATCHED;
|
2003-03-09 09:38:47 +00:00
|
|
|
|
2003-03-07 18:44:57 +00:00
|
|
|
default:
|
2003-05-16 07:44:00 +00:00
|
|
|
return Inset::localDispatch(cmd);
|
2003-03-07 18:44:57 +00:00
|
|
|
}
|
2000-07-31 12:30:10 +00:00
|
|
|
}
|
2000-02-29 02:19:17 +00:00
|
|
|
|
2001-05-08 10:50:09 +00:00
|
|
|
|
2003-06-02 10:03:27 +00:00
|
|
|
void InsetGraphics::metrics(MetricsInfo & mi, Dimension & dim) const
|
2000-02-29 02:19:17 +00:00
|
|
|
{
|
2003-06-03 17:49:09 +00:00
|
|
|
graphic_->metrics(mi, dim);
|
2003-07-18 07:47:07 +00:00
|
|
|
dim_ = dim;
|
2003-03-07 18:44:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-30 06:48:24 +00:00
|
|
|
void InsetGraphics::draw(PainterInfo & pi, int x, int y) const
|
2000-02-29 02:19:17 +00:00
|
|
|
{
|
2003-06-03 17:49:09 +00:00
|
|
|
graphic_->draw(pi, x, y);
|
2000-02-29 02:19:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-28 10:25:20 +00:00
|
|
|
Inset::EDITABLE InsetGraphics::editable() const
|
2000-02-29 02:19:17 +00:00
|
|
|
{
|
2000-03-08 13:52:57 +00:00
|
|
|
return IS_EDITABLE;
|
2000-02-29 02:19:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-06-03 15:10:14 +00:00
|
|
|
void InsetGraphics::write(Buffer const * buf, ostream & os) const
|
2000-02-29 02:19:17 +00:00
|
|
|
{
|
2002-08-24 22:02:30 +00:00
|
|
|
os << "Graphics\n";
|
2003-06-03 15:10:14 +00:00
|
|
|
params().Write(os, buf->filePath());
|
2000-02-29 02:19:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-28 10:25:20 +00:00
|
|
|
void InsetGraphics::read(Buffer const * buf, LyXLex & lex)
|
2001-07-28 12:24:16 +00:00
|
|
|
{
|
2001-08-06 19:13:25 +00:00
|
|
|
string const token = lex.getString();
|
2001-07-28 12:24:16 +00:00
|
|
|
|
2001-07-29 06:04:20 +00:00
|
|
|
if (token == "Graphics")
|
2003-06-03 15:10:14 +00:00
|
|
|
readInsetGraphics(lex, buf->filePath());
|
2001-07-28 12:24:16 +00:00
|
|
|
else
|
2002-08-24 22:02:30 +00:00
|
|
|
lyxerr[Debug::GRAPHICS] << "Not a Graphics inset!\n";
|
2001-07-28 12:24:16 +00:00
|
|
|
|
2003-06-03 17:49:09 +00:00
|
|
|
graphic_->update(params().as_grfxParams());
|
2001-07-28 12:24:16 +00:00
|
|
|
}
|
|
|
|
|
2002-03-25 11:04:34 +00:00
|
|
|
|
2003-06-03 15:10:14 +00:00
|
|
|
void InsetGraphics::readInsetGraphics(LyXLex & lex, string const & bufpath)
|
2000-02-29 02:19:17 +00:00
|
|
|
{
|
2000-08-14 09:44:53 +00:00
|
|
|
bool finished = false;
|
|
|
|
|
2001-08-06 19:13:25 +00:00
|
|
|
while (lex.isOK() && !finished) {
|
2000-08-14 09:44:53 +00:00
|
|
|
lex.next();
|
|
|
|
|
2001-08-06 19:13:25 +00:00
|
|
|
string const token = lex.getString();
|
2002-03-21 17:09:55 +00:00
|
|
|
lyxerr[Debug::GRAPHICS] << "Token: '" << token << '\''
|
2002-02-27 09:59:52 +00:00
|
|
|
<< std::endl;
|
2000-08-14 09:44:53 +00:00
|
|
|
|
|
|
|
if (token.empty()) {
|
|
|
|
continue;
|
|
|
|
} else if (token == "\\end_inset") {
|
|
|
|
finished = true;
|
|
|
|
} else if (token == "FormatVersion") {
|
|
|
|
lex.next();
|
2001-08-06 19:13:25 +00:00
|
|
|
int version = lex.getInteger();
|
2002-01-29 09:26:24 +00:00
|
|
|
if (version > VersionNumber)
|
2000-08-14 09:44:53 +00:00
|
|
|
lyxerr
|
|
|
|
<< "This document was created with a newer Graphics widget"
|
|
|
|
", You should use a newer version of LyX to read this"
|
|
|
|
" file."
|
2002-02-27 09:59:52 +00:00
|
|
|
<< std::endl;
|
2000-08-14 09:44:53 +00:00
|
|
|
// TODO: Possibly open up a dialog?
|
|
|
|
}
|
|
|
|
else {
|
2003-06-03 15:10:14 +00:00
|
|
|
if (!params_.Read(lex, token, bufpath))
|
2002-03-21 17:09:55 +00:00
|
|
|
lyxerr << "Unknown token, " << token << ", skipping."
|
2002-02-27 09:59:52 +00:00
|
|
|
<< std::endl;
|
2000-08-14 09:44:53 +00:00
|
|
|
}
|
|
|
|
}
|
2001-07-28 12:24:16 +00:00
|
|
|
}
|
2000-08-14 09:44:53 +00:00
|
|
|
|
2000-02-29 02:19:17 +00:00
|
|
|
|
2002-01-29 09:26:24 +00:00
|
|
|
string const InsetGraphics::createLatexOptions() const
|
2001-02-08 13:06:55 +00:00
|
|
|
{
|
|
|
|
// Calculate the options part of the command, we must do it to a string
|
|
|
|
// stream since we might have a trailing comma that we would like to remove
|
|
|
|
// before writing it to the output stream.
|
2001-07-13 14:03:48 +00:00
|
|
|
ostringstream options;
|
2002-02-27 09:59:52 +00:00
|
|
|
if (!params().bb.empty())
|
2002-07-28 22:50:13 +00:00
|
|
|
options << " bb=" << rtrim(params().bb) << ",\n";
|
2002-02-27 09:59:52 +00:00
|
|
|
if (params().draft)
|
2002-02-07 19:37:34 +00:00
|
|
|
options << " draft,\n";
|
2002-02-27 09:59:52 +00:00
|
|
|
if (params().clip)
|
2002-02-07 19:37:34 +00:00
|
|
|
options << " clip,\n";
|
2003-06-30 23:56:22 +00:00
|
|
|
if (!float_equal(params().scale, 0.0, 0.05)) {
|
|
|
|
if (!float_equal(params().scale, 100.0, 0.05))
|
2002-10-24 11:53:46 +00:00
|
|
|
options << " scale=" << params().scale / 100.0
|
|
|
|
<< ",\n";
|
2002-08-24 22:02:30 +00:00
|
|
|
} else {
|
|
|
|
if (!params().width.zero())
|
|
|
|
options << " width=" << params().width.asLatexString() << ",\n";
|
|
|
|
if (!params().height.zero())
|
|
|
|
options << " height=" << params().height.asLatexString() << ",\n";
|
|
|
|
if (params().keepAspectRatio)
|
2002-11-04 02:12:42 +00:00
|
|
|
options << " keepaspectratio,\n";
|
2002-01-29 09:26:24 +00:00
|
|
|
}
|
2002-08-24 22:02:30 +00:00
|
|
|
|
|
|
|
// Make sure rotation angle is not very close to zero;
|
|
|
|
// a float can be effectively zero but not exactly zero.
|
2003-06-30 23:56:22 +00:00
|
|
|
if (!float_equal(params().rotateAngle, 0, 0.001)) {
|
2002-02-27 09:59:52 +00:00
|
|
|
options << " angle=" << params().rotateAngle << ",\n";
|
|
|
|
if (!params().rotateOrigin.empty()) {
|
|
|
|
options << " origin=" << params().rotateOrigin[0];
|
|
|
|
if (contains(params().rotateOrigin,"Top"))
|
2002-01-29 09:26:24 +00:00
|
|
|
options << 't';
|
2002-02-27 09:59:52 +00:00
|
|
|
else if (contains(params().rotateOrigin,"Bottom"))
|
2002-01-29 09:26:24 +00:00
|
|
|
options << 'b';
|
2002-02-27 09:59:52 +00:00
|
|
|
else if (contains(params().rotateOrigin,"Baseline"))
|
2002-01-29 09:26:24 +00:00
|
|
|
options << 'B';
|
2002-02-07 19:37:34 +00:00
|
|
|
options << ",\n";
|
2002-01-29 09:26:24 +00:00
|
|
|
}
|
2001-02-08 13:06:55 +00:00
|
|
|
}
|
2002-08-24 22:02:30 +00:00
|
|
|
|
2002-02-27 09:59:52 +00:00
|
|
|
if (!params().special.empty())
|
|
|
|
options << params().special << ",\n";
|
2002-08-24 22:02:30 +00:00
|
|
|
|
2002-11-04 02:12:42 +00:00
|
|
|
string opts = STRCONV(options.str());
|
|
|
|
// delete last ",\n"
|
|
|
|
return opts.substr(0, opts.size() - 2);
|
2001-07-29 06:04:20 +00:00
|
|
|
}
|
|
|
|
|
2002-02-27 09:59:52 +00:00
|
|
|
|
2003-05-22 18:59:10 +00:00
|
|
|
string const InsetGraphics::prepareFile(Buffer const * buf,
|
|
|
|
LatexRunParams const & runparams) const
|
2001-02-08 13:06:55 +00:00
|
|
|
{
|
2002-04-24 10:53:55 +00:00
|
|
|
// LaTeX can cope if the graphics file doesn't exist, so just return the
|
|
|
|
// filename.
|
2003-07-22 20:42:40 +00:00
|
|
|
string orig_file = params().filename.absFilename();
|
|
|
|
string const rel_file = params().filename.relFilename(buf->filePath());
|
2003-06-03 15:10:14 +00:00
|
|
|
|
2003-06-07 17:45:43 +00:00
|
|
|
if (!IsFileReadable(orig_file)) {
|
|
|
|
lyxerr[Debug::GRAPHICS]
|
|
|
|
<< "InsetGraphics::prepareFile\n"
|
|
|
|
<< "No file '" << orig_file << "' can be found!" << endl;
|
2003-06-03 15:10:14 +00:00
|
|
|
return rel_file;
|
2003-06-07 17:45:43 +00:00
|
|
|
}
|
2002-04-24 10:53:55 +00:00
|
|
|
|
2003-06-03 15:10:14 +00:00
|
|
|
bool const zipped = zippedFile(orig_file);
|
2002-07-18 14:01:42 +00:00
|
|
|
|
|
|
|
// If the file is compressed and we have specified that it
|
|
|
|
// should not be uncompressed, then just return its name and
|
|
|
|
// let LaTeX do the rest!
|
|
|
|
if (zipped && params().noUnzip) {
|
2002-06-24 20:28:12 +00:00
|
|
|
lyxerr[Debug::GRAPHICS]
|
2002-07-18 14:01:42 +00:00
|
|
|
<< "\tpass zipped file to LaTeX but with full path.\n";
|
2003-06-03 15:10:14 +00:00
|
|
|
// LaTeX needs an absolute path, otherwise the
|
2002-07-18 14:01:42 +00:00
|
|
|
// coresponding *.eps.bb file isn't found
|
2003-06-03 15:10:14 +00:00
|
|
|
return orig_file;
|
2002-02-07 19:37:34 +00:00
|
|
|
}
|
2002-06-24 20:28:12 +00:00
|
|
|
|
2002-07-18 14:01:42 +00:00
|
|
|
// temp_file will contain the file for LaTeX to act on if, for example,
|
|
|
|
// we move it to a temp dir or uncompress it.
|
2003-02-26 18:03:48 +00:00
|
|
|
string temp_file = orig_file;
|
2002-07-18 14:01:42 +00:00
|
|
|
|
2002-06-18 20:47:49 +00:00
|
|
|
if (zipped) {
|
2002-07-18 14:01:42 +00:00
|
|
|
// Uncompress the file if necessary.
|
|
|
|
// If it has been uncompressed in a previous call to
|
|
|
|
// prepareFile, do nothing.
|
2002-06-18 20:47:49 +00:00
|
|
|
temp_file = MakeAbsPath(OnlyFilename(temp_file), buf->tmppath);
|
|
|
|
lyxerr[Debug::GRAPHICS]
|
|
|
|
<< "\ttemp_file: " << temp_file << endl;
|
2003-06-30 23:56:22 +00:00
|
|
|
if (graphic_->hasFileChanged() || !IsFileReadable(temp_file)) {
|
|
|
|
bool const success = copy(orig_file, temp_file);
|
2002-06-18 20:47:49 +00:00
|
|
|
lyxerr[Debug::GRAPHICS]
|
|
|
|
<< "\tCopying zipped file from "
|
2003-06-03 15:10:14 +00:00
|
|
|
<< orig_file << " to " << temp_file
|
2002-06-18 20:47:49 +00:00
|
|
|
<< (success ? " succeeded\n" : " failed\n");
|
|
|
|
} else
|
|
|
|
lyxerr[Debug::GRAPHICS]
|
2002-06-24 20:28:12 +00:00
|
|
|
<< "\tzipped file " << temp_file
|
2002-06-18 20:47:49 +00:00
|
|
|
<< " exists! Maybe no tempdir ...\n";
|
2003-06-03 15:10:14 +00:00
|
|
|
orig_file = unzipFile(temp_file);
|
2002-06-18 20:47:49 +00:00
|
|
|
lyxerr[Debug::GRAPHICS]
|
2003-06-03 15:10:14 +00:00
|
|
|
<< "\tunzipped to " << orig_file << endl;
|
2002-06-18 20:47:49 +00:00
|
|
|
}
|
2002-07-18 14:01:42 +00:00
|
|
|
|
2003-06-03 15:10:14 +00:00
|
|
|
string const from = getExtFromContents(orig_file);
|
2003-05-22 18:59:10 +00:00
|
|
|
string const to = findTargetFormat(from, runparams);
|
2002-07-18 14:01:42 +00:00
|
|
|
lyxerr[Debug::GRAPHICS]
|
|
|
|
<< "\t we have: from " << from << " to " << to << '\n';
|
2002-04-24 10:53:55 +00:00
|
|
|
|
2002-12-19 10:07:35 +00:00
|
|
|
if (from == to && !lyxrc.use_tempdir) {
|
2002-07-18 14:01:42 +00:00
|
|
|
// No conversion is needed. LaTeX can handle the
|
|
|
|
// graphic file as is.
|
|
|
|
// This is true even if the orig_file is compressed.
|
2003-02-26 18:03:48 +00:00
|
|
|
if (formats.getFormat(to)->extension() == GetExtension(orig_file))
|
2003-06-03 15:10:14 +00:00
|
|
|
return RemoveExtension(orig_file);
|
|
|
|
return orig_file;
|
2003-03-03 15:59:08 +00:00
|
|
|
}
|
2002-04-24 10:53:55 +00:00
|
|
|
|
|
|
|
// We're going to be running the exported buffer through the LaTeX
|
|
|
|
// compiler, so must ensure that LaTeX can cope with the graphics
|
|
|
|
// file format.
|
|
|
|
|
|
|
|
// Perform all these manipulations on a temporary file if possible.
|
|
|
|
// If we are not using a temp dir, then temp_file contains the
|
2002-05-21 23:50:36 +00:00
|
|
|
// original file.
|
2002-05-14 09:19:05 +00:00
|
|
|
// to allow files with the same name in different dirs
|
2002-05-21 23:50:36 +00:00
|
|
|
// we manipulate the original file "any.dir/file.ext"
|
|
|
|
// to "any_dir_file.ext"! changing the dots in the
|
2002-05-14 09:19:05 +00:00
|
|
|
// dirname is important for the use of ChangeExtension
|
2002-06-18 20:47:49 +00:00
|
|
|
lyxerr[Debug::GRAPHICS]
|
2003-06-03 15:10:14 +00:00
|
|
|
<< "\tthe orig file is: " << orig_file << endl;
|
2002-06-18 20:47:49 +00:00
|
|
|
|
2002-05-14 09:19:05 +00:00
|
|
|
if (lyxrc.use_tempdir) {
|
2003-06-30 23:56:22 +00:00
|
|
|
temp_file = copyFileToDir(buf->tmppath, orig_file);
|
2003-06-03 17:49:09 +00:00
|
|
|
if (temp_file.empty()) {
|
|
|
|
string str = bformat(_("Could not copy the file\n%1$s\n"
|
|
|
|
"into the temporary directory."),
|
|
|
|
orig_file);
|
|
|
|
Alert::error(_("Graphics display failed"), str);
|
|
|
|
return orig_file;
|
2003-06-30 23:56:22 +00:00
|
|
|
}
|
2002-02-27 09:59:52 +00:00
|
|
|
|
2002-12-19 10:07:35 +00:00
|
|
|
if (from == to) {
|
2002-07-18 14:01:42 +00:00
|
|
|
// No conversion is needed. LaTeX can handle the
|
|
|
|
// graphic file as is.
|
2003-03-03 15:59:08 +00:00
|
|
|
if (formats.getFormat(to)->extension() == GetExtension(orig_file))
|
2002-12-19 10:07:35 +00:00
|
|
|
return RemoveExtension(temp_file);
|
2003-02-26 18:03:48 +00:00
|
|
|
return temp_file;
|
2002-12-19 10:07:35 +00:00
|
|
|
}
|
2002-02-27 09:59:52 +00:00
|
|
|
}
|
2003-03-03 15:59:08 +00:00
|
|
|
|
2002-04-24 10:53:55 +00:00
|
|
|
string const outfile_base = RemoveExtension(temp_file);
|
|
|
|
lyxerr[Debug::GRAPHICS]
|
2002-06-18 20:47:49 +00:00
|
|
|
<< "\tThe original file is " << orig_file << "\n"
|
|
|
|
<< "\tA copy has been made and convert is to be called with:\n"
|
2002-04-24 10:53:55 +00:00
|
|
|
<< "\tfile to convert = " << temp_file << '\n'
|
|
|
|
<< "\toutfile_base = " << outfile_base << '\n'
|
|
|
|
<< "\t from " << from << " to " << to << '\n';
|
2002-02-27 09:59:52 +00:00
|
|
|
|
2002-06-18 20:47:49 +00:00
|
|
|
// if no special converter defined, than we take the default one
|
|
|
|
// from ImageMagic: convert from:inname.from to:outname.to
|
|
|
|
if (!converters.convert(buf, temp_file, outfile_base, from, to)) {
|
2002-06-24 20:28:12 +00:00
|
|
|
string const command =
|
2002-07-22 12:36:41 +00:00
|
|
|
LibFileSearch("scripts", "convertDefault.sh") +
|
|
|
|
' ' + from + ':' + temp_file + ' ' +
|
|
|
|
to + ':' + outfile_base + '.' + to;
|
2002-06-24 20:28:12 +00:00
|
|
|
lyxerr[Debug::GRAPHICS]
|
2002-07-22 12:36:41 +00:00
|
|
|
<< "No converter defined! I use convertDefault.sh:\n\t"
|
2002-06-18 20:47:49 +00:00
|
|
|
<< command << endl;
|
|
|
|
Systemcall one;
|
|
|
|
one.startscript(Systemcall::Wait, command);
|
2003-03-31 01:15:44 +00:00
|
|
|
if (!IsFileReadable(ChangeExtension(outfile_base, to))) {
|
2003-05-19 17:03:12 +00:00
|
|
|
string str = bformat(_("No information for converting %1$s "
|
2003-05-30 02:00:31 +00:00
|
|
|
"format files to %2$s.\n"
|
2003-05-19 17:03:12 +00:00
|
|
|
"Try defining a convertor in the preferences."), from, to);
|
2003-03-31 01:15:44 +00:00
|
|
|
Alert::error(_("Could not convert image"), str);
|
|
|
|
}
|
2002-06-18 20:47:49 +00:00
|
|
|
}
|
2002-06-24 20:28:12 +00:00
|
|
|
|
2002-04-24 10:53:55 +00:00
|
|
|
return RemoveExtension(temp_file);
|
2001-02-08 13:06:55 +00:00
|
|
|
}
|
|
|
|
|
2001-05-08 10:50:09 +00:00
|
|
|
|
2003-05-22 21:10:22 +00:00
|
|
|
int InsetGraphics::latex(Buffer const * buf, ostream & os,
|
2003-05-23 08:59:47 +00:00
|
|
|
LatexRunParams const & runparams) const
|
2000-02-29 02:19:17 +00:00
|
|
|
{
|
2002-04-06 13:05:46 +00:00
|
|
|
// If there is no file specified or not existing,
|
2002-04-02 12:48:41 +00:00
|
|
|
// just output a message about it in the latex output.
|
2002-04-24 10:53:55 +00:00
|
|
|
lyxerr[Debug::GRAPHICS]
|
2002-04-29 09:24:19 +00:00
|
|
|
<< "insetgraphics::latex: Filename = "
|
2003-07-22 20:42:40 +00:00
|
|
|
<< params().filename.absFilename() << endl;
|
2002-04-24 10:53:55 +00:00
|
|
|
|
2003-07-25 17:11:25 +00:00
|
|
|
string const relative_file =
|
2003-07-22 20:42:40 +00:00
|
|
|
params().filename.relFilename(buf->filePath());
|
2003-06-03 15:10:14 +00:00
|
|
|
|
2002-04-29 09:24:19 +00:00
|
|
|
// A missing (e)ps-extension is no problem for LaTeX, so
|
|
|
|
// we have to test three different cases
|
2003-06-03 15:10:14 +00:00
|
|
|
#warning uh, but can our cache handle it ? no.
|
2003-07-22 20:42:40 +00:00
|
|
|
string const file_ = params().filename.absFilename();
|
2002-05-21 23:50:36 +00:00
|
|
|
bool const file_exists =
|
|
|
|
!file_.empty() &&
|
2002-04-29 09:24:19 +00:00
|
|
|
(IsFileReadable(file_) || // original
|
2002-05-21 23:50:36 +00:00
|
|
|
IsFileReadable(file_ + ".eps") || // original.eps
|
2002-04-29 09:24:19 +00:00
|
|
|
IsFileReadable(file_ + ".ps")); // original.ps
|
2002-05-21 23:50:36 +00:00
|
|
|
string const message = file_exists ?
|
2002-09-09 09:49:47 +00:00
|
|
|
string() : string("bb = 0 0 200 100, draft, type=eps");
|
2002-04-29 09:24:19 +00:00
|
|
|
// if !message.empty() than there was no existing file
|
|
|
|
// "filename(.(e)ps)" found. In this case LaTeX
|
|
|
|
// draws only a rectangle with the above bb and the
|
|
|
|
// not found filename in it.
|
2002-04-24 10:53:55 +00:00
|
|
|
lyxerr[Debug::GRAPHICS]
|
2002-06-18 20:47:49 +00:00
|
|
|
<< "\tMessage = \"" << message << '\"' << endl;
|
2002-03-26 18:08:07 +00:00
|
|
|
|
2002-02-13 18:53:36 +00:00
|
|
|
// These variables collect all the latex code that should be before and
|
2001-02-08 13:06:55 +00:00
|
|
|
// after the actual includegraphics command.
|
|
|
|
string before;
|
|
|
|
string after;
|
2000-08-14 09:44:53 +00:00
|
|
|
// Do we want subcaptions?
|
2002-02-27 09:59:52 +00:00
|
|
|
if (params().subcaption) {
|
|
|
|
before += "\\subfigure[" + params().subcaptionText + "]{";
|
2002-02-13 18:53:36 +00:00
|
|
|
after = '}';
|
2000-08-14 09:44:53 +00:00
|
|
|
}
|
2001-02-08 13:06:55 +00:00
|
|
|
// We never use the starred form, we use the "clip" option instead.
|
2002-02-13 18:53:36 +00:00
|
|
|
before += "\\includegraphics";
|
2002-04-02 12:48:41 +00:00
|
|
|
|
2001-02-08 13:06:55 +00:00
|
|
|
// Write the options if there are any.
|
|
|
|
string const opts = createLatexOptions();
|
2002-06-18 20:47:49 +00:00
|
|
|
lyxerr[Debug::GRAPHICS] << "\tOpts = " << opts << endl;
|
2002-04-24 10:53:55 +00:00
|
|
|
|
2002-04-02 12:48:41 +00:00
|
|
|
if (!opts.empty() && !message.empty())
|
2002-09-09 09:49:47 +00:00
|
|
|
before += ("[%\n" + opts + ',' + message + ']');
|
|
|
|
else if (!opts.empty() || !message.empty())
|
|
|
|
before += ("[%\n" + opts + message + ']');
|
2002-04-24 10:53:55 +00:00
|
|
|
|
|
|
|
lyxerr[Debug::GRAPHICS]
|
2002-06-18 20:47:49 +00:00
|
|
|
<< "\tBefore = " << before
|
|
|
|
<< "\n\tafter = " << after << endl;
|
2002-04-02 12:48:41 +00:00
|
|
|
|
2002-07-18 14:01:42 +00:00
|
|
|
|
|
|
|
// "nice" means that the buffer is exported to LaTeX format but not
|
|
|
|
// run through the LaTeX compiler.
|
2003-05-22 21:10:22 +00:00
|
|
|
if (runparams.nice) {
|
2003-06-03 15:10:14 +00:00
|
|
|
os << before <<'{' << relative_file << '}' << after;
|
2002-07-18 14:01:42 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2000-08-14 09:44:53 +00:00
|
|
|
// Make the filename relative to the lyx file
|
|
|
|
// and remove the extension so the LaTeX will use whatever is
|
|
|
|
// appropriate (when there are several versions in different formats)
|
2002-04-06 13:05:46 +00:00
|
|
|
string const latex_str = message.empty() ?
|
2003-05-22 18:59:10 +00:00
|
|
|
(before + '{' + os::external_path(prepareFile(buf, runparams)) + '}' + after) :
|
2003-06-03 15:10:14 +00:00
|
|
|
(before + '{' + relative_file + " not found!}" + after);
|
2002-02-13 18:53:36 +00:00
|
|
|
os << latex_str;
|
2002-02-27 09:59:52 +00:00
|
|
|
|
2003-06-07 17:45:43 +00:00
|
|
|
lyxerr[Debug::GRAPHICS] << "InsetGraphics::latex outputting:\n"
|
|
|
|
<< latex_str << endl;
|
2001-02-08 13:06:55 +00:00
|
|
|
// Return how many newlines we issued.
|
2003-02-26 16:05:35 +00:00
|
|
|
return int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1);
|
2000-02-29 02:19:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-01-31 14:20:09 +00:00
|
|
|
int InsetGraphics::ascii(Buffer const *, ostream & os, int) const
|
2000-04-24 20:58:23 +00:00
|
|
|
{
|
2001-02-08 13:06:55 +00:00
|
|
|
// No graphics in ascii output. Possible to use gifscii to convert
|
|
|
|
// images to ascii approximation.
|
|
|
|
// 1. Convert file to ascii using gifscii
|
|
|
|
// 2. Read ascii output file and add it to the output stream.
|
2002-01-31 14:20:09 +00:00
|
|
|
// at least we send the filename
|
2003-07-22 20:42:40 +00:00
|
|
|
os << '<' << bformat(_("Graphics file: %1$s"),
|
|
|
|
params().filename.absFilename()) << ">\n";
|
2000-04-24 20:58:23 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-28 10:25:20 +00:00
|
|
|
int InsetGraphics::linuxdoc(Buffer const *, ostream &) const
|
2000-03-06 02:42:40 +00:00
|
|
|
{
|
2000-08-14 09:44:53 +00:00
|
|
|
// No graphics in LinuxDoc output. Should check how/what to add.
|
2000-03-06 02:42:40 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-05-08 10:50:09 +00:00
|
|
|
|
2001-02-08 13:06:55 +00:00
|
|
|
// For explanation on inserting graphics into DocBook checkout:
|
2003-06-12 08:52:36 +00:00
|
|
|
// http://en.tldp.org/LDP/LDP-Author-Guide/inserting-pictures.html
|
2001-02-08 13:06:55 +00:00
|
|
|
// See also the docbook guide at http://www.docbook.org/
|
2002-06-24 20:28:12 +00:00
|
|
|
int InsetGraphics::docbook(Buffer const *, ostream & os,
|
|
|
|
bool /*mixcont*/) const
|
2000-03-06 02:42:40 +00:00
|
|
|
{
|
2002-03-21 17:09:55 +00:00
|
|
|
// In DocBook v5.0, the graphic tag will be eliminated from DocBook, will
|
|
|
|
// need to switch to MediaObject. However, for now this is sufficient and
|
2001-02-08 13:06:55 +00:00
|
|
|
// easier to use.
|
2002-02-20 09:04:56 +00:00
|
|
|
os << "<graphic fileref=\"&" << graphic_label << ";\">";
|
2000-03-06 02:42:40 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-02-29 02:19:17 +00:00
|
|
|
|
2001-06-28 10:25:20 +00:00
|
|
|
void InsetGraphics::validate(LaTeXFeatures & features) const
|
2000-02-29 02:19:17 +00:00
|
|
|
{
|
2000-08-14 09:44:53 +00:00
|
|
|
// If we have no image, we should not require anything.
|
2002-02-27 09:59:52 +00:00
|
|
|
if (params().filename.empty())
|
2003-02-26 16:05:35 +00:00
|
|
|
return;
|
2000-07-31 12:30:10 +00:00
|
|
|
|
2003-07-22 20:42:40 +00:00
|
|
|
features.includeFile(graphic_label,
|
|
|
|
RemoveExtension(params().filename.absFilename()));
|
2002-02-20 09:04:56 +00:00
|
|
|
|
2001-11-19 15:34:11 +00:00
|
|
|
features.require("graphicx");
|
2000-07-31 12:30:10 +00:00
|
|
|
|
2002-02-27 09:59:52 +00:00
|
|
|
if (params().subcaption)
|
2001-11-19 15:34:11 +00:00
|
|
|
features.require("subfigure");
|
2000-02-29 02:19:17 +00:00
|
|
|
}
|
|
|
|
|
2001-05-08 10:50:09 +00:00
|
|
|
|
2003-06-03 15:10:14 +00:00
|
|
|
bool InsetGraphics::setParams(InsetGraphicsParams const & p)
|
2000-02-29 02:19:17 +00:00
|
|
|
{
|
2000-08-08 09:18:39 +00:00
|
|
|
// If nothing is changed, just return and say so.
|
2003-02-26 16:05:35 +00:00
|
|
|
if (params() == p && !p.filename.empty())
|
2000-08-14 09:44:53 +00:00
|
|
|
return false;
|
2000-07-31 12:30:10 +00:00
|
|
|
|
2000-08-14 09:44:53 +00:00
|
|
|
// Copy the new parameters.
|
2002-02-27 09:59:52 +00:00
|
|
|
params_ = p;
|
2000-07-31 12:30:10 +00:00
|
|
|
|
2003-06-30 23:56:22 +00:00
|
|
|
// Update the display using the new parameters.
|
|
|
|
graphic_->update(params().as_grfxParams());
|
2000-08-14 09:44:53 +00:00
|
|
|
|
|
|
|
// We have changed data, report it.
|
|
|
|
return true;
|
2000-02-29 02:19:17 +00:00
|
|
|
}
|
|
|
|
|
2001-05-08 10:50:09 +00:00
|
|
|
|
2002-02-27 09:59:52 +00:00
|
|
|
InsetGraphicsParams const & InsetGraphics::params() const
|
2000-07-31 12:30:10 +00:00
|
|
|
{
|
2002-02-27 09:59:52 +00:00
|
|
|
return params_;
|
2000-07-31 12:30:10 +00:00
|
|
|
}
|
2003-03-07 18:44:57 +00:00
|
|
|
|
|
|
|
|
|
|
|
string const InsetGraphicsMailer::name_("graphics");
|
|
|
|
|
|
|
|
InsetGraphicsMailer::InsetGraphicsMailer(InsetGraphics & inset)
|
|
|
|
: inset_(inset)
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
2003-07-23 09:54:21 +00:00
|
|
|
string const InsetGraphicsMailer::inset2string(Buffer const & buffer) const
|
2003-03-07 18:44:57 +00:00
|
|
|
{
|
2003-07-23 09:54:21 +00:00
|
|
|
return params2string(inset_.params(), buffer);
|
2003-03-07 18:44:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void InsetGraphicsMailer::string2params(string const & in,
|
2003-07-23 09:54:21 +00:00
|
|
|
Buffer const & buffer,
|
2003-07-25 17:11:25 +00:00
|
|
|
InsetGraphicsParams & params)
|
2003-03-07 18:44:57 +00:00
|
|
|
{
|
|
|
|
params = InsetGraphicsParams();
|
|
|
|
|
2003-04-24 20:02:49 +00:00
|
|
|
if (in.empty())
|
|
|
|
return;
|
|
|
|
|
2003-05-13 16:24:49 +00:00
|
|
|
istringstream data(STRCONV(in));
|
2003-03-07 18:44:57 +00:00
|
|
|
LyXLex lex(0,0);
|
|
|
|
lex.setStream(data);
|
|
|
|
|
|
|
|
if (lex.isOK()) {
|
|
|
|
lex.next();
|
|
|
|
string const token = lex.getString();
|
|
|
|
if (token != name_)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2003-03-10 03:11:54 +00:00
|
|
|
if (lex.isOK()) {
|
2003-04-24 20:02:49 +00:00
|
|
|
InsetGraphics inset;
|
2003-07-23 09:54:21 +00:00
|
|
|
inset.readInsetGraphics(lex, buffer.filePath());
|
2003-03-10 03:11:54 +00:00
|
|
|
params = inset.params();
|
|
|
|
}
|
2003-03-07 18:44:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
string const
|
2003-07-21 21:51:17 +00:00
|
|
|
InsetGraphicsMailer::params2string(InsetGraphicsParams const & params,
|
2003-07-23 09:54:21 +00:00
|
|
|
Buffer const & buffer)
|
2003-03-07 18:44:57 +00:00
|
|
|
{
|
|
|
|
ostringstream data;
|
|
|
|
data << name_ << ' ';
|
2003-07-23 09:54:21 +00:00
|
|
|
params.Write(data, buffer.filePath());
|
2003-03-07 18:44:57 +00:00
|
|
|
data << "\\end_inset\n";
|
2003-05-13 16:24:49 +00:00
|
|
|
return STRCONV(data.str());
|
2003-03-07 18:44:57 +00:00
|
|
|
}
|