Skip to content

Fix .ass non-integer margin values #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix .ass non-integer margin values #444

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0333e2c
Fix .ass non-integer margin values
ALRBP Sep 28, 2025
37f13ef
Match libass behavior
ALRBP Sep 29, 2025
0960471
Also recognize uppercase 0X hexa prefix
ALRBP Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions src/ass_dialogue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include <libaegisub/string.h>

#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/regex.hpp>
#include <boost/spirit/include/karma_generate.hpp>
Expand Down Expand Up @@ -109,8 +110,41 @@ void AssDialogue::Parse(std::string const& raw) {
End = agi::Trim(tkn.next_tok());
Style = tkn.next_str_trim();
Actor = tkn.next_str_trim();
for (int& margin : Margin)
margin = mid(-9999, boost::lexical_cast<int>(tkn.next_tok()), 99999);
for (int& margin : Margin) {
int parsed_margin = 0;
int sign = 1;
std::string tok{tkn.next_tok()};
boost::trim(tok);
if (tok.starts_with("-")) {// Handling sign
sign = -1;
tok.erase(0,1);
}
else if (tok.starts_with("+")) {
tok.erase(0,1);
}
if (tok.starts_with("0x") || tok.starts_with("0X")) {// Hexadecimal value
try {
std::size_t pos = 2;
parsed_margin = std::stoi(tok,&pos,16);
}
catch (boost::bad_lexical_cast const&) {}
}
else {
try {
parsed_margin = boost::lexical_cast<int>(tok);
}
catch (boost::bad_lexical_cast const&) {
try {
// Try parsing and rounding a floating point number if integer failed
parsed_margin = (int)(boost::lexical_cast<double>(tok)+0.5);
}
catch (boost::bad_lexical_cast const&) {
// Just keep 0 if can not parse a number, eg. if field is empty
}
}
}
margin = mid(-9999, parsed_margin*sign, 99999);
}
Effect = tkn.next_str_trim();

std::string text{tkn.next_tok().begin(), str.end()};
Expand Down