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

fix writing of tabulars; output the real lyx version number at the top of generated files

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7418 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2003-07-28 14:09:05 +00:00
parent 34215d69bc
commit 6f91069b50
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
po/POTFILES.in
View File

@ -179,7 +179,6 @@ src/mathed/ref_inset.C
src/paragraph.C
src/paragraph_funcs.C
src/rowpainter.C
src/support/path_defines.C
src/text.C
src/text2.C
src/text3.C

12
src/ChangeLog
View File

@ -1,3 +1,14 @@
2003-07-28 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* buffer.C (do_writeFile, makeLaTeXFile, makeLinuxDocFile,
makeDocBookFile): put the real LyX version in the first line of
the file
* version.h:
* version.C.in: remove lyx_docversion
* tabular.C (write_attribute): add a template-based version to
write enums properly
2003-07-28 André Pönitz <poenitz@gmx.net>
@ -16,7 +27,6 @@
(do_writeFile): new func, dont call expliti close... will this
breake anything?
* Makefile.am (lyx_LDADD): add -lz
2003-07-28 José Matos <jamatos@fep.up.pt>

8
src/buffer.C
View File

@ -668,7 +668,7 @@ bool Buffer::do_writeFile(ostream & ofs) const
// The top of the file should not be written by params.
// write out a comment in the top of the file
ofs << '#' << lyx_docversion
ofs << "#LyX " << lyx_version
<< " created this file. For more info see http://www.lyx.org/\n"
<< "\\lyxformat " << LYX_FORMAT << "\n";
@ -970,7 +970,7 @@ void Buffer::makeLaTeXFile(ostream & os,
texrow.start(paragraphs.begin()->id(), 0);
if (output_preamble && runparams.nice) {
os << "%% " << lyx_docversion << " created this file. "
os << "%% LyX " << lyx_version << " created this file. "
"For more info, see http://www.lyx.org/.\n"
"%% Do not edit unless you really know what "
"you are doing.\n";
@ -1133,7 +1133,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
}
}
ofs << "<!-- " << lyx_docversion
ofs << "<!-- LyX " << lyx_version
<< " created this file. For more info see http://www.lyx.org/"
<< " -->\n";
@ -1564,7 +1564,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
}
sgml::openTag(ofs, 0, false, top);
ofs << "<!-- DocBook file was created by " << lyx_docversion
ofs << "<!-- DocBook file was created by LyX " << lyx_version
<< "\n See http://www.lyx.org/ for more information -->\n";
vector<string> environment_stack(10);

7
src/tabular.C
View File

@ -54,6 +54,13 @@ namespace {
int const WIDTH_OF_LINE = 5;
template <class T>
string const write_attribute(string const & name, T const & t)
{
string const s = tostr(t);
return s.empty() ? s : " " + name + "=\"" + s + "\"";
}
string const write_attribute(string const & name, string const & t)
{
return t.empty() ? t : " " + name + "=\"" + t + "\"";

3
src/version.C.in
View File

@ -15,8 +15,5 @@ char const * lyx_version = "@VERSION@";
///
char const * lyx_release_date = "Thu, Jan 30, 2003";
/// This version string is intended to be used in files created by LyX
char const * lyx_docversion = "LyX 1.4";
/// This is the version information shown by 'lyx -version'
char const * lyx_version_info = "@VERSION_INFO@";

3
src/version.h
View File

@ -17,9 +17,6 @@ extern char const * lyx_version;
///
extern char const * lyx_release_date;
/// This version string is intended to be used in files created by LyX
extern char const * lyx_docversion;
/// This is the version information shown by 'lyx -version'
extern char const * lyx_version_info;