X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fstdciteformats.inc;h=fc34cb8750dae1399467d93181d1e07ea9e18d35;hb=8d8ee12e6481a2d9687228a4a5f9dd44a21a052e;hp=226d2b32fd704c6760229474b74ce84575ef064c;hpb=02e59530b15d223c0978ecacfb7379f7bec986f4;p=lyx.git

diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index 226d2b32fd..fc34cb8750 100644
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -1,33 +1,76 @@
-# 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 45
+Format 66
 
 CiteFormat default
-	# translatable bits
+	#
+	# Translatable bits
+	#
 	_pptext pp.
 	_edtext ed.
+	_edstext eds.
 	_voltext vol.
 	_numtext no.
 	_in in
+	# The following are handled by BiblioInfo. Note that preceding and trailing spaces matter
+	_namesep , [[separate author names in citation, except for last name]]
+	_lastnamesep , and [[separate name of last author in citation]]
+	_pairnamesep  and [[separate two authors in citation]]
 
-	# macros
+	#
+	# Macros
+	#
+	# Scheme of the first author in the bibliography
+	!firstnameform {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
+	# Scheme of other authors in the bibliography
+	!othernameform {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}{%prename%[[, %prename%]]}
+	# Scheme of the first name in later parts (such as book editor)
+	!firstbynameform %prename% {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}
+	# Scheme of other authors in later parts (such as book editor)
+	!otherbynameform %prename% {%prefix%[[%prefix% ]]}%surname%{%suffix%[[, %suffix%]]}
+	# Scheme of authors in citation references
+	!citenameform {%prefix%[[%prefix% ]]}%surname%
+	# pagination
 	!pages {%pages%[[, %_pptext% %pages%]]}
-	!authoredit {%author%[[%author%, ]][[{%editor%[[%editor%, %_edtext%, ]]}]]}
+	# ed. or eds.
+	!makeed {%ifmultiple:editor%[[%_edstext%]][[%_edtext%]]}
+	# author or editor, as fullnames, following the schemes above
+	!authoredit {%fullnames:author%[[%fullnames:author%, ]][[{%fullnames:editor%[[%fullnames:editor%, %!makeed%, ]]}]]}
+	# "vol. 1, no.
 	!volnum {%volume%[[ %_voltext% %volume%, {%number%[[%_numtext% %number%]]}]]}
 	!quotetitle "%title%"
 	!emphtitle {!<i>!}%title%{!</i>!}
-	!emphjournal {!<i>!}%journal%{!</i>!}
+	!emphjournal {!<i>!}{%journal%[[%journal%]][[{%journaltitle%[[%journaltitle%]]}]]}{!</i>!}
+	!location {%address%[[%address%: ]][[{%location%[[%location%: ]]}]]}
 
-	!insomething %author%, %!quotetitle%, %_in%{%editor%[[ %editor%, %_edtext%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%)%!pages%.{%note%[[ %note%]]}
+	#
+	# Entry types. Note that final punctuation will be added later, if needed.
+	#
+	!insomething %fullnames:author%, %!quotetitle%, %_in%{%fullbynames:editor%[[ %fullbynames:editor%, %!makeed%,]]} {!<i>!}%booktitle%{!</i>!}%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%)%!pages%{%note%[[. %note%]]}
 
-	article %author%, %!quotetitle%, %!emphjournal% {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%)%!pages%.{%note%[[ %note%]]}
+	article %fullnames:author%, %!quotetitle%, %!emphjournal% {%volume%[[ %volume%{%number%[[, %number%]]}]]} (%year%)%!pages%{%note%[[. %note%]]}
 
-	book %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} ({%address%[[%address%: ]]}%publisher%, %year%).{%note%[[ %note%]]}
+	!booklike %!authoredit%%!emphtitle%%!volnum%{%edition%[[ %edition%]]} (%!location%%publisher%, %year%){%note%[[. %note%]]}
+	book %!booklike%
+	collection %!booklike%
+	proceedings %!booklike%
 
 	incollection %!insomething%
 	inproceedings %!insomething%
 
-	thesis %author%, %title% ({%address%[[%address%: ]]}%school%, %year%).{%note%[[ %note%]]}
+	!theses %fullnames:author%, %title% (%!location%{%school%[[%school%]][[%institution%]]}, %year%){%note%[[. %note%]]}
+	thesis %!theses%
+	phdthesis %!theses%
+	mastersthesis %!theses%
 End