> 
>   In docbook the whole header-like stuff is at the same depth as the usual
> sections for that style ( section for articles and chapters for book) so that
> as soon as the chapter begins the header closes.
> 
>   This has some problems, sometimes but IMHO it is more homegeneous than the
> intitle hack. :-)

The attached is done in that way. I also fixed a bug that made it
impossible to have an empty command with KeepEmpty = 1 :-)

Does this look OK?

- Martin

Index: src/output_docbook.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/output_docbook.C,v
retrieving revision 1.3
diff -u -p -r1.3 output_docbook.C
--- src/output_docbook.C        25 Nov 2003 17:23:34 -0000      1.3
+++ src/output_docbook.C        17 Dec 2003 16:00:21 -0000
@@ -147,7 +147,7 @@ void docbookParagraphs(Buffer const & bu
                        // more WYSIWYM handling.
                        // This is a hack while paragraphs can't have
                        // attributes, like id in this case.
-                       if (par->isInset(0)) {
+                       if (par->size() && par->isInset(0)) {
                                InsetOld * inset = par->getInset(0);
                                InsetOld::Code lyx_code = inset->lyxCode();
                                if (lyx_code == InsetOld::LABEL_CODE) {
Index: lib/layouts/agu_stdclass.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/agu_stdclass.inc,v
retrieving revision 1.3
diff -u -p -r1.3 agu_stdclass.inc
--- lib/layouts/agu_stdclass.inc        6 Dec 2003 09:31:29 -0000       1.3
+++ lib/layouts/agu_stdclass.inc        17 Dec 2003 16:00:21 -0000
@@ -100,7 +100,7 @@ End
 Input agu_stdlists.inc
 Input agu_stdsections.inc
 Input db_stdstarsections.inc
-Input db_stdtitle.inc
+Input agu_stdtitle.inc
 Input db_stdstruct.inc
 Input db_lyxmacros.inc
 Input db_stdlayouts.inc
Index: lib/layouts/agu_stdtitle.inc
===================================================================
RCS file: lib/layouts/agu_stdtitle.inc
diff -N lib/layouts/agu_stdtitle.inc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lib/layouts/agu_stdtitle.inc        17 Dec 2003 16:00:21 -0000
@@ -0,0 +1,183 @@
+# Textclass definition file for agu-dtd.
+# Author : José Abílio Oliveira Matos <[EMAIL PROTECTED]>
+# Modified Martin Vermeer <[EMAIL PROTECTED]> 
+#
+# This file is the counterpart of stdstyle.inc
+# It is desirable, as far as possible, to have the same look and feel for
+# related layouts in latex and docbook.
+
+Input stdtitle.inc
+
+
+Style Header
+       Margin                First_dynamic
+       LatexType             Command
+       LatexName             header
+       LabelSep              xx
+       LabelType             Centered_Top_Environment
+       LabelString           "<header>"
+       CommandDepth          2
+       KeepEmpty             1
+       NextNoIndent          1
+       LabelFont
+         Color               green
+       EndFont
+End
+
+
+Style Special-section
+       CopyStyle             Header
+       LatexName             special-section
+       LabelType             Static
+       LabelString           "<special-section>"
+       CommandDepth          3
+       LabelFont
+         Color               blue
+       EndFont
+End
+
+
+Style AGU-journal
+       CopyStyle             Special-section
+       LatexName             AGU-journal
+       LabelString           "<AGU-journal>"
+       CommandDepth          3
+End
+
+
+Style AGU-volume
+       CopyStyle             Special-section
+       LatexName             AGU-volume
+       LabelString           "<AGU-volume>"
+       CommandDepth          3
+End
+
+
+Style AGU-issue
+       CopyStyle             Special-section
+       LatexName             AGU-issue
+       LabelString           "<AGU-issue>"
+       CommandDepth          3
+End
+
+
+Style Copyright
+       CopyStyle             Special-section
+       LatexName             copyright
+       LabelString           "<copyright>"
+       CommandDepth          3
+End
+
+
+Style Indexterms
+       CopyStyle             Special-section
+       LatexName             index-terms
+       LabelString           "<index-terms>"
+       CommandDepth          3
+End
+
+
+Style Keywords
+       CopyStyle             Special-section
+       LatexName             keywords
+       LabelString           "<keywords>"
+       CommandDepth          3
+End
+
+
+Style Affiliation
+       CopyStyle             Special-section
+       LatexName             affiliation
+       LabelString           "<affiliation>"
+       CommandDepth          3
+End
+
+
+Style Supplementary
+       CopyStyle             Special-section
+       LatexName             sup-mat-ref
+       LabelString           "<sup-mat-ref>"
+       CommandDepth          3
+End
+
+
+Style Author
+       CopyStyle             Special-section
+       LatexName             author
+       LabelString           "<author>"
+       CommandDepth          3
+End
+
+
+Style Abstract
+       LatexType             Environment
+       LabelType             Centered_Top_Environment
+       LabelString           "Abstract"
+       CommandDepth          3
+End
+
+
+Style Received
+       CopyStyle             Special-section
+       LatexName             received
+       LabelString           "<received>"
+       CommandDepth          3
+End
+
+
+Style Revised
+       CopyStyle             Special-section
+       LatexName             revised
+       LabelString           "<revised>"
+       CommandDepth          3
+End
+
+
+Style Accepted
+       CopyStyle             Special-section
+       LatexName             accepted
+       LabelString           "<accepted>"
+       CommandDepth          3
+End
+
+
+Style Identline
+       CopyStyle             Special-section
+       LatexName             ident-line
+       LabelString           "<ident-line>"
+       CommandDepth          3
+End
+
+
+Style Runhead
+       CopyStyle             Special-section
+       LatexName             runhead
+       LabelString           "<runhead>"
+       CommandDepth          3
+End
+
+
+Style Date
+       CopyStyle             Special-section
+       LatexName             date
+       LabelString           "<date>"
+       CommandDepth          3
+End
+
+
+Style Title
+       CopyStyle             Special-section
+       LatexName             title
+       LabelString           "<title>"
+       CommandDepth          3
+End
+
+
+Style Citation
+       CopyStyle             Special-section
+       LatexName             citation
+       LabelString           "<citation>"
+       CommandDepth          3
+End
+
+

Attachment: pgp00000.pgp
Description: PGP signature

Reply via email to