Showing
7 changed files
with
51 additions
and
56 deletions
| @@ -169,6 +169,8 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | @@ -169,6 +169,8 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | ||
| 169 | // titleSmall: TextStyle(fontSize: 10), | 169 | // titleSmall: TextStyle(fontSize: 10), |
| 170 | // ), | 170 | // ), |
| 171 | // ), | 171 | // ), |
| 172 | + child: Padding( | ||
| 173 | + padding: const EdgeInsets.all(8.0), | ||
| 172 | child: TexMarkdown( | 174 | child: TexMarkdown( |
| 173 | _controller.text, | 175 | _controller.text, |
| 174 | textDirection: _direction, | 176 | textDirection: _direction, |
| @@ -183,9 +185,11 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | @@ -183,9 +185,11 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | ||
| 183 | // Regular text font size here. | 185 | // Regular text font size here. |
| 184 | fontSize: 15, | 186 | fontSize: 15, |
| 185 | ), | 187 | ), |
| 186 | - latexWorkaround: (tex) => tex.replaceAllMapped( | ||
| 187 | - RegExp(r"align\*"), (match) => "aligned"), | ||
| 188 | - latexBuilder: (contex, tex, inline) { | 188 | + latexWorkaround: (tex) => |
| 189 | + tex.replaceAllMapped(RegExp(r"align\*"), | ||
| 190 | + (match) => "aligned"), | ||
| 191 | + latexBuilder: | ||
| 192 | + (contex, tex, textStyle, inline) { | ||
| 189 | if (tex.contains(r"\begin{tabular}")) { | 193 | if (tex.contains(r"\begin{tabular}")) { |
| 190 | // return table. | 194 | // return table. |
| 191 | String tableString = "|${(RegExp( | 195 | String tableString = "|${(RegExp( |
| @@ -206,9 +210,7 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | @@ -206,9 +210,7 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | ||
| 206 | var controller = ScrollController(); | 210 | var controller = ScrollController(); |
| 207 | Widget child = Math.tex( | 211 | Widget child = Math.tex( |
| 208 | tex, | 212 | tex, |
| 209 | - textStyle: const TextStyle( | ||
| 210 | - fontSize: 17, | ||
| 211 | - ), | 213 | + textStyle: textStyle, |
| 212 | ); | 214 | ); |
| 213 | if (!inline) { | 215 | if (!inline) { |
| 214 | child = Padding( | 216 | child = Padding( |
| @@ -223,12 +225,11 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | @@ -223,12 +225,11 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | ||
| 223 | controller: controller, | 225 | controller: controller, |
| 224 | child: SingleChildScrollView( | 226 | child: SingleChildScrollView( |
| 225 | controller: controller, | 227 | controller: controller, |
| 226 | - scrollDirection: Axis.horizontal, | 228 | + scrollDirection: |
| 229 | + Axis.horizontal, | ||
| 227 | child: Math.tex( | 230 | child: Math.tex( |
| 228 | tex, | 231 | tex, |
| 229 | - textStyle: const TextStyle( | ||
| 230 | - fontSize: 17, | ||
| 231 | - ), | 232 | + textStyle: textStyle, |
| 232 | ), | 233 | ), |
| 233 | ), | 234 | ), |
| 234 | ), | 235 | ), |
| @@ -245,6 +246,7 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | @@ -245,6 +246,7 @@ Markdown and LaTeX can be powerful tools for formatting text and mathematical ex | ||
| 245 | return child; | 246 | return child; |
| 246 | }, | 247 | }, |
| 247 | ), | 248 | ), |
| 249 | + ), | ||
| 248 | // child: const Text("Hello"), | 250 | // child: const Text("Hello"), |
| 249 | ); | 251 | ); |
| 250 | }), | 252 | }), |
| @@ -182,7 +182,7 @@ packages: | @@ -182,7 +182,7 @@ packages: | ||
| 182 | path: ".." | 182 | path: ".." |
| 183 | relative: true | 183 | relative: true |
| 184 | source: path | 184 | source: path |
| 185 | - version: "0.1.0" | 185 | + version: "0.1.1" |
| 186 | http: | 186 | http: |
| 187 | dependency: transitive | 187 | dependency: transitive |
| 188 | description: | 188 | description: |
| @@ -26,7 +26,8 @@ class TexMarkdown extends StatelessWidget { | @@ -26,7 +26,8 @@ class TexMarkdown extends StatelessWidget { | ||
| 26 | final TextScaler? textScaler; | 26 | final TextScaler? textScaler; |
| 27 | final void Function(String url, String title)? onLinkTab; | 27 | final void Function(String url, String title)? onLinkTab; |
| 28 | final String Function(String tex)? latexWorkaround; | 28 | final String Function(String tex)? latexWorkaround; |
| 29 | - final Widget Function(BuildContext context, String tex, bool inline)? | 29 | + final Widget Function( |
| 30 | + BuildContext context, String tex, TextStyle style, bool inline)? | ||
| 30 | latexBuilder; | 31 | latexBuilder; |
| 31 | final bool followLinkColor; | 32 | final bool followLinkColor; |
| 32 | final Widget Function(BuildContext context, String name, String code)? | 33 | final Widget Function(BuildContext context, String name, String code)? |
| @@ -38,7 +38,7 @@ abstract class MarkdownComponent { | @@ -38,7 +38,7 @@ abstract class MarkdownComponent { | ||
| 38 | TextDirection textDirection, | 38 | TextDirection textDirection, |
| 39 | final void Function(String url, String title)? onLinkTab, | 39 | final void Function(String url, String title)? onLinkTab, |
| 40 | final String Function(String tex)? latexWorkaround, | 40 | final String Function(String tex)? latexWorkaround, |
| 41 | - final Widget Function(BuildContext context, String tex, bool inline)? | 41 | + final Widget Function(BuildContext context, String tex, TextStyle textStyle, bool inline)? |
| 42 | latexBuilder, | 42 | latexBuilder, |
| 43 | final Widget Function(BuildContext context, String name, String code)? | 43 | final Widget Function(BuildContext context, String name, String code)? |
| 44 | codeBuilder, | 44 | codeBuilder, |
| @@ -128,7 +128,7 @@ abstract class MarkdownComponent { | @@ -128,7 +128,7 @@ abstract class MarkdownComponent { | ||
| 128 | TextDirection textDirection, | 128 | TextDirection textDirection, |
| 129 | final void Function(String url, String title)? onLinkTab, | 129 | final void Function(String url, String title)? onLinkTab, |
| 130 | final String Function(String tex)? latexWorkaround, | 130 | final String Function(String tex)? latexWorkaround, |
| 131 | - final Widget Function(BuildContext context, String tex, bool inline)? | 131 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 132 | latexBuilder, | 132 | latexBuilder, |
| 133 | final Widget Function(BuildContext context, String name, String code)? | 133 | final Widget Function(BuildContext context, String name, String code)? |
| 134 | codeBuilder, | 134 | codeBuilder, |
| @@ -151,7 +151,7 @@ abstract class InlineMd extends MarkdownComponent { | @@ -151,7 +151,7 @@ abstract class InlineMd extends MarkdownComponent { | ||
| 151 | TextDirection textDirection, | 151 | TextDirection textDirection, |
| 152 | final void Function(String url, String title)? onLinkTab, | 152 | final void Function(String url, String title)? onLinkTab, |
| 153 | final String Function(String tex)? latexWorkaround, | 153 | final String Function(String tex)? latexWorkaround, |
| 154 | - final Widget Function(BuildContext context, String tex, bool inline)? | 154 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 155 | latexBuilder, | 155 | latexBuilder, |
| 156 | final Widget Function(BuildContext context, String name, String code)? | 156 | final Widget Function(BuildContext context, String name, String code)? |
| 157 | codeBuilder, | 157 | codeBuilder, |
| @@ -170,7 +170,7 @@ abstract class BlockMd extends MarkdownComponent { | @@ -170,7 +170,7 @@ abstract class BlockMd extends MarkdownComponent { | ||
| 170 | TextDirection textDirection, | 170 | TextDirection textDirection, |
| 171 | final void Function(String url, String title)? onLinkTab, | 171 | final void Function(String url, String title)? onLinkTab, |
| 172 | final String Function(String tex)? latexWorkaround, | 172 | final String Function(String tex)? latexWorkaround, |
| 173 | - final Widget Function(BuildContext context, String tex, bool inline)? | 173 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 174 | latexBuilder, | 174 | latexBuilder, |
| 175 | final Widget Function(BuildContext context, String name, String code)? | 175 | final Widget Function(BuildContext context, String name, String code)? |
| 176 | codeBuilder, | 176 | codeBuilder, |
| @@ -197,7 +197,7 @@ abstract class BlockMd extends MarkdownComponent { | @@ -197,7 +197,7 @@ abstract class BlockMd extends MarkdownComponent { | ||
| 197 | TextDirection textDirection, | 197 | TextDirection textDirection, |
| 198 | final void Function(String url, String title)? onLinkTab, | 198 | final void Function(String url, String title)? onLinkTab, |
| 199 | final String Function(String tex)? latexWorkaround, | 199 | final String Function(String tex)? latexWorkaround, |
| 200 | - final Widget Function(BuildContext context, String tex, bool inline)? | 200 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 201 | latexBuilder, | 201 | latexBuilder, |
| 202 | final Widget Function(BuildContext context, String name, String code)? | 202 | final Widget Function(BuildContext context, String name, String code)? |
| 203 | codeBuilder, | 203 | codeBuilder, |
| @@ -216,7 +216,7 @@ class HTag extends BlockMd { | @@ -216,7 +216,7 @@ class HTag extends BlockMd { | ||
| 216 | TextDirection textDirection, | 216 | TextDirection textDirection, |
| 217 | final void Function(String url, String title)? onLinkTab, | 217 | final void Function(String url, String title)? onLinkTab, |
| 218 | final String Function(String tex)? latexWorkaround, | 218 | final String Function(String tex)? latexWorkaround, |
| 219 | - final Widget Function(BuildContext context, String tex, bool inline)? | 219 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 220 | latexBuilder, | 220 | latexBuilder, |
| 221 | final Widget Function(BuildContext context, String name, String code)? | 221 | final Widget Function(BuildContext context, String name, String code)? |
| 222 | codeBuilder, | 222 | codeBuilder, |
| @@ -290,7 +290,7 @@ class NewLines extends InlineMd { | @@ -290,7 +290,7 @@ class NewLines extends InlineMd { | ||
| 290 | TextDirection textDirection, | 290 | TextDirection textDirection, |
| 291 | final void Function(String url, String title)? onLinkTab, | 291 | final void Function(String url, String title)? onLinkTab, |
| 292 | final String Function(String tex)? latexWorkaround, | 292 | final String Function(String tex)? latexWorkaround, |
| 293 | - final Widget Function(BuildContext context, String tex, bool inline)? | 293 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 294 | latexBuilder, | 294 | latexBuilder, |
| 295 | final Widget Function(BuildContext context, String name, String code)? | 295 | final Widget Function(BuildContext context, String name, String code)? |
| 296 | codeBuilder, | 296 | codeBuilder, |
| @@ -317,7 +317,7 @@ class HrLine extends BlockMd { | @@ -317,7 +317,7 @@ class HrLine extends BlockMd { | ||
| 317 | TextDirection textDirection, | 317 | TextDirection textDirection, |
| 318 | final void Function(String url, String title)? onLinkTab, | 318 | final void Function(String url, String title)? onLinkTab, |
| 319 | final String Function(String tex)? latexWorkaround, | 319 | final String Function(String tex)? latexWorkaround, |
| 320 | - final Widget Function(BuildContext context, String tex, bool inline)? | 320 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 321 | latexBuilder, | 321 | latexBuilder, |
| 322 | final Widget Function(BuildContext context, String name, String code)? | 322 | final Widget Function(BuildContext context, String name, String code)? |
| 323 | codeBuilder, | 323 | codeBuilder, |
| @@ -343,7 +343,7 @@ class CheckBoxMd extends BlockMd { | @@ -343,7 +343,7 @@ class CheckBoxMd extends BlockMd { | ||
| 343 | TextDirection textDirection, | 343 | TextDirection textDirection, |
| 344 | final void Function(String url, String title)? onLinkTab, | 344 | final void Function(String url, String title)? onLinkTab, |
| 345 | final String Function(String tex)? latexWorkaround, | 345 | final String Function(String tex)? latexWorkaround, |
| 346 | - final Widget Function(BuildContext context, String tex, bool inline)? | 346 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 347 | latexBuilder, | 347 | latexBuilder, |
| 348 | final Widget Function(BuildContext context, String name, String code)? | 348 | final Widget Function(BuildContext context, String name, String code)? |
| 349 | codeBuilder, | 349 | codeBuilder, |
| @@ -379,7 +379,7 @@ class RadioButtonMd extends BlockMd { | @@ -379,7 +379,7 @@ class RadioButtonMd extends BlockMd { | ||
| 379 | TextDirection textDirection, | 379 | TextDirection textDirection, |
| 380 | final void Function(String url, String title)? onLinkTab, | 380 | final void Function(String url, String title)? onLinkTab, |
| 381 | final String Function(String tex)? latexWorkaround, | 381 | final String Function(String tex)? latexWorkaround, |
| 382 | - final Widget Function(BuildContext context, String tex, bool inline)? | 382 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 383 | latexBuilder, | 383 | latexBuilder, |
| 384 | final Widget Function(BuildContext context, String name, String code)? | 384 | final Widget Function(BuildContext context, String name, String code)? |
| 385 | codeBuilder, | 385 | codeBuilder, |
| @@ -415,7 +415,7 @@ class IndentMd extends BlockMd { | @@ -415,7 +415,7 @@ class IndentMd extends BlockMd { | ||
| 415 | TextDirection textDirection, | 415 | TextDirection textDirection, |
| 416 | final void Function(String url, String title)? onLinkTab, | 416 | final void Function(String url, String title)? onLinkTab, |
| 417 | final String Function(String tex)? latexWorkaround, | 417 | final String Function(String tex)? latexWorkaround, |
| 418 | - final Widget Function(BuildContext context, String tex, bool inline)? | 418 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 419 | latexBuilder, | 419 | latexBuilder, |
| 420 | final Widget Function(BuildContext context, String name, String code)? | 420 | final Widget Function(BuildContext context, String name, String code)? |
| 421 | codeBuilder, | 421 | codeBuilder, |
| @@ -462,7 +462,7 @@ class UnOrderedList extends BlockMd { | @@ -462,7 +462,7 @@ class UnOrderedList extends BlockMd { | ||
| 462 | TextDirection textDirection, | 462 | TextDirection textDirection, |
| 463 | final void Function(String url, String title)? onLinkTab, | 463 | final void Function(String url, String title)? onLinkTab, |
| 464 | final String Function(String tex)? latexWorkaround, | 464 | final String Function(String tex)? latexWorkaround, |
| 465 | - final Widget Function(BuildContext context, String tex, bool inline)? | 465 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 466 | latexBuilder, | 466 | latexBuilder, |
| 467 | final Widget Function(BuildContext context, String name, String code)? | 467 | final Widget Function(BuildContext context, String name, String code)? |
| 468 | codeBuilder, | 468 | codeBuilder, |
| @@ -501,7 +501,7 @@ class OrderedList extends BlockMd { | @@ -501,7 +501,7 @@ class OrderedList extends BlockMd { | ||
| 501 | TextDirection textDirection, | 501 | TextDirection textDirection, |
| 502 | final void Function(String url, String title)? onLinkTab, | 502 | final void Function(String url, String title)? onLinkTab, |
| 503 | final String Function(String tex)? latexWorkaround, | 503 | final String Function(String tex)? latexWorkaround, |
| 504 | - final Widget Function(BuildContext context, String tex, bool inline)? | 504 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 505 | latexBuilder, | 505 | latexBuilder, |
| 506 | final Widget Function(BuildContext context, String name, String code)? | 506 | final Widget Function(BuildContext context, String name, String code)? |
| 507 | codeBuilder, | 507 | codeBuilder, |
| @@ -536,7 +536,7 @@ class HighlightedText extends InlineMd { | @@ -536,7 +536,7 @@ class HighlightedText extends InlineMd { | ||
| 536 | TextDirection textDirection, | 536 | TextDirection textDirection, |
| 537 | final void Function(String url, String title)? onLinkTab, | 537 | final void Function(String url, String title)? onLinkTab, |
| 538 | final String Function(String tex)? latexWorkaround, | 538 | final String Function(String tex)? latexWorkaround, |
| 539 | - final Widget Function(BuildContext context, String tex, bool inline)? | 539 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 540 | latexBuilder, | 540 | latexBuilder, |
| 541 | final Widget Function(BuildContext context, String name, String code)? | 541 | final Widget Function(BuildContext context, String name, String code)? |
| 542 | codeBuilder, | 542 | codeBuilder, |
| @@ -574,7 +574,7 @@ class BoldMd extends InlineMd { | @@ -574,7 +574,7 @@ class BoldMd extends InlineMd { | ||
| 574 | TextDirection textDirection, | 574 | TextDirection textDirection, |
| 575 | final void Function(String url, String title)? onLinkTab, | 575 | final void Function(String url, String title)? onLinkTab, |
| 576 | final String Function(String tex)? latexWorkaround, | 576 | final String Function(String tex)? latexWorkaround, |
| 577 | - final Widget Function(BuildContext context, String tex, bool inline)? | 577 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 578 | latexBuilder, | 578 | latexBuilder, |
| 579 | final Widget Function(BuildContext context, String name, String code)? | 579 | final Widget Function(BuildContext context, String name, String code)? |
| 580 | codeBuilder, | 580 | codeBuilder, |
| @@ -613,7 +613,7 @@ class LatexMathMultyLine extends BlockMd { | @@ -613,7 +613,7 @@ class LatexMathMultyLine extends BlockMd { | ||
| 613 | TextDirection textDirection, | 613 | TextDirection textDirection, |
| 614 | void Function(String url, String title)? onLinkTab, | 614 | void Function(String url, String title)? onLinkTab, |
| 615 | String Function(String tex)? latexWorkaround, | 615 | String Function(String tex)? latexWorkaround, |
| 616 | - Widget Function(BuildContext context, String tex, bool inline)? | 616 | + Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 617 | latexBuilder, | 617 | latexBuilder, |
| 618 | Widget Function(BuildContext context, String name, String code)? | 618 | Widget Function(BuildContext context, String name, String code)? |
| 619 | codeBuilder, | 619 | codeBuilder, |
| @@ -624,11 +624,9 @@ class LatexMathMultyLine extends BlockMd { | @@ -624,11 +624,9 @@ class LatexMathMultyLine extends BlockMd { | ||
| 624 | var workaround = latexWorkaround ?? (String tex) => tex; | 624 | var workaround = latexWorkaround ?? (String tex) => tex; |
| 625 | 625 | ||
| 626 | var builder = latexBuilder ?? | 626 | var builder = latexBuilder ?? |
| 627 | - (BuildContext context, String tex, bool inline) => Math.tex( | 627 | + (BuildContext context, String tex,TextStyle textStyle, bool inline) => Math.tex( |
| 628 | tex, | 628 | tex, |
| 629 | - textStyle: style?.copyWith( | ||
| 630 | - fontFamily: "SansSerif", | ||
| 631 | - ), | 629 | + textStyle: textStyle, |
| 632 | mathStyle: MathStyle.display, | 630 | mathStyle: MathStyle.display, |
| 633 | textScaleFactor: 1, | 631 | textScaleFactor: 1, |
| 634 | settings: const TexParserSettings( | 632 | settings: const TexParserSettings( |
| @@ -655,18 +653,14 @@ class LatexMathMultyLine extends BlockMd { | @@ -655,18 +653,14 @@ class LatexMathMultyLine extends BlockMd { | ||
| 655 | return Text( | 653 | return Text( |
| 656 | workaround(mathText), | 654 | workaround(mathText), |
| 657 | textDirection: textDirection, | 655 | textDirection: textDirection, |
| 658 | - style: style?.copyWith( | ||
| 659 | - color: (!kDebugMode) | ||
| 660 | - ? null | ||
| 661 | - : Theme.of(context).colorScheme.error) ?? | ||
| 662 | - TextStyle( | 656 | + style: textStyle.copyWith( |
| 663 | color: (!kDebugMode) | 657 | color: (!kDebugMode) |
| 664 | ? null | 658 | ? null |
| 665 | : Theme.of(context).colorScheme.error), | 659 | : Theme.of(context).colorScheme.error), |
| 666 | ); | 660 | ); |
| 667 | }, | 661 | }, |
| 668 | ); | 662 | ); |
| 669 | - return builder(context, workaround(mathText), false); | 663 | + return builder(context, workaround(mathText),style??const TextStyle(), false); |
| 670 | } | 664 | } |
| 671 | } | 665 | } |
| 672 | 666 | ||
| @@ -689,7 +683,7 @@ class LatexMath extends InlineMd { | @@ -689,7 +683,7 @@ class LatexMath extends InlineMd { | ||
| 689 | TextDirection textDirection, | 683 | TextDirection textDirection, |
| 690 | final void Function(String url, String title)? onLinkTab, | 684 | final void Function(String url, String title)? onLinkTab, |
| 691 | final String Function(String tex)? latexWorkaround, | 685 | final String Function(String tex)? latexWorkaround, |
| 692 | - final Widget Function(BuildContext context, String tex, bool inline)? | 686 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 693 | latexBuilder, | 687 | latexBuilder, |
| 694 | final Widget Function(BuildContext context, String name, String code)? | 688 | final Widget Function(BuildContext context, String name, String code)? |
| 695 | codeBuilder, | 689 | codeBuilder, |
| @@ -699,11 +693,9 @@ class LatexMath extends InlineMd { | @@ -699,11 +693,9 @@ class LatexMath extends InlineMd { | ||
| 699 | String mathText = p0?[1]?.toString() ?? ""; | 693 | String mathText = p0?[1]?.toString() ?? ""; |
| 700 | var workaround = latexWorkaround ?? (String tex) => tex; | 694 | var workaround = latexWorkaround ?? (String tex) => tex; |
| 701 | var builder = latexBuilder ?? | 695 | var builder = latexBuilder ?? |
| 702 | - (BuildContext context, String tex, bool inline) => Math.tex( | 696 | + (BuildContext context, String tex,TextStyle textStyle, bool inline) => Math.tex( |
| 703 | tex, | 697 | tex, |
| 704 | - textStyle: style?.copyWith( | ||
| 705 | - fontFamily: "SansSerif", | ||
| 706 | - ), | 698 | + textStyle: textStyle, |
| 707 | mathStyle: MathStyle.display, | 699 | mathStyle: MathStyle.display, |
| 708 | textScaleFactor: 1, | 700 | textScaleFactor: 1, |
| 709 | settings: const TexParserSettings( | 701 | settings: const TexParserSettings( |
| @@ -730,11 +722,7 @@ class LatexMath extends InlineMd { | @@ -730,11 +722,7 @@ class LatexMath extends InlineMd { | ||
| 730 | return Text( | 722 | return Text( |
| 731 | workaround(mathText), | 723 | workaround(mathText), |
| 732 | textDirection: textDirection, | 724 | textDirection: textDirection, |
| 733 | - style: style?.copyWith( | ||
| 734 | - color: (!kDebugMode) | ||
| 735 | - ? null | ||
| 736 | - : Theme.of(context).colorScheme.error) ?? | ||
| 737 | - TextStyle( | 725 | + style: textStyle.copyWith( |
| 738 | color: (!kDebugMode) | 726 | color: (!kDebugMode) |
| 739 | ? null | 727 | ? null |
| 740 | : Theme.of(context).colorScheme.error), | 728 | : Theme.of(context).colorScheme.error), |
| @@ -744,7 +732,7 @@ class LatexMath extends InlineMd { | @@ -744,7 +732,7 @@ class LatexMath extends InlineMd { | ||
| 744 | return WidgetSpan( | 732 | return WidgetSpan( |
| 745 | alignment: PlaceholderAlignment.baseline, | 733 | alignment: PlaceholderAlignment.baseline, |
| 746 | baseline: TextBaseline.alphabetic, | 734 | baseline: TextBaseline.alphabetic, |
| 747 | - child: builder(context, workaround(mathText), true), | 735 | + child: builder(context, workaround(mathText),style ??const TextStyle(), true), |
| 748 | ); | 736 | ); |
| 749 | } | 737 | } |
| 750 | } | 738 | } |
| @@ -762,7 +750,7 @@ class ItalicMd extends InlineMd { | @@ -762,7 +750,7 @@ class ItalicMd extends InlineMd { | ||
| 762 | TextDirection textDirection, | 750 | TextDirection textDirection, |
| 763 | final void Function(String url, String title)? onLinkTab, | 751 | final void Function(String url, String title)? onLinkTab, |
| 764 | final String Function(String tex)? latexWorkaround, | 752 | final String Function(String tex)? latexWorkaround, |
| 765 | - final Widget Function(BuildContext context, String tex, bool inline)? | 753 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 766 | latexBuilder, | 754 | latexBuilder, |
| 767 | final Widget Function(BuildContext context, String name, String code)? | 755 | final Widget Function(BuildContext context, String name, String code)? |
| 768 | codeBuilder, | 756 | codeBuilder, |
| @@ -797,7 +785,7 @@ class ATagMd extends InlineMd { | @@ -797,7 +785,7 @@ class ATagMd extends InlineMd { | ||
| 797 | TextDirection textDirection, | 785 | TextDirection textDirection, |
| 798 | final void Function(String url, String title)? onLinkTab, | 786 | final void Function(String url, String title)? onLinkTab, |
| 799 | final String Function(String tex)? latexWorkaround, | 787 | final String Function(String tex)? latexWorkaround, |
| 800 | - final Widget Function(BuildContext context, String tex, bool inline)? | 788 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 801 | latexBuilder, | 789 | latexBuilder, |
| 802 | final Widget Function(BuildContext context, String name, String code)? | 790 | final Widget Function(BuildContext context, String name, String code)? |
| 803 | codeBuilder, | 791 | codeBuilder, |
| @@ -845,7 +833,7 @@ class ImageMd extends InlineMd { | @@ -845,7 +833,7 @@ class ImageMd extends InlineMd { | ||
| 845 | TextDirection textDirection, | 833 | TextDirection textDirection, |
| 846 | final void Function(String url, String title)? onLinkTab, | 834 | final void Function(String url, String title)? onLinkTab, |
| 847 | final String Function(String tex)? latexWorkaround, | 835 | final String Function(String tex)? latexWorkaround, |
| 848 | - final Widget Function(BuildContext context, String tex, bool inline)? | 836 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 849 | latexBuilder, | 837 | latexBuilder, |
| 850 | final Widget Function(BuildContext context, String name, String code)? | 838 | final Widget Function(BuildContext context, String name, String code)? |
| 851 | codeBuilder, | 839 | codeBuilder, |
| @@ -900,7 +888,7 @@ class TableMd extends BlockMd { | @@ -900,7 +888,7 @@ class TableMd extends BlockMd { | ||
| 900 | TextDirection textDirection, | 888 | TextDirection textDirection, |
| 901 | void Function(String url, String title)? onLinkTab, | 889 | void Function(String url, String title)? onLinkTab, |
| 902 | final String Function(String tex)? latexWorkaround, | 890 | final String Function(String tex)? latexWorkaround, |
| 903 | - final Widget Function(BuildContext context, String tex, bool inline)? | 891 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 904 | latexBuilder, | 892 | latexBuilder, |
| 905 | final Widget Function(BuildContext context, String name, String code)? | 893 | final Widget Function(BuildContext context, String name, String code)? |
| 906 | codeBuilder, | 894 | codeBuilder, |
| @@ -1010,7 +998,7 @@ class CodeBlockMd extends BlockMd { | @@ -1010,7 +998,7 @@ class CodeBlockMd extends BlockMd { | ||
| 1010 | TextDirection textDirection, | 998 | TextDirection textDirection, |
| 1011 | final void Function(String url, String title)? onLinkTab, | 999 | final void Function(String url, String title)? onLinkTab, |
| 1012 | final String Function(String tex)? latexWorkaround, | 1000 | final String Function(String tex)? latexWorkaround, |
| 1013 | - final Widget Function(BuildContext context, String tex, bool inline)? | 1001 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 1014 | latexBuilder, | 1002 | latexBuilder, |
| 1015 | final Widget Function(BuildContext context, String name, String code)? | 1003 | final Widget Function(BuildContext context, String name, String code)? |
| 1016 | codeBuilder, | 1004 | codeBuilder, |
| @@ -25,7 +25,7 @@ class MdWidget extends StatelessWidget { | @@ -25,7 +25,7 @@ class MdWidget extends StatelessWidget { | ||
| 25 | final TextScaler? textScaler; | 25 | final TextScaler? textScaler; |
| 26 | final void Function(String url, String title)? onLinkTab; | 26 | final void Function(String url, String title)? onLinkTab; |
| 27 | final String Function(String tex)? latexWorkaround; | 27 | final String Function(String tex)? latexWorkaround; |
| 28 | - final Widget Function(BuildContext context, String tex, bool inline)? | 28 | + final Widget Function(BuildContext context, String tex,TextStyle textStyle, bool inline)? |
| 29 | latexBuilder; | 29 | latexBuilder; |
| 30 | final bool followLinkColor; | 30 | final bool followLinkColor; |
| 31 | final Widget Function(BuildContext context, String name, String code)? | 31 | final Widget Function(BuildContext context, String name, String code)? |
| 1 | name: gpt_markdown | 1 | name: gpt_markdown |
| 2 | description: "The purpose of this package is to render the response of ChatGPT into a Flutter app." | 2 | description: "The purpose of this package is to render the response of ChatGPT into a Flutter app." |
| 3 | -version: 0.1.0 | 3 | +version: 0.1.1 |
| 4 | homepage: https://github.com/saminsohag/flutter_packages/tree/main/gpt_markdown | 4 | homepage: https://github.com/saminsohag/flutter_packages/tree/main/gpt_markdown |
| 5 | 5 | ||
| 6 | environment: | 6 | environment: |
-
Please register or login to post a comment