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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 7d7f656f63bbf612bfcd6729588c5ca7d1d75eb5..228fda7c7080e56e8171d0361c2fd7630b73c5a3 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -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>
 
        * 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 dc310a27135a9ac2cfe369bb0e5d8f1f7b02ac57..621cf60ed6550c783d2110d37baa3bb83b792d0a 100644 (file)
--- 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 1594234da98e540e1ec84b75353443088ccb6c2f..947a08964f1d616ffa4a95147d13508360eb9578 100644 (file)
--- 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 3f6bc48659473624d4b67f15eb25835c39cbee93..93aa981306b0c1e34a4b07946aeb32f4d8674835 100644 (file)
--- 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 1dfb88f7df1b3d2e494900c73a81ceb129936e74..d5bd5b7d7f384dafccc9099e35701da172539de9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
        * CutAndPaste.C (pasteSelection): fix the depth level on paste.

diff --git a/src/buffer.C b/src/buffer.C
index b08076e05592d2f1c2da4fc6c4560a8cb0bfd1f1..5164fdf4821d8bd8bfef945de24c2f5d22860b7b 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2627,7 +2627,9 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                ofs << "<!doctype linuxdoc system";
 
                string preamble = params.preamble;
-               preamble += features.getIncludedFiles(fname);
+               const string name = nice ? ChangeExtension(filename_, ".sgml")
+                        : fname;
+               preamble += features.getIncludedFiles(name);
                preamble += features.getLyXSGMLEntities();
 
                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\"";
 
                string preamble = params.preamble;
-               preamble += features.getIncludedFiles(fname);
+               const string name = nice ? ChangeExtension(filename_, ".sgml")
+                        : fname;
+               preamble += features.getIncludedFiles(name);
                preamble += features.getLyXSGMLEntities();
 
                if (!preamble.empty()) {

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 86b6be23924d512c501a72378d30897901f4dea8..6340248d89d3b59e1428603b43a874d8c4277b44 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -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>
 
        * insettext.C (insetButtonPress): don't call exit on a InsetButtonPress

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index ddde4d5cd5e01d89f0da6954c32e841340e2f279..a95bc6d0ba81f25988f623ec11983468f3e5d43e 100644 (file)
--- 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 ed02318d088ff8a2dfa3a86cfac6b79921640c8e..3725b5333892ee935539ef7ea419cd563293e487 100644 (file)
--- 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