iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Count characters rather than bytes in the character counter

This commit is contained in:
Thomas Goyne 2013-02-05 09:13:51 -08:00
parent 777649a551
commit 9f2fdb2a86
1 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
aegisub/src/utils.cpp
View File

@ -41,6 +41,7 @@
#include "main.h" #include "main.h"
#include "options.h" #include "options.h"
#include <libaegisub/ass/dialogue_parser.h>
#include <libaegisub/dispatch.h> #include <libaegisub/dispatch.h>
#include <libaegisub/fs.h> #include <libaegisub/fs.h>
#include <libaegisub/log.h> #include <libaegisub/log.h>
@ -50,6 +51,8 @@
#endif #endif
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/locale/boundary.hpp>
#include <boost/range/algorithm_ext.hpp>
#include <map> #include <map>
#include <wx/clipbrd.h> #include <wx/clipbrd.h>
@ -237,47 +240,30 @@ void CleanCache(agi::fs::path const& directory, std::string const& file_type, ui
} }
size_t MaxLineLength(std::string const& text) { size_t MaxLineLength(std::string const& text) {
auto tokens = agi::ass::TokenizeDialogueBody(text);
agi::ass::MarkDrawings(text, tokens);
size_t pos = 0;
size_t max_line_length = 0; size_t max_line_length = 0;
size_t current_line_length = 0; size_t current_line_length = 0;
bool last_was_slash = false; for (auto token : tokens) {
bool in_ovr = false; if (token.type == agi::ass::DialogueTokenType::LINE_BREAK) {
if (text[pos + 1] == 'h')
for (auto const& c : text) { current_line_length += 1;
if (in_ovr) { else { // N or n
in_ovr = c != '}';
continue;
}
if (c == '\\') {
current_line_length += last_was_slash; // for the slash before this one
last_was_slash = true;
continue;
}
if (last_was_slash) {
last_was_slash = false;
if (c == 'h') {
++current_line_length;
continue;
}
if (c == 'n' || c == 'N') {
max_line_length = std::max(max_line_length, current_line_length); max_line_length = std::max(max_line_length, current_line_length);
current_line_length = 0; current_line_length = 0;
continue; }
}
else if (token.type == agi::ass::DialogueTokenType::TEXT) {
using namespace boost::locale::boundary;
const ssegment_index characters(character, begin(text) + pos, begin(text) + pos + token.length);
current_line_length += boost::distance(characters);
} }
// Not actually an escape so add the character for the slash and fall through pos += token.length;
++current_line_length;
} }
if (c == '{')
in_ovr = true;
else
++current_line_length;
}
current_line_length += last_was_slash;
return std::max(max_line_length, current_line_length); return std::max(max_line_length, current_line_length);
} }