Consistent output of breakable/non-breakable dashes on all TeX engines.

[lyx.git] / lib / layouts / stdciteformats.inc

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index d8506c0da556ebc1004bf21a87f5b1b18b949dad..3d7f9552e1d0eaa8b3afad66133392b79ba76632 100644 (file)
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -1,9 +1,17 @@
-# 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>
 
-Format 63
+Format 65
 
 CiteFormat default
        #
@@ -24,13 +32,15 @@ CiteFormat default
        # Macros
        #
        # Scheme of the first author in the bibliography
-       !firstnameform %surname%, %prename%
+       !firstnameform {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
        # Scheme of other authors in the bibliography
-       !othernameform %surname%, %prename%
+       !othernameform {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
        # Scheme of the first name in later parts (such as book editor)
-       !firstbynameform %prename% %surname%
+       !firstbynameform %prename% {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}
        # Scheme of other authors in later parts (such as book editor)
-       !otherbynameform %prename% %surname%
+       !otherbynameform %prename% {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}
+       # Scheme of authors in citation references
+       !citenameform {%prefix%[[%prefix% ]]}%surname%
        # pagination
        !pages {%pages%[[, %_pptext% %pages%]]}
        # ed. or eds.