Strip Unicode U+202B (right-to-left-embedding) code; it looks like DoM does RTL ...

[libsub.git] / src / subrip_reader.cc

diff --git a/src/subrip_reader.cc b/src/subrip_reader.cc
index a82862cb5bc060000773d3b1edaa172976086bd3..b5d04466bc7bb3e1f9cac167f75f204735b2642b 100644 (file)
--- a/src/subrip_reader.cc
+++ b/src/subrip_reader.cc
@@ -24,6 +24,7 @@
 #include "subrip_reader.h"
 #include "exceptions.h"
 #include "util.h"
+#include <locked_sstream.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>
@@ -37,17 +38,17 @@ using std::vector;
 using std::list;
 using std::cout;
 using std::hex;
-using std::stringstream;
 using boost::lexical_cast;
 using boost::to_upper;
 using boost::optional;
 using boost::function;
+using boost::algorithm::replace_all;
 using namespace sub;
 
 /** @param s Subtitle string encoded in UTF-8 */
 SubripReader::SubripReader (string const & s)
 {
-       stringstream str (s);
+       locked_stringstream str (s);
        this->read (boost::bind (&get_line_stringstream, &str));
 }
 
@@ -67,11 +68,11 @@ SubripReader::read (function<optional<string> ()> get_line)
        } state = COUNTER;
 
        RawSubtitle rs;
-       rs.font = "Arial";
-       rs.font_size.set_points (48);
+
+       /* This reader extracts no information about where the subtitle
+          should be on screen, so its reference is TOP_OF_SUBTITLE.
+       */
        rs.vertical_position.line = 0;
-       /* XXX: arbitrary */
-       rs.vertical_position.lines = 32;
        rs.vertical_position.reference = TOP_OF_SUBTITLE;
 
        while (true) {
@@ -81,16 +82,12 @@ SubripReader::read (function<optional<string> ()> get_line)
                }
 
                trim_right_if (*line, boost::is_any_of ("\n\r"));
+               remove_unicode_bom (line);
 
-               if (
-                       line->length() >= 3 &&
-                       static_cast<unsigned char> (line.get()[0]) == 0xef &&
-                       static_cast<unsigned char> (line.get()[1]) == 0xbb &&
-                       static_cast<unsigned char> (line.get()[2]) == 0xbf
-                       ) {
-
-                       /* Skip Unicode byte order mark */
-                       line = line->substr (3);
+               /* Keep some history in case there is an error to report */
+               _context.push_back (*line);
+               if (_context.size() > 5) {
+                       _context.pop_front ();
                }
 
                switch (state) {
@@ -113,9 +110,19 @@ SubripReader::read (function<optional<string> ()> get_line)
                case METADATA:
                {
                        vector<string> p;
-                       boost::algorithm::split (p, *line, boost::algorithm::is_any_of (" "));
+
+                       /* Further trim this line, removing spaces from the end */
+                       trim_right_if (*line, boost::is_any_of (" "));
+
+                       boost::algorithm::split (p, *line, boost::algorithm::is_any_of (" "), boost::token_compress_on);
                        if (p.size() != 3 && p.size() != 7) {
-                               throw SubripError (*line, "a time/position line");
+                               for (int i = 0; i < 2; ++i) {
+                                       optional<string> ex = get_line ();
+                                       if (ex) {
+                                               _context.push_back (*ex);
+                                       }
+                               }
+                               throw SubripError (*line, "a time/position line", _context);
                        }
 
                        rs.from = convert_time (p[0]);
@@ -144,7 +151,7 @@ SubripReader::convert_time (string t)
        vector<string> a;
        boost::algorithm::split (a, t, boost::is_any_of (":"));
        if (a.size() != 3) {
-               throw SubripError (t, "time in the format h:m:s,ms");
+               throw SubripError (t, "time in the format h:m:s,ms", _context);
        }
 
        vector<string> b;
@@ -221,12 +228,17 @@ SubripReader::convert_line (string t, RawSubtitle& p)
                                tag.clear ();
                                state = TEXT;
                        } else {
-                               tag += t[i];
+                               tag += tolower (t[i]);
                        }
                        break;
                }
        }
 
+       /* Strip Unicode U+202B (right-to-left embedding) as sometimes it is rendered
+          as a missing character.  This may be a hack.
+       */
+       replace_all (p.text, "\xe2\x80\xab", "");
+
        maybe_content (p);
 }