Skip to content

[flutter_markdown] Custom fontfeature superscript #5874

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

Merged
auto-submit merged 9 commits into from
Apr 19, 2024
Merged

[flutter_markdown] Custom fontfeature superscript #5874

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
46ab666
[flutter_markdown] allow to choose custom font feature for superscript
dawidope Jan 11, 2024
e723138
[flutter_markdown] test for custom font feature
dawidope Jan 11, 2024
4dfa2f9
[flutter_markdown] add changelog and bump version
dawidope Jan 11, 2024
b7c3a80
[flutter_markdown] fix typo in doc comment
dawidope Jan 11, 2024
9c3cfd2
Merge branch 'main' into custom_fontfeature_superscript
domesticmouse Jan 12, 2024
223bd42
Merge branch 'main' into custom_fontfeature_superscript
dawidope Apr 10, 2024
6de425e
[flutter_markdown] format syntax
dawidope Apr 10, 2024
5a9e025
[flutter_markdown] fix test
dawidope Apr 10, 2024
b020002
Merge branch 'main' into custom_fontfeature_superscript
dawidope Apr 19, 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
Prev Previous commit
Next Next commit
[flutter_markdown] format syntax
  • Loading branch information
@dawidope
dawidope committed Apr 10, 2024
commit 6de425e6b66a4b4fdd1ef3066621b726ba99512c
23 changes: 16 additions & 7 deletions packages/flutter_markdown/lib/src/style_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ class MarkdownStyleSheet {
textScaler = textScaler ??
// Internally, only textScaler is used, so convert the scale factor
// to a linear scaler.
(textScaleFactor == null ? null : TextScaler.linear(textScaleFactor)),
(textScaleFactor == null
? null
: TextScaler.linear(textScaleFactor)),
_styles = <String, TextStyle?>{
'a': a,
'p': p,
Expand Down Expand Up @@ -164,7 +166,9 @@ class MarkdownStyleSheet {
assert(theme.textTheme.textStyle.fontSize != null);
return MarkdownStyleSheet(
a: theme.textTheme.textStyle.copyWith(
color: theme.brightness == Brightness.dark ? CupertinoColors.link.darkColor : CupertinoColors.link.color,
color: theme.brightness == Brightness.dark
? CupertinoColors.link.darkColor
: CupertinoColors.link.color,
),
p: theme.textTheme.textStyle,
pPadding: EdgeInsets.zero,
Expand Down Expand Up @@ -398,8 +402,10 @@ class MarkdownStyleSheet {
);
// If either of textScaler or textScaleFactor is non-null, pass null for the
// other instead of the previous value, since only one is allowed.
final TextScaler? newTextScaler = textScaler ?? (textScaleFactor == null ? this.textScaler : null);
final double? nextTextScaleFactor = textScaleFactor ?? (textScaler == null ? this.textScaleFactor : null);
final TextScaler? newTextScaler =
textScaler ?? (textScaleFactor == null ? this.textScaler : null);
final double? nextTextScaleFactor =
textScaleFactor ?? (textScaler == null ? this.textScaleFactor : null);
return MarkdownStyleSheet(
a: a ?? this.a,
p: p ?? this.p,
Expand Down Expand Up @@ -434,12 +440,14 @@ class MarkdownStyleSheet {
tableColumnWidth: tableColumnWidth ?? this.tableColumnWidth,
tableCellsPadding: tableCellsPadding ?? this.tableCellsPadding,
tableCellsDecoration: tableCellsDecoration ?? this.tableCellsDecoration,
tableVerticalAlignment: tableVerticalAlignment ?? this.tableVerticalAlignment,
tableVerticalAlignment:
tableVerticalAlignment ?? this.tableVerticalAlignment,
blockquotePadding: blockquotePadding ?? this.blockquotePadding,
blockquoteDecoration: blockquoteDecoration ?? this.blockquoteDecoration,
codeblockPadding: codeblockPadding ?? this.codeblockPadding,
codeblockDecoration: codeblockDecoration ?? this.codeblockDecoration,
horizontalRuleDecoration: horizontalRuleDecoration ?? this.horizontalRuleDecoration,
horizontalRuleDecoration:
horizontalRuleDecoration ?? this.horizontalRuleDecoration,
textAlign: textAlign ?? this.textAlign,
h1Align: h1Align ?? this.h1Align,
h2Align: h2Align ?? this.h2Align,
Expand All @@ -451,7 +459,8 @@ class MarkdownStyleSheet {
orderedListAlign: orderedListAlign ?? this.orderedListAlign,
blockquoteAlign: blockquoteAlign ?? this.blockquoteAlign,
codeblockAlign: codeblockAlign ?? this.codeblockAlign,
superscriptFontFeatureTag: superscriptFontFeatureTag ?? this.superscriptFontFeatureTag,
superscriptFontFeatureTag:
superscriptFontFeatureTag ?? this.superscriptFontFeatureTag,
textScaler: newTextScaler,
textScaleFactor: nextTextScaleFactor,
);
Expand Down