From 773e2070f009d69c4ca6d3db119e18d4559446f8 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Sun, 9 Feb 2014 12:43:52 +0100
Subject: A bit of padding for book/rod names in ?/s

This looks much better.
---
 crawl-ref/source/command.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index e4523ab..4a86d37 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1142,16 +1142,16 @@ static bool _append_books(string &desc, item_def &item, string key)
         desc += "\n\nThis spell can be found in the following book";
         if (books.size() > 1)
             desc += "s";
-        desc += ":\n";
-        desc += comma_separated_line(books.begin(), books.end(), "\n", "\n");
+        desc += ":\n ";
+        desc += comma_separated_line(books.begin(), books.end(), "\n ", "\n ");
 
         if (!rods.empty())
         {
             desc += "\n\n... and the following rod";
             if (rods.size() > 1)
                 desc += "s";
-            desc += ":\n";
-            desc += comma_separated_line(rods.begin(), rods.end(), "\n", "\n");
+            desc += ":\n ";
+            desc += comma_separated_line(rods.begin(), rods.end(), "\n ", "\n ");
         }
     }
     else if (!rods.empty()) // rods-only
@@ -1159,8 +1159,8 @@ static bool _append_books(string &desc, item_def &item, string key)
         desc += "\n\nThis spell can be found in the following rod";
         if (rods.size() > 1)
             desc += "s";
-        desc += ":\n";
-        desc += comma_separated_line(rods.begin(), rods.end(), "\n", "\n");
+        desc += ":\n ";
+        desc += comma_separated_line(rods.begin(), rods.end(), "\n ", "\n ");
     }
     else
         desc += "\n\nThis spell is not found in any books or rods.";
-- 
1.8.5.4


From d9622be8a35e696e4034c1bbdb888fdb4c688b45 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Sun, 9 Feb 2014 12:48:48 +0100
Subject: Remove special message handling for book+rod spells

This was pretty much duplicated code for no gain, and the message didn't
even look better in the special-cased version. There is enough space for
the extra newline.
---
 crawl-ref/source/command.cc | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 4a86d37..e1210f9 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1145,16 +1145,9 @@ static bool _append_books(string &desc, item_def &item, string key)
         desc += ":\n ";
         desc += comma_separated_line(books.begin(), books.end(), "\n ", "\n ");
 
-        if (!rods.empty())
-        {
-            desc += "\n\n... and the following rod";
-            if (rods.size() > 1)
-                desc += "s";
-            desc += ":\n ";
-            desc += comma_separated_line(rods.begin(), rods.end(), "\n ", "\n ");
-        }
     }
-    else if (!rods.empty()) // rods-only
+
+    if (!rods.empty())
     {
         desc += "\n\nThis spell can be found in the following rod";
         if (rods.size() > 1)
@@ -1162,7 +1155,8 @@ static bool _append_books(string &desc, item_def &item, string key)
         desc += ":\n ";
         desc += comma_separated_line(rods.begin(), rods.end(), "\n ", "\n ");
     }
-    else
+
+    if (books.empty() && rods.empty())
         desc += "\n\nThis spell is not found in any books or rods.";
 
     return true;
-- 
1.8.5.4


From c5e84dcda7d967d0b6598a61ce2ef8d339a7b0e9 Mon Sep 17 00:00:00 2001
From: Chris Oelmueller <chris.oelmueller@gmail.com>
Date: Sun, 9 Feb 2014 12:47:36 +0100
Subject: A bit of padding for known items in \ autopickup screen

This looks much better, and is consistent both with inventory menus
and the "unknown" section of the very same menu.
---
 crawl-ref/source/itemname.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 20db435..0082e34 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -2233,9 +2233,9 @@ public:
         else
             symbol = '-';
 
-        return make_stringf("%c%c%c%c%s", hotkeys[0], need_cursor ? '[' : ' ',
-                                          symbol, need_cursor ? ']' : ' ',
-                                          name.c_str());
+        return make_stringf(" %c%c%c%c%s", hotkeys[0], need_cursor ? '[' : ' ',
+                                           symbol, need_cursor ? ']' : ' ',
+                                           name.c_str());
     }
 
     virtual int highlight_colour() const
-- 
1.8.5.4