anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Herbert's graphics10.diff patch, part I.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3533 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-02-13 18:53:36 +00:00
parent 956b1497fb
commit 49dcb7a5d4
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2002-02-12 Herbert Voss <voss@lyx.org>
* insetgraphics.C: latex(), return the correct newlines
2002-02-13 José Matos <jamatos@fep.up.pt> 2002-02-13 José Matos <jamatos@fep.up.pt>
* inseturl.C (docbook): escape & in url. * inseturl.C (docbook): escape & in url.

22
src/insets/insetgraphics.C
View File

@ -105,8 +105,9 @@ TODO Before initial production release:
#include "lyx_gui_misc.h" #include "lyx_gui_misc.h"
#include "support/FileInfo.h" #include "support/FileInfo.h"
#include "support/filetools.h" #include "support/filetools.h"
#include "frontends/controllers/helper_funcs.h" #include "support/lyxalgo.h" // lyx::count
#include "support/lyxlib.h" #include "support/lyxlib.h"
#include "frontends/controllers/helper_funcs.h"
#include "lyxtext.h" #include "lyxtext.h"
#include "lyxrc.h" #include "lyxrc.h"
#include "font.h" // For the lyxfont class. #include "font.h" // For the lyxfont class.
@ -581,31 +582,32 @@ int InsetGraphics::latex(Buffer const *buf, ostream & os,
<< _("empty figure path") << "}\n"; << _("empty figure path") << "}\n";
return 1; // One end of line marker added to the stream. return 1; // One end of line marker added to the stream.
} }
// Keep count of newlines that we issued. // These variables collect all the latex code that should be before and
#warning the newlines=0 were in the original code. where is the sense? (Herbert)
int newlines = 0;
// This variables collect all the latex code that should be before and
// after the actual includegraphics command. // after the actual includegraphics command.
string before; string before;
string after; string after;
// Do we want subcaptions? // Do we want subcaptions?
if (params.subcaption) { if (params.subcaption) {
before += "\\subfigure[" + params.subcaptionText + "]{"; before += "\\subfigure[" + params.subcaptionText + "]{";
after = '}' + after; after = '}';
} }
// We never use the starred form, we use the "clip" option instead. // We never use the starred form, we use the "clip" option instead.
os << before << "\\includegraphics"; before += "\\includegraphics";
// Write the options if there are any. // Write the options if there are any.
string const opts = createLatexOptions(); string const opts = createLatexOptions();
if (!opts.empty()) { if (!opts.empty()) {
os << "[%\n" << opts << ']'; before += ("[%\n" + opts +']');
} }
// Make the filename relative to the lyx file // Make the filename relative to the lyx file
// and remove the extension so the LaTeX will use whatever is // and remove the extension so the LaTeX will use whatever is
// appropriate (when there are several versions in different formats) // appropriate (when there are several versions in different formats)
string const filename = prepareFile(buf); string const latex_str = before + '{' + prepareFile(buf) + '}' + after;
os << '{' << filename << '}' << after; os << latex_str;
// Return how many newlines we issued. // Return how many newlines we issued.
int const newlines =
int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1);
// lyxerr << "includegraphics: " << newlines << " lines of text"
// << endl;
return newlines; return newlines;
} }