anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 22:06:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

For linuxdoc and docbook:

Browse Source 
* add empty methods to insetnote (as latex)
   * fix use of uninitialized varible in insetquote
   * fix standard style in layout files.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3664 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2002-03-05 13:38:40 +00:00
parent a2a6509aff
commit d228f08abd
9 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ChangeLog
View File

@ -1,3 +1,10 @@
2002-03-05 Jose Abilio Oliveira Matos <jamatos@novalis.fc.up.pt>
* layouts/db_stdclass.inc:
* layouts/linuxdoc.layout:
* layouts/manpage.layout: set DefaultStyle
2002-03-04 Herbert Voss <voss@perce.de> 2002-03-04 Herbert Voss <voss@perce.de>
* configure.m4: fix the problem with tgif's xpm export * configure.m4: fix the problem with tgif's xpm export

1
lib/layouts/db_stdclass.inc
View File

@ -12,6 +12,7 @@ Columns 1
Sides 1 Sides 1
SecNumDepth 3 SecNumDepth 3
TocDepth 3 TocDepth 3
DefaultStyle Standard
# This is just to show how to declare the default font. # This is just to show how to declare the default font.
# The defaults are exactly those shown here. # The defaults are exactly those shown here.

1
lib/layouts/linuxdoc.layout
View File

@ -9,6 +9,7 @@ Sides 1
PageStyle Plain PageStyle Plain
MaxCounter Counter_Section MaxCounter Counter_Section
OutputType linuxdoc OutputType linuxdoc
DefaultStyle Standard
# Standard style definition # Standard style definition
Style Standard Style Standard

3
lib/layouts/manpage.layout
View File

@ -7,8 +7,9 @@
Columns 1 Columns 1
Sides 1 Sides 1
PageStyle Plain PageStyle Plain
MaxCounter Counter_Subsection MaxCounter Counter_Section
OutputType linuxdoc OutputType linuxdoc
DefaultStyle Standard
# Standard style definition # Standard style definition
Style Standard Style Standard

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2002-03-05 José Abílio Oliveira Matos <jamatos@novalis.fc.up.pt>
* buffer.C (makeLinuxDocFile, makeDocBookFile): take in account the
final location of file, for the included files, and graphics.
2002-03-05 Juergen Vigna <jug@sad.it> 2002-03-05 Juergen Vigna <jug@sad.it>
* CutAndPaste.C (pasteSelection): fix the depth level on paste. * CutAndPaste.C (pasteSelection): fix the depth level on paste.

8
src/buffer.C
View File

@ -2627,7 +2627,9 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
ofs << "<!doctype linuxdoc system"; ofs << "<!doctype linuxdoc system";
string preamble = params.preamble; string preamble = params.preamble;
preamble += features.getIncludedFiles(fname); const string name = nice ? ChangeExtension(filename_, ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities(); preamble += features.getLyXSGMLEntities();
if (!preamble.empty()) { if (!preamble.empty()) {
@ -3066,7 +3068,9 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
<< " PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\""; << " PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
string preamble = params.preamble; string preamble = params.preamble;
preamble += features.getIncludedFiles(fname); const string name = nice ? ChangeExtension(filename_, ".sgml")
: fname;
preamble += features.getIncludedFiles(name);
preamble += features.getLyXSGMLEntities(); preamble += features.getLyXSGMLEntities();
if (!preamble.empty()) { if (!preamble.empty()) {

6
src/insets/ChangeLog
View File

@ -1,3 +1,9 @@
2002-03-05 José Abílio Oliveira Matos <jamatos@novalis.fc.up.pt>
* insetnote.h (linuxdoc, docbook): add empty methods.
* insetinclude.C (validate): fix a case where buffer->niceFile was used
before being initialized.
2002-03-05 Juergen Vigna <jug@sad.it> 2002-03-05 Juergen Vigna <jug@sad.it>
* insettext.C (insetButtonPress): don't call exit on a InsetButtonPress * insettext.C (insetButtonPress): don't call exit on a InsetButtonPress

7
src/insets/insetinclude.C
View File

@ -407,11 +407,14 @@ void InsetInclude::validate(LaTeXFeatures & features) const
// to be loaded: // to be loaded:
if (loadIfNeeded()) { if (loadIfNeeded()) {
// a file got loaded // a file got loaded
Buffer const * const tmp = bufferlist.getBuffer(getFileName()); Buffer * const tmp = bufferlist.getBuffer(getFileName());
if (tmp) if (tmp) {
if (b)
tmp->niceFile = b->niceFile;
tmp->validate(features); tmp->validate(features);
} }
} }
}
vector<string> const InsetInclude::getLabelList() const vector<string> const InsetInclude::getLabelList() const

6
src/insets/insetnote.h
View File

@ -41,6 +41,12 @@ public:
int latex(Buffer const *, std::ostream &, bool, bool) const int latex(Buffer const *, std::ostream &, bool, bool) const
{ return 0; } { return 0; }
/// ///
int linuxdoc(Buffer const *, std::ostream &) const
{ return 0; }
///
int docbook(Buffer const *, std::ostream &) const
{ return 0; }
///
void validate(LaTeXFeatures &) const {} void validate(LaTeXFeatures &) const {}
private: private:
/// used by the constructors /// used by the constructors