[svn-upgrade] Integrating new upstream version, jabref (2.6~beta3+dfsg)

[debian/jabref.git] / src / resource / layout / simplehtml.layout

diff --git a/src/resource/layout/simplehtml.layout b/src/resource/layout/simplehtml.layout
index 8535f63bdc86dad7fecb75425a8ed31814cf4bdc..a17e4d8a892bd3637fef75e0dcc574f0c13bbece 100755 (executable)
--- a/src/resource/layout/simplehtml.layout
+++ b/src/resource/layout/simplehtml.layout
@@ -1,15 +1,8 @@
-<font face="arial">\r
-<b><i>\bibtextype</i><a name="\bibtexkey">\begin{bibtexkey} (\bibtexkey)</a>\end{bibtexkey}</b>\r
-<br>\r
-\begin{author} \format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer,HTMLChars]{\author}<BR>\end{author}\r
-\begin{editor} \format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer,HTMLChars]{\editor} <i>(ed.)</i><BR>\end{editor}\r
-\begin{title} \format[HTMLChars]{\title} \end{title}<BR>\r
-\begin{chapter} \format[HTMLChars]{\chapter}<BR>\end{chapter}\r
-\begin{journal} <em>\format[HTMLChars]{\journal}, </em>\end{journal}\r
-\begin{school} <em>\format[HTMLChars]{\school}, </em>\end{school}\r
-\begin{institution} <em>\format[HTMLChars]{\institution}, </em>\end{institution}\r
-\begin{publisher} <em>\format[HTMLChars]{\publisher}, </em>\end{publisher}\r
-\begin{year}<b>\year</b>\end{year}\begin{volume}<i>, \volume</i>\end{volume}\begin{pages}, \format[FormatPagesForHTML]{\pages} \end{pages}\r
-</dd>\r
-<p></p>\r
-</font>\r
+<dt>\format[ToLowerCase]{\bibtextype}\begin{bibtexkey}<a name="\bibtexkey">(\bibtexkey)</a>\end{bibtexkey}</dt>
+\begin{author}<dd>\format[AuthorLastFirst,AuthorLastFirstAbbreviator,AuthorAndsCommaReplacer,NoSpaceBetweenAbbreviations,HTMLChars]{\author}</dd>\end{author}\begin{title}
+<dd><i>\format[HTMLChars]{\title}</i></dd>\end{title}\begin{editor}
+<dd>\format[AuthorLastFirst,AuthorLastFirstAbbreviator,AuthorAndsCommaReplacer,HTMLChars]{\editor} <i>(ed.)</i></dd>\end{editor}\begin{booktitle}
+<dd>\format[HTMLChars]{\booktitle}</dd>\end{booktitle}\begin{chapter}
+<dd>Chapter \format[HTMLChars]{\chapter}</dd>\end{chapter}
+<dd>\begin{journal}\format[HTMLChars]{\journal}, \end{journal}\begin{school}\format[HTMLChars]{\school}, \end{school}\begin{institution}\format[HTMLChars]{\institution}, \end{institution}\begin{publisher}\format[HTMLChars]{\publisher}, \end{publisher}\begin{howpublished}\format[HTMLChars]{\howpublished}, \end{howpublished}\begin{year}<b>\year</b>\end{year}\begin{volume}, Vol. \volume\end{volume}\begin{number}(\format[FormatPagesForHTML]{\number})\end{number}\begin{pages}, pp. \format[FormatPagesForHTML]{\pages}\end{pages}</dd>
+