Input stdciteformats to the cite engines directly

not to individual layouts.

Possibly fixes #10582

diff --git a/lib/citeengines/basic.citeengine b/lib/citeengines/basic.citeengine
index 2163641bfef34cf036a7f24428096d32b71fc1d5..278c3a47529c38746998b04fafea6ec17e02ddad 100644 (file)
--- a/lib/citeengines/basic.citeengine
+++ b/lib/citeengines/basic.citeengine
@@ -34,6 +34,9 @@ End
 # CITE FORMAT
 #
 
+# Input standard format definitions for the bibliography
+Input stdciteformats.inc
+
 # The following defines how the commands are represented in the GUI
 # (inset button and citation dialog) as well as in XHTML, docbook and
 # plain text output.

diff --git a/lib/citeengines/biblatex-natbib.citeengine b/lib/citeengines/biblatex-natbib.citeengine
index 25b76f6a2a5db0d3eb93d14e3e6ca0278f577a4e..842b05b237927e779db4e2b843e3d9f11f543942 100644 (file)
--- a/lib/citeengines/biblatex-natbib.citeengine
+++ b/lib/citeengines/biblatex-natbib.citeengine
@@ -123,6 +123,10 @@ End
 # There are common definitions (default) and specific definitions for
 # either cite engine type (which overwrite existing defaults.
 #
+
+# Input standard format definitions for the bibliography
+Input stdciteformats.inc
+
 CiteFormat default
        #
        # MACROS

diff --git a/lib/citeengines/biblatex.citeengine b/lib/citeengines/biblatex.citeengine
index c58e2be763e1942a75c375bc24e67023eb198cc4..2b2edb62913bcde4d1125448c5ee1bfa4ba8c8e6 100644 (file)
--- a/lib/citeengines/biblatex.citeengine
+++ b/lib/citeengines/biblatex.citeengine
@@ -114,6 +114,10 @@ End
 # There are common definitions (default) and specific definitions for
 # either cite engine type (which overwrite existing defaults.
 #
+
+# Input standard format definitions for the bibliography
+Input stdciteformats.inc
+
 CiteFormat default
        #
        # MACROS

diff --git a/lib/citeengines/jurabib.citeengine b/lib/citeengines/jurabib.citeengine
index 0cf07b93596826b1878b5f0e6f0221d6e1ae2141..91a4e0bd38dde16af07e5988d8d15976b0c424a9 100644 (file)
--- a/lib/citeengines/jurabib.citeengine
+++ b/lib/citeengines/jurabib.citeengine
@@ -106,6 +106,10 @@ End
 # (inset button and citation dialog) as well as in XHTML, docbook and
 # plain text output.
 #
+
+# Input standard format definitions for the bibliography
+Input stdciteformats.inc
+
 CiteFormat authoryear
        #
        # MACROS

diff --git a/lib/citeengines/natbib.citeengine b/lib/citeengines/natbib.citeengine
index 49b84138c1dbd88586191568070ef509b005e1df..14727068633937550145b7b65baace4149c901d6 100644 (file)
--- a/lib/citeengines/natbib.citeengine
+++ b/lib/citeengines/natbib.citeengine
@@ -104,6 +104,10 @@ End
 # There are common definitions (default) and specific definitions for
 # either cite engine type (which overwrite existing defaults.
 #
+
+# Input standard format definitions for the bibliography
+Input stdciteformats.inc
+
 CiteFormat default
        #
        # MACROS

diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout
index c593d0b7cbfc0211391d2b0928e392134e8f4c2f..61ba81cddc8f07b36388f1b0138a4f66b8215e24 100644 (file)
--- a/lib/layouts/paper.layout
+++ b/lib/layouts/paper.layout
@@ -35,7 +35,6 @@ Input stdlayouts.inc
 Input stdfloats.inc
 Input stdlists.inc
 Input stdcounters.inc
-Input stdciteformats.inc
 
 ###### All the section headings now use sans serif
 Input stdsections.inc

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index d8506c0da556ebc1004bf21a87f5b1b18b949dad..96573755a6478013a37b9e528913e167b877ca68 100644 (file)
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -1,4 +1,12 @@
-# Standard formats for citations.
+# Standard formats for bibliography entries.
+#
+# This defines how LyX displays bibliographic information in the GUI
+# as well as in text/xhtml output. The format of citation references
+# is defined in the *.citeengines files, which might override the
+# default formatting defined here.
+#
+# This file is included by the citation engines, so there is no need
+# to include it in individual classes.
 #
 # Author: Richard Heck <rgheck@comcast.net>
 #         Jürgen Spitzmüller <spitz@lyx.org>

diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc
index 7b76b2be1abb7c8dba58dc0d9d227359ede339e3..a942aa9a9ee937aae98a7ee010ea7722453553e4 100644 (file)
--- a/lib/layouts/stdclass.inc
+++ b/lib/layouts/stdclass.inc
@@ -55,4 +55,3 @@ Input stdtitle.inc
 Input stdstruct.inc
 Input lyxmacros.inc
 Input stdlayouts.inc
-Input stdciteformats.inc