Cleaned up and applied 1895117: formatted_string and tutorial polish.

- formatted_message_history handles linebreaks within color spans properly,
  and now makes print_formatted_paragraph redundant.  (changed tutorial.cc
  to take advantage of this)
- formatted_string handles <color></color> properly (with nesting) instead
  of reverting to lightgrey.  (changed tutorial.cc to take advantage of
  this, too)
- The part of 1895117 that dealt with dec glyphs was already addressed in
  a previous patch, in a more robust way, so that got cut.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3481 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 1 deletions

diff --git a/crawl-ref/source/message.h b/crawl-ref/source/message.h
index 3eb6d9dd2f..210e833010 100644
--- a/crawl-ref/source/message.h
+++ b/crawl-ref/source/message.h
@@ -53,7 +53,8 @@ void formatted_mpr(const formatted_string& fs,
                    
 void formatted_message_history(const std::string &st,
                                msg_channel_type channel = MSGCH_PLAIN,
-                               int param = 0);
+                               int param = 0,
+                               int wrap_col = 0);
 
 // mpr() an arbitrarily long list of strings
 void mpr_comma_separated_list(const std::string prefix,