fix formatting

This commit is contained in:
Jake Kenneally 2026-01-31 15:14:51 -05:00
parent 394fc41819
commit d445eb0bb0
2 changed files with 11 additions and 13 deletions

View File

@ -23,8 +23,7 @@ constexpr size_t SOFT_HYPHEN_BYTES = 2;
// (no space before it). Includes sentence punctuation and closing quotes. // (no space before it). Includes sentence punctuation and closing quotes.
// Excludes brackets/parens to avoid false positives with decorative patterns like "[ 1 ]". // Excludes brackets/parens to avoid false positives with decorative patterns like "[ 1 ]".
bool isAttachingPunctuation(const char c) { bool isAttachingPunctuation(const char c) {
return c == '.' || c == ',' || c == '!' || c == '?' || c == ';' || c == ':' || return c == '.' || c == ',' || c == '!' || c == '?' || c == ';' || c == ':' || c == '"' || c == '\'';
c == '"' || c == '\'';
} }
// Check if a word consists entirely of punctuation that should attach to the previous word // Check if a word consists entirely of punctuation that should attach to the previous word
@ -437,8 +436,7 @@ void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const
// Add spacing after this word, unless the next word is attaching punctuation // Add spacing after this word, unless the next word is attaching punctuation
auto nextWordIt = wordIt; auto nextWordIt = wordIt;
++nextWordIt; ++nextWordIt;
const bool nextIsAttachingPunctuation = const bool nextIsAttachingPunctuation = wordIdx + 1 < lineWordCount && isAttachingPunctuationWord(*nextWordIt);
wordIdx + 1 < lineWordCount && isAttachingPunctuationWord(*nextWordIt);
xpos += currentWordWidth + (nextIsAttachingPunctuation ? 0 : spacing); xpos += currentWordWidth + (nextIsAttachingPunctuation ? 0 : spacing);
++wordIt; ++wordIt;

View File

@ -99,15 +99,15 @@ struct CssStyle {
CssFontWeight fontWeight = CssFontWeight::Normal; CssFontWeight fontWeight = CssFontWeight::Normal;
CssTextDecoration decoration = CssTextDecoration::None; CssTextDecoration decoration = CssTextDecoration::None;
CssLength indent; // First-line indent (deferred resolution) CssLength indent; // First-line indent (deferred resolution)
CssLength marginTop; // Vertical spacing before block CssLength marginTop; // Vertical spacing before block
CssLength marginBottom; // Vertical spacing after block CssLength marginBottom; // Vertical spacing after block
CssLength marginLeft; // Horizontal spacing left of block CssLength marginLeft; // Horizontal spacing left of block
CssLength marginRight; // Horizontal spacing right of block CssLength marginRight; // Horizontal spacing right of block
CssLength paddingTop; // Padding before CssLength paddingTop; // Padding before
CssLength paddingBottom; // Padding after CssLength paddingBottom; // Padding after
CssLength paddingLeft; // Padding left CssLength paddingLeft; // Padding left
CssLength paddingRight; // Padding right CssLength paddingRight; // Padding right
CssPropertyFlags defined; // Tracks which properties were explicitly set CssPropertyFlags defined; // Tracks which properties were explicitly set