From d228f08abd9d676597340967def00300735f94cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Matox?= Date: Tue, 5 Mar 2002 13:38:40 +0000 Subject: [PATCH] For linuxdoc and docbook: * 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 --- lib/ChangeLog | 7 +++++++ lib/layouts/db_stdclass.inc | 1 + lib/layouts/linuxdoc.layout | 1 + lib/layouts/manpage.layout | 3 ++- src/ChangeLog | 5 +++++ src/buffer.C | 8 ++++++-- src/insets/ChangeLog | 6 ++++++ src/insets/insetinclude.C | 7 +++++-- src/insets/insetnote.h | 6 ++++++ 9 files changed, 39 insertions(+), 5 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 7d7f656f63..228fda7c70 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2002-03-05 Jose Abilio Oliveira Matos + + * layouts/db_stdclass.inc: + * layouts/linuxdoc.layout: + * layouts/manpage.layout: set DefaultStyle + + 2002-03-04 Herbert Voss * configure.m4: fix the problem with tgif's xpm export diff --git a/lib/layouts/db_stdclass.inc b/lib/layouts/db_stdclass.inc index dc310a2713..621cf60ed6 100644 --- a/lib/layouts/db_stdclass.inc +++ b/lib/layouts/db_stdclass.inc @@ -12,6 +12,7 @@ Columns 1 Sides 1 SecNumDepth 3 TocDepth 3 +DefaultStyle Standard # This is just to show how to declare the default font. # The defaults are exactly those shown here. diff --git a/lib/layouts/linuxdoc.layout b/lib/layouts/linuxdoc.layout index 1594234da9..947a08964f 100644 --- a/lib/layouts/linuxdoc.layout +++ b/lib/layouts/linuxdoc.layout @@ -9,6 +9,7 @@ Sides 1 PageStyle Plain MaxCounter Counter_Section OutputType linuxdoc +DefaultStyle Standard # Standard style definition Style Standard diff --git a/lib/layouts/manpage.layout b/lib/layouts/manpage.layout index 3f6bc48659..93aa981306 100644 --- a/lib/layouts/manpage.layout +++ b/lib/layouts/manpage.layout @@ -7,8 +7,9 @@ Columns 1 Sides 1 PageStyle Plain -MaxCounter Counter_Subsection +MaxCounter Counter_Section OutputType linuxdoc +DefaultStyle Standard # Standard style definition Style Standard diff --git a/src/ChangeLog b/src/ChangeLog index 1dfb88f7df..d5bd5b7d7f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-03-05 José Abílio Oliveira Matos + + * buffer.C (makeLinuxDocFile, makeDocBookFile): take in account the + final location of file, for the included files, and graphics. + 2002-03-05 Juergen Vigna * CutAndPaste.C (pasteSelection): fix the depth level on paste. diff --git a/src/buffer.C b/src/buffer.C index b08076e055..5164fdf482 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -2627,7 +2627,9 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) ofs << " + + * 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 * insettext.C (insetButtonPress): don't call exit on a InsetButtonPress diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C index ddde4d5cd5..a95bc6d0ba 100644 --- a/src/insets/insetinclude.C +++ b/src/insets/insetinclude.C @@ -407,9 +407,12 @@ void InsetInclude::validate(LaTeXFeatures & features) const // to be loaded: if (loadIfNeeded()) { // a file got loaded - Buffer const * const tmp = bufferlist.getBuffer(getFileName()); - if (tmp) + Buffer * const tmp = bufferlist.getBuffer(getFileName()); + if (tmp) { + if (b) + tmp->niceFile = b->niceFile; tmp->validate(features); + } } } diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h index ed02318d08..3725b53338 100644 --- a/src/insets/insetnote.h +++ b/src/insets/insetnote.h @@ -41,6 +41,12 @@ public: int latex(Buffer const *, std::ostream &, bool, bool) const { return 0; } /// + int linuxdoc(Buffer const *, std::ostream &) const + { return 0; } + /// + int docbook(Buffer const *, std::ostream &) const + { return 0; } + /// void validate(LaTeXFeatures &) const {} private: /// used by the constructors -- 2.39.2