[svn-upgrade] Integrating new upstream version, jabref (2.4.2)

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

diff --git a/src/resource/layout/html.layout b/src/resource/layout/html.layout
index 9eec8d17fb99952fdb2bbd969ead79dd29dbf4b9..69fff25826394dc4d440f50c64c6cc80e69d45d2 100755 (executable)
--- a/src/resource/layout/html.layout
+++ b/src/resource/layout/html.layout
@@ -1,75 +1,81 @@
-<div class="bibtex_entry" title="Generated on \format[CurrentDate]{mm|dd|yyyy}">\r
-\r
-       <div class="bibtex_header">\r
-               <div class="bibtex_key">\r
-                       <a name="\bibtexkey">\bibtexkey</a>\r
-               </div>\r
-\r
-               \begin{doi}\r
-               <div class="bibtex_doi">\r
-                       <a href="http://dx.doi.org/\doi">doi</a>\r
-               </div>\r
-               \end{doi}\r
+<div class="bibtex_entry" title="Generated on \format[CurrentDate]{mm|dd|yyyy}">
+
+       <div class="bibtex_header">
+               <div class="bibtex_key">
+                       <a name="\bibtexkey">\bibtexkey</a>
+               </div>
+
+               \begin{doi}
+               <div class="bibtex_doi">
+                       <a href="http://dx.doi.org/\doi">doi</a>
+               </div>
+               \end{doi}
 
                \begin{pmid}
                <div class="bibtex_pmid">
                        <a href="http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?cmd=Retrieve&db=pubmed&dopt=Abstract&query_hl=1&itool=pubmed_docsum&list_uids=\pmid">pmid</a>
                </div>
                \end{pmid}
-\r
-               \begin{citeseerurl}\r
-               <div class="bibtex_citeseer">\r
-                       <a href="http://citeseer.ist.psu.edu/\citeseerurl">cs</a>\r
-               </div>\r
-               \end{citeseerurl}\r
-\r
-               \begin{pdf}\r
-               <div class="bibtex_pdf">\r
-                       <a href="\format[ResolvePDF]{\pdf}">pdf</a>\r
-               </div>\r
-               \end{pdf}\r
-\r
-               \begin{url}\r
-               <div class="bibtex_url">\r
-                       <a href="\url">url</a>\r
-               </div>\r
-               \end{url}\r
-       </div>\r
-\r
-       <div class="bibtex_content">\r
-\r
-               \begin{title}\r
-               <div class="bibtex_title">\r
-                       \format[HTMLChars,RemoveLatexCommands]{\title}\r
-               </div>\r
-               \end{title}\r
-\r
-               \begin{author}\r
-               <div class="bibtex_author">\r
-                       \format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer,HTMLChars]{\author}\r
-               </div>\r
-               \end{author}\r
-\r
-               \begin{journal}\r
-               <div class="bibtex_journal">\r
-                       \format[HTMLChars]{\journal}\r
-               </div>,\r
-               \end{journal}\r
-\r
-               \begin{volume}\r
-               <div class="bibtex_volume">\r
-                       Vol. \volume\r
-               </div>,\r
-               \end{volume}\r
-\r
-               \begin{pages}\r
-               <div class="bibtex_pages">\r
-                       pp. \format[FormatPagesForHTML]{\pages}\r
-               </div>,\r
-               \end{pages}\r
-\r
-               <div class="bibtex_year">\r
-                       \year\r
-               </div>\r
-       </div>\r
-</div>\r
+
+               \begin{citeseerurl}
+               <div class="bibtex_citeseer">
+                       <a href="http://citeseer.ist.psu.edu/\citeseerurl">cs</a>
+               </div>
+               \end{citeseerurl}
+
+               \begin{file}
+               <div class="bibtex_pdf">
+                       \format[FileLink(pdf),WrapContent(<a href=",">pdf</a>)]{\file}
+               </div>
+               \end{file}
+
+               \begin{pdf}
+               <div class="bibtex_pdf">
+                       <a href="\format[ResolvePDF]{\pdf}">pdf</a>
+               </div>
+               \end{pdf}
+
+               \begin{url}
+               <div class="bibtex_url">
+                       <a href="\url">url</a>
+               </div>
+               \end{url}
+       </div>
+
+       <div class="bibtex_content">
+
+               \begin{title}
+               <div class="bibtex_title">
+                       \format[HTMLChars,RemoveLatexCommands]{\title}
+               </div>
+               \end{title}
+
+               \begin{author}
+               <div class="bibtex_author">
+                       \format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer,HTMLChars]{\author}
+               </div>
+               \end{author}
+
+               \begin{journal}
+               <div class="bibtex_journal">
+                       \format[HTMLChars]{\journal}
+               </div>,
+               \end{journal}
+
+               \begin{volume}
+               <div class="bibtex_volume">
+                       Vol. \volume
+               </div>,
+               \end{volume}
+
+               \begin{pages}
+               <div class="bibtex_pages">
+                       pp. \format[FormatPagesForHTML]{\pages}
+               </div>,
+               \end{pages}
+
+               <div class="bibtex_year">
+                       \year
+               </div>
+       </div>
+</div>