AGU header stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8264 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d4e5951e3ad6149146407ec2b2b52a1c154df7ae..1ac7b25190144cca017698ae32de8f2f5c78d3ce 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-18  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * agu_stdclass.inc:
+       * agu_stdtitle.inc: AGU header stuff
+
 2003-12-15  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * examples/Minipage.lyx: fix width units (c% -> text%).

diff --git a/lib/layouts/agu_stdclass.inc b/lib/layouts/agu_stdclass.inc
index 5a73fcfc83a9250a222bf10ebd842b246e57aada..a67a813fcbc25aa0792f297fcc35b50874c1921f 100644 (file)
--- a/lib/layouts/agu_stdclass.inc
+++ b/lib/layouts/agu_stdclass.inc
@@ -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

diff --git a/lib/layouts/agu_stdtitle.inc b/lib/layouts/agu_stdtitle.inc
new file mode 100644 (file)
index 0000000..1e30a07
--- /dev/null
+++ b/lib/layouts/agu_stdtitle.inc
@@ -0,0 +1,183 @@
+# Textclass definition file for agu-dtd.
+# Author : José Abílio Oliveira Matos <jamatos@lyx.org>
+# Modified Martin Vermeer <martin.vermeer@hut.fi> 
+#
+# 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
+
+

diff --git a/src/ChangeLog b/src/ChangeLog
index bd85f085e8b7838209b84e280c89d5450546ad27..5d2ee9d9802d5ff7a4b52493d40f9e930ca679ce 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-18  Martin Vermeer  <martin.vermeer@hut.fi>
+
+       * output_docbook.C: header stuff for AGU
+
 2003-12-17  Alfredo Braunstein  <abraunst@lyx.org>
 
        * text2.C (redoCursor): remove

diff --git a/src/output_docbook.C b/src/output_docbook.C
index 8602b672830d0a4b7ba59c5978b541ef2c71225b..cc8e8d670ab93fb1dc5f784ec2a5f8213cecbc47 100644 (file)
--- a/src/output_docbook.C
+++ b/src/output_docbook.C
@@ -147,7 +147,7 @@ void docbookParagraphs(Buffer const & buf,
                        // 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) {