Making a few requested changes to the PR.

Signed-off-by: Johan Sarge <rabiteman_2000@yahoo.com>

Author: Johan Sarge

ChangeLog

@@ -1,6 +1,5 @@
 master/HEAD
-- Extended Unicode support in Composite, character display width now taken
-  into account
+- #117 Extended Unicode support in Composite, character display width now taken into account
           (thanks to Johan Sarge)
 - #111 Duration: support negative durations by prefixing a '-' before the P in ISO format
           (thanks to Andrew Poelstra)

src/Composite.cpp

@@ -25,9 +25,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <Composite.h>
+#include <format.h>
 #include <limits>
 #include <sstream>
-//#include <stack>
 #include <utf8.h>
 
 
@@ -240,8 +240,7 @@ std::string Composite::str () const
         column_count += 2;
         break;
       default:  // Should not happen.
-        // ISSUE: Report character width error?
-        return std::string ();  // Fail.
+        throw format ("Unexpected character width {1} of code point 0x{2}.", ch_width, formatHex (character));
       }
 
       // Remember byte offset of first UTF-8 byte of next character in the layer text.