From 3989a1335974dd7dea7ba0aef39edc90b416f272 Mon Sep 17 00:00:00 2001
From: Fabien Benureau <fabien.benureau+git@gmail.com>
Date: Sat, 24 Jan 2015 00:59:26 +0100
Subject: [PATCH] updated oneliner and colors

---
 pubs/color.py  |  4 ++--
 pubs/pretty.py | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pubs/color.py b/pubs/color.py
index 98d50c5..378f2d8 100644
--- a/pubs/color.py
+++ b/pubs/color.py
@@ -19,8 +19,8 @@ ok       = green
 error    = red
 normal   = grey
 citekey  = purple
-filepath = cyan
-tag      = blue
+filepath = bold
+tag      = cyan
 
 def dye(s, color=end, bold=False):
     assert color[0] == '\033'
diff --git a/pubs/pretty.py b/pubs/pretty.py
index f9d2cce..ce1b2ae 100644
--- a/pubs/pretty.py
+++ b/pubs/pretty.py
@@ -16,7 +16,7 @@ def short_authors(bibentry):
     try:
         authors = [p for p in bibentry['author']]
         if len(authors) < 3:
-            return ', '.join(authors)
+            return ' and '.join(authors)
         else:
             return authors[0] + (' et al.' if len(authors) > 1 else '')
     except KeyError:  # When no author is defined
@@ -31,7 +31,7 @@ def bib_oneliner(bibentry):
     elif bibentry['type'] == 'inproceedings':
         journal = ' ' + bibentry.get('booktitle', '')
 
-    return u'{authors} \"{title}\"{journal}{year}'.format(
+    return u'{authors}z \"{title}\"{journal}{year}'.format(
             authors=color.dye(authors, color.grey, bold=True),
             title=bibentry['title'],
             journal=color.dye(journal, color.yellow),
@@ -53,9 +53,8 @@ def paper_oneliner(p, citekey_only = False):
         return p.citekey
     else:
         bibdesc = bib_oneliner(p.bibentry)
+        tags = '' if len(p.tags) == 0 else '| {}'.format(
+            ','.join(color.dye(t, color.tag) for t in sorted(p.tags)))
         return u'[{citekey}] {descr} {tags}'.format(
             citekey=color.dye(p.citekey, color.purple),
-            descr=bibdesc,
-            tags=color.dye(' '.join(sorted(p.tags)),
-                           color.tag, bold=False),
-            )
+            descr=bibdesc, tags=tags)