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 67530bfa28ced6e4301106c16b934e4d4713ba6d..3d7f9552e1d0eaa8b3afad66133392b79ba76632 100644 (file)
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -11,7 +11,7 @@
 # Author: Richard Heck <rgheck@comcast.net>
 #         Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 63
+Format 65
 
 CiteFormat default
        #
@@ -32,13 +32,15 @@ CiteFormat default
        # Macros
        #
        # Scheme of the first author in the bibliography
-       !firstnameform %surname%{%prename%[[, %prename%]]}
+       !firstnameform {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
        # Scheme of other authors in the bibliography
-       !othernameform %surname%{%prename%[[, %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.