On Mon, May 02, 2005 at 06:53:26PM +0200, Juergen Spitzmueller wrote:
> Angus Leeming wrote:
> > > There are two layouts by the name of Bibliography, one in stdlists.inc,
> > > and one in stdstruct.inc. What makes this interesting is that they look
> > > rather different... will the real Bibliography please stand up?
> >
> > The Bibliography is totally hosed at the moment, so choice of layout is
> > almost irrelevant :(
> 
> I take it that Martin likes to change this ;-)
> I guess, since at least stdclass.inc (and scrclass.inc, for that matter) 
> include stdstruct after stdlist, that the stdstruct definition will be used 
> at the end. Also, this one looks better to me.
> 
> Jürgen

OK, see the attached, which makes bib handling a little saner. Andre,
for a smile, note the BIBTEX/BIBITEM mixup, back in 2003 :-)

In order to see the sanity and see the References label come up, you must 
give the "bibitem-insert" minibuffer command for the FIRST bibitem. 
Again my question: how to (best) automate this?

If nobody sees a problem I'll put this in.

- Martin

Index: src/paragraph.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/paragraph.C,v
retrieving revision 1.404
diff -u -p -r1.404 paragraph.C
--- src/paragraph.C     11 Apr 2005 15:09:54 -0000      1.404
+++ src/paragraph.C     3 May 2005 07:48:41 -0000
@@ -704,7 +704,7 @@ InsetBibitem * Paragraph::bibitem() cons
 {
        if (!insetlist.empty()) {
                InsetBase * inset = insetlist.begin()->inset;
-               if (inset->lyxCode() == InsetBase::BIBTEX_CODE)
+               if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
                        return static_cast<InsetBibitem *>(inset);
        }
        return 0;
Index: lib/layouts/stdlists.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/stdlists.inc,v
retrieving revision 1.10
diff -u -p -r1.10 stdlists.inc
--- lib/layouts/stdlists.inc    13 Oct 2003 09:50:10 -0000      1.10
+++ lib/layouts/stdlists.inc    3 May 2005 07:48:41 -0000
@@ -93,24 +93,6 @@ Style List
 End
 
 
-Style Bibliography
-       Margin                Static
-       LatexType             Bib_Environment
-       LatexName             thebibliography
-       NextNoIndent          1
-       LeftMargin            MMN
-       LabelSep              xx
-       ParSkip               0.0
-       ItemSep               0.2
-       TopSep                0.7
-       BottomSep             0.7
-       ParSep                0.3
-       Align                 Block
-       AlignPossible         Block, Left
-       LabelType             Enumerate
-End
-
-
 #
 # New environments (not active yet)
 #
Index: lib/layouts/stdstruct.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/stdstruct.inc,v
retrieving revision 1.7
diff -u -p -r1.7 stdstruct.inc
--- lib/layouts/stdstruct.inc   13 Oct 2003 09:50:10 -0000      1.7
+++ lib/layouts/stdstruct.inc   3 May 2005 07:48:41 -0000
@@ -50,7 +50,7 @@ Style Bibliography
        AlignPossible         Block, Left
        LabelType             Bibliography
        LabelString           References
-       LabelBottomSep    0.7
+       LabelBottomSep        1.2
        LabelFont
          Series              Bold
          Size                Larger

Attachment: pgpswyD64mncW.pgp
Description: PGP signature

Reply via email to