Skip to content
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

Allow overriding font-based normal line-height #603

Merged
merged 7 commits into from
Nov 2, 2024
Merged

Allow overriding font-based normal line-height #603

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e2a721e
Allow calculating a nicer normal line-height
moben Aug 29, 2024
cb32524
Allow setting normal line-height from frontend
moben Sep 8, 2024
533f860
Add -cr-normal-line-height property
moben Sep 13, 2024
ddc3d83
drop global prop for normal line-height
moben Sep 13, 2024
c1ae400
fix -cr-normal-line-height inheritance
moben Oct 2, 2024
166ed03
Replace -cr-normal-line-height with -cr-only-if
moben Oct 5, 2024
f4e0ddc
Access parent style via passed node
moben Oct 24, 2024
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
25 changes: 25 additions & 0 deletions crengine/src/lvstsheet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3074,6 +3074,8 @@ static const char * css_cr_only_if_names[]={
"not-inpage-footnote",
"inside-inpage-footnote",
"not-inside-inpage-footnote",
"line-height-normal",
"not-line-height-normal",
NULL
};
enum cr_only_if_t {
Expand Down Expand Up @@ -3111,6 +3113,8 @@ enum cr_only_if_t {
cr_only_if_not_inpage_footnote,
cr_only_if_inside_inpage_footnote,
cr_only_if_not_inside_inpage_footnote,
cr_only_if_line_height_normal,
cr_only_if_not_line_height_normal,
};

static const char * css_cr_apply_func_names[]={
Expand Down Expand Up @@ -5328,6 +5332,27 @@ void LVCssDeclaration::apply( css_style_rec_t * style, const ldomNode * node ) c
return; // don't apply anything more of this declaration to this style
}
}
else if ( only_if == cr_only_if_line_height_normal || only_if == cr_only_if_not_line_height_normal ) {
if ( const ldomNode * parent_node = node->getParentNode(); style->line_height == css_length_t(css_val_inherited, 0) && parent_node ) {
const css_style_ref_t parent_style = node->getParentNode()->getStyle();
if ( !parent_style.isNull() && parent_style->line_height == css_length_t(css_val_unspecified, css_generic_normal) ) {
if ( only_if == cr_only_if_not_line_height_normal )
return; // don't apply anything more of this declaration to this style
}
else {
if ( only_if == cr_only_if_line_height_normal )
return; // don't apply anything more of this declaration to this style
}
}
else if ( style->line_height == css_length_t(css_val_unspecified, css_generic_normal) ) {
if ( only_if == cr_only_if_not_line_height_normal )
return; // don't apply anything more of this declaration to this style
}
else {
if ( only_if == cr_only_if_line_height_normal )
return; // don't apply anything more of this declaration to this style
}
}
}
break;
case cssd_cr_apply_func:
Expand Down
Loading