From 5b713494506d4212709d4c88c94be1a0b1e4f794 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 18 Mar 2017 11:26:23 +0100 Subject: [PATCH] Input stdciteformats to the cite engines directly not to individual layouts. Possibly fixes #10582 --- lib/citeengines/basic.citeengine | 3 +++ lib/citeengines/biblatex-natbib.citeengine | 4 ++++ lib/citeengines/biblatex.citeengine | 4 ++++ lib/citeengines/jurabib.citeengine | 4 ++++ lib/citeengines/natbib.citeengine | 4 ++++ lib/layouts/paper.layout | 1 - lib/layouts/stdciteformats.inc | 10 +++++++++- lib/layouts/stdclass.inc | 1 - 8 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lib/citeengines/basic.citeengine b/lib/citeengines/basic.citeengine index 2163641bfe..278c3a4752 100644 --- 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 25b76f6a2a..842b05b237 100644 --- 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 c58e2be763..2b2edb6291 100644 --- 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 0cf07b9359..91a4e0bd38 100644 --- 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 49b84138c1..1472706863 100644 --- 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 c593d0b7cb..61ba81cddc 100644 --- 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 d8506c0da5..96573755a6 100644 --- 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 # Jürgen Spitzmüller diff --git a/lib/layouts/stdclass.inc b/lib/layouts/stdclass.inc index 7b76b2be1a..a942aa9a9e 100644 --- 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 -- 2.39.2