diff --git a/assets/Katex/KaTeX_AMS-Regular.ttf b/assets/Katex/KaTeX_AMS-Regular.ttf new file mode 100644 index 0000000000..c6f9a5e7c0 Binary files /dev/null and b/assets/Katex/KaTeX_AMS-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Caligraphic-Bold.ttf b/assets/Katex/KaTeX_Caligraphic-Bold.ttf new file mode 100644 index 0000000000..9ff4a5e044 Binary files /dev/null and b/assets/Katex/KaTeX_Caligraphic-Bold.ttf differ diff --git a/assets/Katex/KaTeX_Caligraphic-Regular.ttf b/assets/Katex/KaTeX_Caligraphic-Regular.ttf new file mode 100644 index 0000000000..f522294ff0 Binary files /dev/null and b/assets/Katex/KaTeX_Caligraphic-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Fraktur-Bold.ttf b/assets/Katex/KaTeX_Fraktur-Bold.ttf new file mode 100644 index 0000000000..4e98259c3b Binary files /dev/null and b/assets/Katex/KaTeX_Fraktur-Bold.ttf differ diff --git a/assets/Katex/KaTeX_Fraktur-Regular.ttf b/assets/Katex/KaTeX_Fraktur-Regular.ttf new file mode 100644 index 0000000000..b8461b275f Binary files /dev/null and b/assets/Katex/KaTeX_Fraktur-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Main-Bold.ttf b/assets/Katex/KaTeX_Main-Bold.ttf new file mode 100644 index 0000000000..4060e627dc Binary files /dev/null and b/assets/Katex/KaTeX_Main-Bold.ttf differ diff --git a/assets/Katex/KaTeX_Main-BoldItalic.ttf b/assets/Katex/KaTeX_Main-BoldItalic.ttf new file mode 100644 index 0000000000..dc007977ee Binary files /dev/null and b/assets/Katex/KaTeX_Main-BoldItalic.ttf differ diff --git a/assets/Katex/KaTeX_Main-Italic.ttf b/assets/Katex/KaTeX_Main-Italic.ttf new file mode 100644 index 0000000000..0e9b0f354a Binary files /dev/null and b/assets/Katex/KaTeX_Main-Italic.ttf differ diff --git a/assets/Katex/KaTeX_Main-Regular.ttf b/assets/Katex/KaTeX_Main-Regular.ttf new file mode 100644 index 0000000000..dd45e1ed2e Binary files /dev/null and b/assets/Katex/KaTeX_Main-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Math-BoldItalic.ttf b/assets/Katex/KaTeX_Math-BoldItalic.ttf new file mode 100644 index 0000000000..728ce7a1e2 Binary files /dev/null and b/assets/Katex/KaTeX_Math-BoldItalic.ttf differ diff --git a/assets/Katex/KaTeX_Math-Italic.ttf b/assets/Katex/KaTeX_Math-Italic.ttf new file mode 100644 index 0000000000..70d559b4e9 Binary files /dev/null and b/assets/Katex/KaTeX_Math-Italic.ttf differ diff --git a/assets/Katex/KaTeX_SansSerif-Bold.ttf b/assets/Katex/KaTeX_SansSerif-Bold.ttf new file mode 100644 index 0000000000..2f65a8a3a6 Binary files /dev/null and b/assets/Katex/KaTeX_SansSerif-Bold.ttf differ diff --git a/assets/Katex/KaTeX_SansSerif-Italic.ttf b/assets/Katex/KaTeX_SansSerif-Italic.ttf new file mode 100644 index 0000000000..d5850df98e Binary files /dev/null and b/assets/Katex/KaTeX_SansSerif-Italic.ttf differ diff --git a/assets/Katex/KaTeX_SansSerif-Regular.ttf b/assets/Katex/KaTeX_SansSerif-Regular.ttf new file mode 100644 index 0000000000..537279f6bd Binary files /dev/null and b/assets/Katex/KaTeX_SansSerif-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Script-Regular.ttf b/assets/Katex/KaTeX_Script-Regular.ttf new file mode 100644 index 0000000000..fd679bf374 Binary files /dev/null and b/assets/Katex/KaTeX_Script-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Size1-Regular.ttf b/assets/Katex/KaTeX_Size1-Regular.ttf new file mode 100644 index 0000000000..871fd7d19d Binary files /dev/null and b/assets/Katex/KaTeX_Size1-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Size2-Regular.ttf b/assets/Katex/KaTeX_Size2-Regular.ttf new file mode 100644 index 0000000000..7a212caf91 Binary files /dev/null and b/assets/Katex/KaTeX_Size2-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Size3-Regular.ttf b/assets/Katex/KaTeX_Size3-Regular.ttf new file mode 100644 index 0000000000..00bff3495f Binary files /dev/null and b/assets/Katex/KaTeX_Size3-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Size4-Regular.ttf b/assets/Katex/KaTeX_Size4-Regular.ttf new file mode 100644 index 0000000000..74f08921f0 Binary files /dev/null and b/assets/Katex/KaTeX_Size4-Regular.ttf differ diff --git a/assets/Katex/KaTeX_Typewriter-Regular.ttf b/assets/Katex/KaTeX_Typewriter-Regular.ttf new file mode 100644 index 0000000000..c83252c571 Binary files /dev/null and b/assets/Katex/KaTeX_Typewriter-Regular.ttf differ diff --git a/assets/Katex/LICENSE b/assets/Katex/LICENSE new file mode 100644 index 0000000000..37c6433e3b --- /dev/null +++ b/assets/Katex/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2020 Khan Academy and other contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/lib/licenses.dart b/lib/licenses.dart index c23882bb83..6c873dbb49 100644 --- a/lib/licenses.dart +++ b/lib/licenses.dart @@ -12,6 +12,9 @@ import 'package:flutter/services.dart'; Stream additionalLicenses() async* { // Alphabetic by path. + yield LicenseEntryWithLineBreaks( + ['KaTeX'], + await rootBundle.loadString('assets/KaTeX/LICENSE')); yield LicenseEntryWithLineBreaks( ['Noto Color Emoji'], await rootBundle.loadString('assets/Noto_Color_Emoji/LICENSE')); diff --git a/lib/model/content.dart b/lib/model/content.dart index dce6e45207..1a6e2c228a 100644 --- a/lib/model/content.dart +++ b/lib/model/content.dart @@ -1,11 +1,13 @@ import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; +import 'package:flutter/widgets.dart'; import 'package:html/dom.dart' as dom; import 'package:html/parser.dart'; import '../api/model/model.dart'; import '../api/model/submessage.dart'; import 'code_block.dart'; +import 'katex.dart'; /// A node in a parse tree for Zulip message-style content. /// @@ -340,23 +342,46 @@ class CodeBlockSpanNode extends ContentNode { } } -class MathBlockNode extends BlockContentNode { - const MathBlockNode({super.debugHtmlNode, required this.texSource}); +class KatexSpan extends ContentNode { + const KatexSpan({ + required this.spanClasses, + required this.spanStyle, + required this.text, + this.spans = const [], + }); - final String texSource; + final List spanClasses; + final KatexSpanStyle? spanStyle; + final String? text; + final List spans; @override - bool operator ==(Object other) { - return other is MathBlockNode && other.texSource == texSource; + void debugFillProperties(DiagnosticPropertiesBuilder properties) { + super.debugFillProperties(properties); + properties.add(StringProperty('spanClass', spanClasses.join(', '))); + properties.add(KatexSpanStyleProperty('spanStyle', spanStyle)); + properties.add(StringProperty('text', text)); } @override - int get hashCode => Object.hash('MathBlockNode', texSource); + List debugDescribeChildren() { + return spans.map((node) => node.toDiagnosticsNode()).toList(); + } +} + +class MathBlockNode extends BlockContentNode { + const MathBlockNode({ + super.debugHtmlNode, + required this.texSource, + required this.spans, + }); + + final String texSource; + final List spans; @override - void debugFillProperties(DiagnosticPropertiesBuilder properties) { - super.debugFillProperties(properties); - properties.add(StringProperty('texSource', texSource)); + List debugDescribeChildren() { + return spans.map((node) => node.toDiagnosticsNode()).toList(); } } @@ -1113,6 +1138,13 @@ class _ZulipContentParser { return inlineParser.parseBlockInline(nodes); } + // BlockContentNode parseMathBlock(dom.Element element) { + // final debugHtmlNode = kDebugMode ? element : null; + // final texSource = _parseMath(element, block: true); + // if (texSource == null) return UnimplementedBlockContentNode(htmlNode: element); + // return MathBlockNode(texSource: texSource, debugHtmlNode: debugHtmlNode); + // } + BlockContentNode parseListNode(dom.Element element) { assert(element.localName == 'ol' || element.localName == 'ul'); assert(element.className.isEmpty); @@ -1624,11 +1656,9 @@ class _ZulipContentParser { })()); final firstChild = nodes.first as dom.Element; - final texSource = _parseMath(firstChild, block: true); - if (texSource != null) { - result.add(MathBlockNode( - texSource: texSource, - debugHtmlNode: kDebugMode ? firstChild : null)); + final block = parseKatexBlock(firstChild); + if (block != null) { + result.add(block); } else { result.add(UnimplementedBlockContentNode(htmlNode: firstChild)); } @@ -1649,7 +1679,6 @@ class _ZulipContentParser { : nodes.length; for (int i = 1; i < length; i++) { final child = nodes[i]; - final debugHtmlNode = kDebugMode ? child : null; // If there are multiple nodes in a

// each node is interleaved by '\n\n'. Whitespaces are ignored in HTML @@ -1659,11 +1688,9 @@ class _ZulipContentParser { if (child case dom.Text(text: '\n\n')) continue; if (child case dom.Element(localName: 'span', className: 'katex-display')) { - final texSource = _parseMath(child, block: true); - if (texSource != null) { - result.add(MathBlockNode( - texSource: texSource, - debugHtmlNode: debugHtmlNode)); + final block = parseKatexBlock(firstChild); + if (block != null) { + result.add(block); continue; } } @@ -1672,6 +1699,33 @@ class _ZulipContentParser { } } + BlockContentNode? parseKatexBlock(dom.Element element) { + assert(element.localName == 'span' && element.className == 'katex-display'); + if (element.nodes.length != 1) return null; + final child = element.nodes.single; + if (child is! dom.Element) return null; + if (child.localName != 'span') return null; + if (child.className != 'katex') return null; + + if (child.nodes.length != 2) return null; + final grandchild = child.nodes.last; + if (grandchild is! dom.Element) return null; + if (grandchild.localName != 'span') return null; + if (grandchild.className != 'katex-html') return null; + + try { + final debugHtmlNode = kDebugMode ? element : null; + final spans = parseKatexSpans(grandchild); + return MathBlockNode( + texSource: '', + spans: spans, + debugHtmlNode: debugHtmlNode); + } on KatexHtmlParseError catch (e, st) { + print('$e\n$st'); + return null; + } + } + BlockContentNode parseBlockContent(dom.Node node) { final debugHtmlNode = kDebugMode ? node : null; if (node is! dom.Element) { diff --git a/lib/model/katex.dart b/lib/model/katex.dart new file mode 100644 index 0000000000..12f6a59d23 --- /dev/null +++ b/lib/model/katex.dart @@ -0,0 +1,370 @@ +import 'package:csslib/visitor.dart'; +import 'package:flutter/foundation.dart'; +import 'package:html/dom.dart' as dom; +import 'package:csslib/parser.dart' as css; + +import 'content.dart'; + +class KatexHtmlParseError extends Error { + KatexHtmlParseError([this.message]); + final String? message; + + @override + String toString() { + if (message != null) { + return 'Katex HTML parse error: $message'; + } + return 'Katex HTML parse error'; + } +} + +// enum KatexSpanClass { +// accent, +// base, +// mathnormal, +// mclose, +// minner, +// mop, +// mopen, +// mord, +// mrel, +// mspace, +// newline, +// nulldelimiter, +// sqrt, +// strut, +// mfrac, +// opSymbol, +// opLimits, +// vlistT, +// delimcenter, +// vlistT2, +// largeOp, +// vlistR, +// delimsizing, +// vlist, +// msupsub, +// size4, +// svgAlign, +// pstrut, +// mtable, +// size2, +// sizing, +// hideTail, +// accentBody, +// colAlignL, +// vlistS, +// resetSize6, +// overlay, +// mbin, +// size3, +// mtight, +// arraycolsep, +// resetSize3, +// vbox, +// text, +// size6, +// size1, +// thinbox, +// fracLine, +// clap, +// resetSize1, +// inner, +// fix, +// size11, +// size10, +// size9, +// size8, +// size7, +// textrm +// } + +class KatexSpanStyle { + KatexSpanStyle({ + this.borderBottomWidth, + this.height, + this.left, + this.marginLeft, + this.marginRight, + this.minWidth, + this.paddingLeft, + this.top, + this.verticalAlign, + this.width, + }); + + final double? borderBottomWidth; + final double? height; + final double? left; + final double? marginLeft; + final double? marginRight; + final double? minWidth; + final double? paddingLeft; + final double? top; + final double? verticalAlign; + final double? width; + + @override + bool operator ==(Object other) { + return other is KatexSpanStyle && + other.borderBottomWidth == borderBottomWidth && + other.height == height && + other.left == left && + other.marginLeft == marginLeft && + other.marginRight == marginRight && + other.minWidth == minWidth && + other.paddingLeft == paddingLeft && + other.top == top && + other.verticalAlign == verticalAlign && + other.width == width; + } + + @override + int get hashCode => Object.hash( + 'KatexSpanStyle', + borderBottomWidth, + height, + left, + marginLeft, + marginRight, + minWidth, + paddingLeft, + top, + verticalAlign, + width, + ); + + @override + String toString() { + return '${objectRuntimeType(this, 'KatexSpanStyle')}(' + 'borderBottomWidth: $borderBottomWidth, ' + 'height: $height, ' + 'left: $left, ' + 'marginLeft: $marginLeft, ' + 'marginRight: $marginRight, ' + 'minWidth: $minWidth, ' + 'paddingLeft: $paddingLeft, ' + 'top: $top, ' + 'verticalAlign: $verticalAlign, ' + 'width: $width' + ')'; + } +} + +class KatexSpanStyleProperty extends DiagnosticsProperty { + KatexSpanStyleProperty(super.name, super.value); +} + +// List _parseSpanClasses(String className) { +// return List.unmodifiable( +// className +// .split(' ') +// .map((cls) => switch (cls) { +// '' => null, +// 'accent' => KatexSpanClass.accent, +// 'base' => KatexSpanClass.base, +// 'mathnormal' => KatexSpanClass.mathnormal, +// 'mclose' => KatexSpanClass.mclose, +// 'minner' => KatexSpanClass.minner, +// 'mop' => KatexSpanClass.mop, +// 'mopen' => KatexSpanClass.mopen, +// 'mord' => KatexSpanClass.mord, +// 'mrel' => KatexSpanClass.mrel, +// 'mspace' => KatexSpanClass.mspace, +// 'newline' => KatexSpanClass.newline, +// 'nulldelimiter' => KatexSpanClass.nulldelimiter, +// 'sqrt' => KatexSpanClass.sqrt, +// 'strut' => KatexSpanClass.strut, +// 'mfrac' => KatexSpanClass.mfrac, +// 'op-symbol' => KatexSpanClass.opSymbol, +// 'op-limits' => KatexSpanClass.opLimits, +// 'vlist-t' => KatexSpanClass.vlistT, +// 'delimcenter' => KatexSpanClass.delimcenter, +// 'vlist-t2' => KatexSpanClass.vlistT2, +// 'large-op' => KatexSpanClass.largeOp, +// 'vlist-r' => KatexSpanClass.vlistR, +// 'delimsizing' => KatexSpanClass.delimsizing, +// 'vlist' => KatexSpanClass.vlist, +// 'msupsub' => KatexSpanClass.msupsub, +// 'size4' => KatexSpanClass.size4, +// 'svg-align' => KatexSpanClass.svgAlign, +// 'pstrut' => KatexSpanClass.pstrut, +// 'mtable' => KatexSpanClass.mtable, +// 'size2' => KatexSpanClass.size2, +// 'sizing' => KatexSpanClass.sizing, +// 'hide-tail' => KatexSpanClass.hideTail, +// 'accent-body' => KatexSpanClass.accentBody, +// 'col-align-l' => KatexSpanClass.colAlignL, +// 'vlist-s' => KatexSpanClass.vlistS, +// 'reset-size6' => KatexSpanClass.resetSize6, +// 'overlay' => KatexSpanClass.overlay, +// 'mbin' => KatexSpanClass.mbin, +// 'size3' => KatexSpanClass.size3, +// 'mtight' => KatexSpanClass.mtight, +// 'arraycolsep' => KatexSpanClass.arraycolsep, +// 'reset-size3' => KatexSpanClass.resetSize3, +// 'vbox' => KatexSpanClass.vbox, +// 'text' => KatexSpanClass.text, +// 'size6' => KatexSpanClass.size6, +// 'size1' => KatexSpanClass.size1, +// 'thinbox' => KatexSpanClass.thinbox, +// 'frac-line' => KatexSpanClass.fracLine, +// 'clap' => KatexSpanClass.clap, +// 'reset-size1' => KatexSpanClass.resetSize1, +// 'inner' => KatexSpanClass.inner, +// 'fix' => KatexSpanClass.fix, +// 'size10' => KatexSpanClass.size10, +// 'size11' => KatexSpanClass.size11, +// 'size9' => KatexSpanClass.size9, +// 'size8' => KatexSpanClass.size8, +// 'size7' => KatexSpanClass.size7, +// 'textrm' => KatexSpanClass.textrm, +// _ => throw KatexHtmlParseError('Unknown span class \'$cls\''), +// }) +// .nonNulls, +// ); +// } + +double? _getEm(Expression expression) { + if (expression is EmTerm && expression.value is num) { + return (expression.value as num).toDouble(); + } + return null; +} + +String? _getLiteral(Expression expression) { + if (expression is LiteralTerm && expression.value is Identifier) { + return (expression.value as Identifier).name; + } + return null; +} + +KatexSpanStyle? _parseSpanStyle(dom.Element element) { + if (element.attributes case {'style': final styleStr}) { + final stylesheet = css.parse('*{$styleStr}'); + final topLevels = stylesheet.topLevels; + if (topLevels.length != 1) throw KatexHtmlParseError(); + final topLevel = topLevels.single; + if (topLevel is! RuleSet) throw KatexHtmlParseError(); + final rule = topLevel; + + double? borderBottomWidth; + double? height; + double? left; + double? marginLeft; + double? marginRight; + double? minWidth; + double? paddingLeft; + double? top; + double? verticalAlign; + double? width; + + for (final declaration in rule.declarationGroup.declarations) { + if (declaration is! Declaration) throw KatexHtmlParseError(); + final property = declaration.property; + + final expressions = declaration.expression; + if (expressions is! Expressions) throw KatexHtmlParseError(); + if (expressions.expressions.length != 1) throw KatexHtmlParseError(); + final expression = expressions.expressions.single; + + switch (property) { + case 'border-bottom-width': + borderBottomWidth = _getEm(expression); + if (borderBottomWidth != null) continue; + + case 'height': + height = _getEm(expression); + if (height != null) continue; + + case 'left': + left = _getEm(expression); + if (left != null) continue; + + case 'margin-left': + marginLeft = _getEm(expression); + if (marginLeft != null) continue; + + case 'margin-right': + marginRight = _getEm(expression); + if (marginRight != null) continue; + + case 'min-width': + minWidth = _getEm(expression); + if (minWidth != null) continue; + + case 'padding-left': + paddingLeft = _getEm(expression); + if (paddingLeft != null) continue; + + case 'top': + top = _getEm(expression); + if (top != null) continue; + + case 'vertical-align': + verticalAlign = _getEm(expression); + if (verticalAlign != null) continue; + + case 'width': + width = _getEm(expression); + if (width != null) continue; + + case 'position': + assert(_getLiteral(expression) == 'relative'); + continue; + } + + throw KatexHtmlParseError('Unknown $property with expression of type ${expression.runtimeType}'); + } + + return KatexSpanStyle( + borderBottomWidth: borderBottomWidth, + height: height, + left: left, + marginLeft: marginLeft, + marginRight: marginRight, + minWidth: minWidth, + paddingLeft: paddingLeft, + top: top, + verticalAlign: verticalAlign); + } + return null; +} + +KatexSpan _parseSpan(dom.Element element) { + // final spanClasses = _parseSpanClasses(element.className); + final spanClasses = List.unmodifiable(element.className.split(' ')); + final spanStyle = _parseSpanStyle(element); + + String? text; + List? spans; + if (element.nodes case [dom.Text(data: final data)]) { + text = data; + } else { + spans = List.unmodifiable( + element.nodes.map((node) { + if (node is! dom.Element) throw KatexHtmlParseError(); + return _parseSpan(node); + })); + } + + if (text == null && spans == null) throw KatexHtmlParseError(); + + return KatexSpan( + spanClasses: spanClasses, + spanStyle: spanStyle, + text: text, + spans: spans ?? const []); +} + +List parseKatexSpans(dom.Element element) { + assert(element.localName == 'span'); + assert(element.className == 'katex-html'); + + final r = []; + for (final node in element.nodes) { + if (node is! dom.Element) throw KatexHtmlParseError(); + r.add(_parseSpan(node)); + } + return r; +} diff --git a/lib/widgets/content.dart b/lib/widgets/content.dart index 55b5331c3c..5d632de145 100644 --- a/lib/widgets/content.dart +++ b/lib/widgets/content.dart @@ -831,11 +831,465 @@ class MathBlock extends StatelessWidget { @override Widget build(BuildContext context) { - return _CodeBlockContainer( - borderColor: ContentTheme.of(context).colorMathBlockBorder, - child: Text.rich(TextSpan( - style: ContentTheme.of(context).codeBlockTextStyles.plain, - children: [TextSpan(text: node.texSource)]))); + return Semantics( + value: node.texSource, + child: DefaultTextStyle( + style: TextStyle( + fontSize: kBaseFontSize * 1.21, + fontFamily: 'KaTeX_Main', + height: 1.2, + ), + child: Center( + child: SingleChildScrollViewWithScrollbar( + scrollDirection: Axis.horizontal, + child: Row( + mainAxisSize: MainAxisSize.max, + children: List.unmodifiable( + node.spans.map((e) => _MathBlockSpan(e)))))))); + } +} + +class _MathBlockSpan extends StatelessWidget { + const _MathBlockSpan(this.span); + + final KatexSpan span; + + @override + Widget build(BuildContext context) { + final em = DefaultTextStyle.of(context).style.fontSize!; + + Widget widget = const SizedBox.shrink(); + if (span.text != null) { + widget = Text(span.text!); + } else if (span.spans.isNotEmpty) { + widget = Row( + mainAxisSize: MainAxisSize.max, + children: List.unmodifiable( + span.spans.map((e) => _MathBlockSpan(e)))); + } + + TextStyle? textStyle; + TextAlign? textAlign; + double? width; + double? height; + double? marginLeft; + double? marginRight; + double? minWidth; + double? minHeight; + double? paddingLeft; + double? left; + double? top; + double? right; + double? bottom; + double? verticalAlign; + + var index = 0; + final spanClasses = span.spanClasses; + while (index < spanClasses.length) { + final spanClass = spanClasses[index]; + switch (spanClass) { + case 'textbf': + // .textbf { font-weight: bold; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontWeight: FontWeight.bold); + + case 'textit': + // .textit { font-style: italic; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontStyle: FontStyle.italic); + + case 'textrm': + // .textrm { font-family: KaTeX_Main; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_Main'); + + case 'textsf': + // .textsf { font-family: KaTeX_SansSerif; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_SansSerif'); + + case 'texttt': + // .texttt { font-family: KaTeX_Typewriter; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_Typewriter'); + + case 'mathnormal': + // .mathnormal { font-family: KaTeX_Math; font-style: italic; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontFamily: 'KaTeX_Math', + fontStyle: FontStyle.italic); + + case 'mathit': + // .mathit { font-family: KaTeX_Main; font-style: italic; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontFamily: 'KaTeX_Main', + fontStyle: FontStyle.italic); + + case 'mathrm': + // .mathrm { font-style: normal; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontStyle: FontStyle.normal); + + case 'mathbf': + // .mathbf { font-family: KaTeX_Main; font-weight: bold; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontFamily: 'KaTeX_Main', + fontWeight: FontWeight.bold); + + case 'boldsymbol': + // .boldsymbol { font-family: KaTeX_Math; font-weight: bold; font-style: italic; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontFamily: 'KaTeX_Math', + fontWeight: FontWeight.bold, + fontStyle: FontStyle.italic); + + case 'amsrm': + // .amsrm { font-family: KaTeX_AMS; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_AMS'); + + case 'mathbb': + case 'textbb': + // .mathbb, + // .textbb { font-family: KaTeX_AMS; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_AMS'); + + case 'mathcal': + // .mathcal { font-family: KaTeX_Caligraphic; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_Caligraphic'); + + case 'mathfrak': + case 'textfrak': + // .mathfrak, + // .textfrak { font-family: KaTeX_Fraktur; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_Fraktur'); + + case 'mathboldfrak': + case 'textboldfrak': + // .mathboldfrak, + // .textboldfrak { font-family: KaTeX_Fraktur; font-weight: bold; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontFamily: 'KaTeX_Fraktur', + fontWeight: FontWeight.bold); + + case 'mathtt': + // .mathtt { font-family: KaTeX_Typewriter; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_Typewriter'); + + case 'mathscr': + case 'textscr': + // .mathscr, + // .textscr { font-family: KaTeX_Script; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_Script'); + + case 'mathsf': + case 'textsf': + // .mathsf, + // .textsf { font-family: KaTeX_SansSerif; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: 'KaTeX_SansSerif'); + + case 'mathboldsf': + case 'textboldsf': + // .mathboldsf, + // .textboldsf { font-family: KaTeX_SansSerif; font-weight: bold; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontFamily: 'KaTeX_SansSerif', + fontWeight: FontWeight.bold); + + case 'mathsfit': + case 'mathitsf': + case 'textitsf': + // .mathsfit, + // .mathitsf, + // .textitsf { font-family: KaTeX_SansSerif; font-style: italic; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontFamily: 'KaTeX_SansSerif', + fontStyle: FontStyle.italic); + + case 'mainrm': + // .mainrm { font-family: KaTeX_Main; font-style: normal; } + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontFamily: 'KaTeX_Main', + fontStyle: FontStyle.normal); + + case 'vlist-t': + // .vlist-t { display: inline-table; ... } + break; // TODO + + case 'vlist-r': + // .vlist-r { display: table-row; } + break; // TODO + + case 'vlist': + // .vlist { display: table-cell; ... } + break; // TODO + + case 'vlist-t2': + // .vlist-t2 { ... } + break; // TODO + + case 'vlist-s': + // .vlist-s { ... } + break; // TODO + + case 'vbox': + // .vbox { display: inline-flex; flex-direction: column; align-items: baseline; } + break; // TODO + + case 'hbox': + // .hbox { display: inline-flex; flex-direction: row; width: 100%; } + break; // TODO + + case 'thinbox': + // .thinbox { display: inline-flex; flex-direction: row; width: 0; max-width: 0; } + break; // TODO + + case 'msupsub': + // .msupsub { text-align: left; } + textAlign = TextAlign.left; + + case 'mfrac': + // .mfrac { ... } + break; // TODO + + case 'mfrac': + case 'frac-line': + case 'overline': + case 'overline-line': + case 'underline': + case 'underline-line': + case 'hline': + case 'hdashline': + case 'rule': + // .mfrac .frac-line, + // .overline .overline-line, + // .underline .underline-line, + // .hline, + // .hdashline, + // .rule { min-height: 1px; } + minHeight = 1; + + case 'mspace': + // .mspace { display: inline-block; } + break; // TODO + + case 'llap': + case 'rlap': + case 'clap': + // .llap, + // .rlap, + // .clap { ... } + break; // TODO + + // TODO .llap > .inner { ... } + // TODO .rlap > .inner, .clap > .inner { ... } + // TODO .clap > .inner > span { ... } + + case 'rule': + // .rule { display: inline-block; border: solid 0; position: relative; } + break; // TODO + + case 'overline': + case 'overline-line': + case 'underline': + case 'underline-line': + case 'hline': + // .overline .overline-line, + // .underline .underline-line, + // .hline { display: inline-block; width: 100%; border-bottom-style: solid; } + break; // TODO + + case 'hdashline': + // .hdashline { display: inline-block; width: 100%; border-bottom-style: dashed; } + break; // TODO + + case 'sqrt': + // .sqrt { ... } + break; // TODO + + case 'sizing': + case 'fontsize-ensurer': + // .sizing, + // .fontsize-ensurer { ... } + if (index + 2 < spanClass.length) { + final resetSizeClass = spanClasses[index + 1]; + final sizeClass = spanClasses[index + 2]; + + final resetSizeClassSuffix = RegExp(r'^reset-size(\d\d?)$').firstMatch(resetSizeClass)?.group(1); + final sizeClassSuffix = RegExp(r'^size(\d\d?)$').firstMatch(sizeClass)?.group(1); + + if (resetSizeClassSuffix != null && sizeClassSuffix != null) { + const sizes = [0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.2, 1.44, 1.728, 2.074, 2.488]; + + final resetSizeIdx = int.parse(resetSizeClassSuffix, radix: 10); + final sizeIdx = int.parse(sizeClassSuffix, radix: 10); + + // These indexes start at 1. + if (resetSizeIdx <= sizes.length && sizeIdx <= sizes.length) { + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith( + fontSize: sizes[resetSizeIdx - 1] * sizes[sizeIdx - 1] * em, + ); + + index += 3; + continue; + } + } + } + + // Should be unreachable. + assert(false); + + case 'delimsizing': + // .delimsizing { ... } + if (index + 1 < spanClasses.length) { + final nextClass = spanClasses[index + 1]; + String? fontFamily; + switch (nextClass) { + case 'size1': + fontFamily = 'KaTeX_Size1'; + case 'size2': + fontFamily = 'KaTeX_Size2'; + case 'size3': + fontFamily = 'KaTeX_Size3'; + case 'size4': + fontFamily = 'KaTeX_Size4'; + } + assert(fontFamily != null); + + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: fontFamily); + + index += 2; + continue; + } + + // Should be unreachable. + assert(false); + + case 'nulldelimiter': + // .nulldelimiter { display: inline-block; width: $nulldelimiterspace; } + break; // TODO + + case 'delimcenter': + // .delimcenter { position: relative; } + break; // TODO + + case 'op-symbol': + // .op-symbol { ... } + // TODO position: relative; + if (index + 1 < spanClasses.length) { + final nextClass = spanClasses[index + 1]; + String? fontFamily; + switch (nextClass) { + case 'small-op': + fontFamily = 'KaTeX_Size1'; + case 'large-op': + fontFamily = 'KaTeX_Size2'; + } + assert(fontFamily != null); + + textStyle ??= TextStyle(); + textStyle = textStyle.copyWith(fontFamily: fontFamily); + + index += 2; + continue; + } + + case '.op-limits': + // .op-limits { ... } + break; // TODO + + case '.accent': + // .accent { ... } + break; // TODO + + case 'overlay': + // .overlay { display: block; } + break; // TODO + + case 'mtable': + // .mtable { ... } + break; // TODO + + case 'svg-align': + // .svg-align { text-align: left; } + textAlign = TextAlign.left; + } + + index++; + } + + final spanStyle = span.spanStyle; + if (spanStyle != null) { + if (spanStyle.width != null) width = spanStyle.width! * em; + if (spanStyle.height != null) height = spanStyle.height! * em; + if (spanStyle.marginLeft != null) marginLeft = spanStyle.marginLeft! * em; + if (spanStyle.marginRight != null) marginRight = spanStyle.marginRight! * em; + if (spanStyle.minWidth != null) minWidth = spanStyle.minWidth! * em; + if (spanStyle.paddingLeft != null) paddingLeft = spanStyle.paddingLeft! * em; + if (spanStyle.left != null) left = spanStyle.left! * em; + if (spanStyle.top != null) top = spanStyle.top! * em; + if (spanStyle.verticalAlign != null) verticalAlign = spanStyle.verticalAlign! * em; + } + + Offset offset = Offset.zero; + if (left != null) { + offset += Offset(left, 0); + } + if (top != null) { + offset += Offset(0, top); + } + if (right != null) { + offset += Offset(-right, 0); + } + if (bottom != null) { + offset += Offset(0, -bottom); + } + // TODO will probably make sense after table layout + // if (offset != Offset.zero) { + // widget = Transform.translate(offset: offset, child: widget); + // } + + if (width != null || height != null) { + widget = SizedBox( + width: width, + height: height, + child: widget); + } + if (paddingLeft != null) { + widget = Padding( + padding: EdgeInsets.only(left: paddingLeft), + child: widget); + } + if (minHeight != null || minWidth != null) { + widget = ConstrainedBox( + constraints: BoxConstraints( + minWidth: minWidth ?? 0, + minHeight: minHeight ?? 0), + child: widget); + } + if (textStyle != null || textAlign != null) { + widget = DefaultTextStyle.merge( + style: textStyle, + textAlign: textAlign, + child: widget); + } + return widget; } } diff --git a/pubspec.lock b/pubspec.lock index 77adae52d1..08d6f1e963 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -227,7 +227,7 @@ packages: source: hosted version: "3.0.6" csslib: - dependency: transitive + dependency: "direct main" description: name: csslib sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" diff --git a/pubspec.yaml b/pubspec.yaml index 82d4fa495a..af37f4797c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,6 +39,7 @@ dependencies: collection: ^1.17.2 convert: ^3.1.1 crypto: ^3.0.3 + csslib: ^1.0.2 device_info_plus: ^11.2.0 drift: ^2.23.0 file_picker: ^9.0.2 @@ -121,6 +122,74 @@ flutter: - assets/Source_Sans_3/LICENSE.md fonts: + # KaTeX custom fonts. + - family: KaTeX_AMS + fonts: + - asset: assets/KaTeX/KaTeX_AMS-Regular.ttf + + - family: KaTeX_Caligraphic + fonts: + - asset: assets/KaTeX/KaTeX_Caligraphic-Bold.ttf + weight: 700 + - asset: assets/KaTeX/KaTeX_Caligraphic-Regular.ttf + + - family: KaTeX_Fraktur + fonts: + - asset: assets/KaTeX/KaTeX_Fraktur-Bold.ttf + weight: 700 + - asset: assets/KaTeX/KaTeX_Fraktur-Regular.ttf + + - family: KaTeX_Main + fonts: + - asset: assets/KaTeX/KaTeX_Main-Bold.ttf + weight: 700 + - asset: assets/KaTeX/KaTeX_Main-BoldItalic.ttf + weight: 700 + style: italic + - asset: assets/KaTeX/KaTeX_Main-Italic.ttf + style: italic + - asset: assets/KaTeX/KaTeX_Main-Regular.ttf + + - family: KaTeX_Math + fonts: + - asset: assets/KaTeX/KaTeX_Math-BoldItalic.ttf + weight: 700 + style: italic + - asset: assets/KaTeX/KaTeX_Math-Italic.ttf + style: italic + + - family: KaTeX_SansSerif + fonts: + - asset: assets/KaTeX/KaTeX_SansSerif-Bold.ttf + weight: 700 + - asset: assets/KaTeX/KaTeX_SansSerif-Italic.ttf + style: italic + - asset: assets/KaTeX/KaTeX_SansSerif-Regular.ttf + + - family: KaTeX_Script + fonts: + - asset: assets/KaTeX/KaTeX_Script-Regular.ttf + + - family: KaTeX_Size1 + fonts: + - asset: assets/KaTeX/KaTeX_Size1-Regular.ttf + + - family: KaTeX_Size2 + fonts: + - asset: assets/KaTeX/KaTeX_Size2-Regular.ttf + + - family: KaTeX_Size3 + fonts: + - asset: assets/KaTeX/KaTeX_Size3-Regular.ttf + + - family: KaTeX_Size4 + fonts: + - asset: assets/KaTeX/KaTeX_Size4-Regular.ttf + + - family: KaTeX_Typewriter + fonts: + - asset: assets/KaTeX/KaTeX_Typewriter-Regular.ttf + # Google's emoji font. (Web uses these emoji for the "Google" emojiset.) # # This should not be used on iOS. diff --git a/test/model/content_test.dart b/test/model/content_test.dart index 5a6a55698e..a6608b6e52 100644 --- a/test/model/content_test.dart +++ b/test/model/content_test.dart @@ -6,6 +6,7 @@ import 'package:stack_trace/stack_trace.dart'; import 'package:test/scaffolding.dart'; import 'package:zulip/model/code_block.dart'; import 'package:zulip/model/content.dart'; +import 'package:zulip/model/katex.dart'; import 'content_checks.dart'; @@ -516,105 +517,151 @@ class ContentExample { '

', const MathInlineNode(texSource: r'\lambda')); - static const mathBlock = ContentExample( - 'math block', - "```math\n\\lambda\n```", - expectedText: r'\lambda', - '

' - 'λ' - '\\lambda' - '

', - [MathBlockNode(texSource: r'\lambda')]); - - static const mathBlocksMultipleInParagraph = ContentExample( - 'math blocks, multiple in paragraph', - '```math\na\n\nb\n```', - // https://chat.zulip.org/#narrow/channel/7-test-here/topic/.E2.9C.94.20Rajesh/near/2001490 - '

' - '' - 'a' - 'a' - '\n\n' - '' - 'b' - 'b' - '

', [ - MathBlockNode(texSource: 'a'), - MathBlockNode(texSource: 'b'), - ]); - - static const mathBlockInQuote = ContentExample( - 'math block in quote', - // There's sometimes a quirky extra `
\n` at the end of the `

` that - // encloses the math block. In particular this happens when the math block - // is the last thing in the quote; though not in a doubly-nested quote; - // and there might be further wrinkles yet to be found. Some experiments: - // https://chat.zulip.org/#narrow/stream/7-test-here/topic/content/near/1715732 - "````quote\n```math\n\\lambda\n```\n````", - '

\n

' - '' - 'λ' - '\\lambda' - '' - '
\n

\n
', - [QuotationNode([MathBlockNode(texSource: r'\lambda')])]); - - static const mathBlocksMultipleInQuote = ContentExample( - 'math blocks, multiple in quote', - "````quote\n```math\na\n\nb\n```\n````", - // https://chat.zulip.org/#narrow/channel/7-test-here/topic/.E2.9C.94.20Rajesh/near/2029236 - '
\n

' - '' - 'a' - 'a' - '' - '\n\n' - '' - 'b' - 'b' - '' - '
\n

\n
', - [QuotationNode([ - MathBlockNode(texSource: 'a'), - MathBlockNode(texSource: 'b'), - ])]); - - static const mathBlockBetweenImages = ContentExample( - 'math block between images', - // https://chat.zulip.org/#narrow/channel/7-test-here/topic/Greg/near/2035891 - 'https://upload.wikimedia.org/wikipedia/commons/7/78/Verregende_bloem_van_een_Helenium_%27El_Dorado%27._22-07-2023._%28d.j.b%29.jpg\n```math\na\n```\nhttps://upload.wikimedia.org/wikipedia/commons/thumb/7/71/Zaadpluizen_van_een_Clematis_texensis_%27Princess_Diana%27._18-07-2023_%28actm.%29_02.jpg/1280px-Zaadpluizen_van_een_Clematis_texensis_%27Princess_Diana%27._18-07-2023_%28actm.%29_02.jpg', - '
' - '' - '
' - '

' - '' - 'a' - 'a' - '' - '

\n' - '
' - '' - '
', + static final mathBlock = ContentExample( + 'math x', + '', + '

f(x)=f(x) =

', [ - ImageNodeList([ - ImageNode( - srcUrl: '/external_content/de28eb3abf4b7786de4545023dc42d434a2ea0c2/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f372f37382f566572726567656e64655f626c6f656d5f76616e5f65656e5f48656c656e69756d5f253237456c5f446f7261646f2532372e5f32322d30372d323032332e5f253238642e6a2e622532392e6a7067', - thumbnailUrl: null, - loading: false, - originalWidth: null, - originalHeight: null), - ]), - MathBlockNode(texSource: 'a'), - ImageNodeList([ - ImageNode( - srcUrl: '/external_content/58b0ef9a06d7bb24faec2b11df2f57f476e6f6bb/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f7468756d622f372f37312f5a616164706c75697a656e5f76616e5f65656e5f436c656d617469735f746578656e7369735f2532375072696e636573735f4469616e612532372e5f31382d30372d323032335f2532386163746d2e2532395f30322e6a70672f3132383070782d5a616164706c75697a656e5f76616e5f65656e5f436c656d617469735f746578656e7369735f2532375072696e636573735f4469616e612532372e5f31382d30372d323032335f2532386163746d2e2532395f30322e6a7067', - thumbnailUrl: null, - loading: false, - originalWidth: null, - originalHeight: null), - ]), + MathBlockNode( + // texSource: r'f(x) = \int_{-\infty}^\infty \hat{f}(\xi) e^{2 \pi i \xi x} \,d\xi', + texSource: '', + spans: [ + KatexSpan( + spanClasses: ['base'], + spanStyle: null, + text: null, + spans: [ + KatexSpan( + spanClasses: ['strut'], + spanStyle: KatexSpanStyle(height: 1.0, verticalAlign: -0.25), + text: null), + KatexSpan( + spanClasses: ['mord', 'mathnormal'], + spanStyle: KatexSpanStyle(marginRight: 0.10764), + text: 'f'), + KatexSpan( + spanClasses: ['mopen'], + spanStyle: null, + text: '('), + KatexSpan( + spanClasses: ['mord', 'mathnormal'], + spanStyle: null, + text: 'x'), + KatexSpan( + spanClasses: ['mclose'], + spanStyle: null, + text: ')'), + KatexSpan( + spanClasses: ['mspace'], + spanStyle: KatexSpanStyle(marginRight: 0.2778), + text: null), + KatexSpan( + spanClasses: ['mrel'], + spanStyle: null, + text: '='), + ]), + ]), ]); + // static const mathBlock = ContentExample( + // 'math block', + // "```math\n\\lambda\n```", + // expectedText: r'\lambda', + // '

' + // 'λ' + // '\\lambda' + // '

', + // [MathBlockNode(texSource: r'\lambda')]); + + // static const mathBlocksMultipleInParagraph = ContentExample( + // 'math blocks, multiple in paragraph', + // '```math\na\n\nb\n```', + // // https://chat.zulip.org/#narrow/channel/7-test-here/topic/.E2.9C.94.20Rajesh/near/2001490 + // '

' + // '' + // 'a' + // 'a' + // '\n\n' + // '' + // 'b' + // 'b' + // '

', [ + // MathBlockNode(texSource: 'a'), + // MathBlockNode(texSource: 'b'), + // ]); + + // static const mathBlockInQuote = ContentExample( + // 'math block in quote', + // // There's sometimes a quirky extra `
\n` at the end of the `

` that + // // encloses the math block. In particular this happens when the math block + // // is the last thing in the quote; though not in a doubly-nested quote; + // // and there might be further wrinkles yet to be found. Some experiments: + // // https://chat.zulip.org/#narrow/stream/7-test-here/topic/content/near/1715732 + // "````quote\n```math\n\\lambda\n```\n````", + // '

\n

' + // '' + // 'λ' + // '\\lambda' + // '' + // '
\n

\n
', + // [QuotationNode([MathBlockNode(texSource: r'\lambda')])]); + + // static const mathBlocksMultipleInQuote = ContentExample( + // 'math blocks, multiple in quote', + // "````quote\n```math\na\n\nb\n```\n````", + // // https://chat.zulip.org/#narrow/channel/7-test-here/topic/.E2.9C.94.20Rajesh/near/2029236 + // '
\n

' + // '' + // 'a' + // 'a' + // '' + // '\n\n' + // '' + // 'b' + // 'b' + // '' + // '
\n

\n
', + // [QuotationNode([ + // MathBlockNode(texSource: 'a'), + // MathBlockNode(texSource: 'b'), + // ])]); + + // static const mathBlockBetweenImages = ContentExample( + // 'math block between images', + // // https://chat.zulip.org/#narrow/channel/7-test-here/topic/Greg/near/2035891 + // 'https://upload.wikimedia.org/wikipedia/commons/7/78/Verregende_bloem_van_een_Helenium_%27El_Dorado%27._22-07-2023._%28d.j.b%29.jpg\n```math\na\n```\nhttps://upload.wikimedia.org/wikipedia/commons/thumb/7/71/Zaadpluizen_van_een_Clematis_texensis_%27Princess_Diana%27._18-07-2023_%28actm.%29_02.jpg/1280px-Zaadpluizen_van_een_Clematis_texensis_%27Princess_Diana%27._18-07-2023_%28actm.%29_02.jpg', + // '
' + // '' + // '
' + // '

' + // '' + // 'a' + // 'a' + // '' + // '

\n' + // '
' + // '' + // '
', + // [ + // ImageNodeList([ + // ImageNode( + // srcUrl: '/external_content/de28eb3abf4b7786de4545023dc42d434a2ea0c2/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f372f37382f566572726567656e64655f626c6f656d5f76616e5f65656e5f48656c656e69756d5f253237456c5f446f7261646f2532372e5f32322d30372d323032332e5f253238642e6a2e622532392e6a7067', + // thumbnailUrl: null, + // loading: false, + // originalWidth: null, + // originalHeight: null), + // ]), + // MathBlockNode(texSource: 'a'), + // ImageNodeList([ + // ImageNode( + // srcUrl: '/external_content/58b0ef9a06d7bb24faec2b11df2f57f476e6f6bb/68747470733a2f2f75706c6f61642e77696b696d656469612e6f72672f77696b6970656469612f636f6d6d6f6e732f7468756d622f372f37312f5a616164706c75697a656e5f76616e5f65656e5f436c656d617469735f746578656e7369735f2532375072696e636573735f4469616e612532372e5f31382d30372d323032335f2532386163746d2e2532395f30322e6a70672f3132383070782d5a616164706c75697a656e5f76616e5f65656e5f436c656d617469735f746578656e7369735f2532375072696e636573735f4469616e612532372e5f31382d30372d323032335f2532386163746d2e2532395f30322e6a7067', + // thumbnailUrl: null, + // loading: false, + // originalWidth: null, + // originalHeight: null), + // ]), + // ]); + static const imageSingle = ContentExample( 'single image', // https://chat.zulip.org/#narrow/stream/7-test-here/topic/Thumbnails/near/1900103 @@ -1670,10 +1717,10 @@ void main() { testParseExample(ContentExample.codeBlockFollowedByMultipleLineBreaks); testParseExample(ContentExample.mathBlock); - testParseExample(ContentExample.mathBlocksMultipleInParagraph); - testParseExample(ContentExample.mathBlockInQuote); - testParseExample(ContentExample.mathBlocksMultipleInQuote); - testParseExample(ContentExample.mathBlockBetweenImages); + // testParseExample(ContentExample.mathBlocksMultipleInParagraph); + // testParseExample(ContentExample.mathBlockInQuote); + // testParseExample(ContentExample.mathBlocksMultipleInQuote); + // testParseExample(ContentExample.mathBlockBetweenImages); testParseExample(ContentExample.imageSingle); testParseExample(ContentExample.imageSingleNoDimensions); diff --git a/test/widgets/content_test.dart b/test/widgets/content_test.dart index 88f94a002e..699a6d68a8 100644 --- a/test/widgets/content_test.dart +++ b/test/widgets/content_test.dart @@ -552,7 +552,7 @@ void main() { styleFinder: (tester) => mergedStyleOf(tester, 'A')!); }); - testContentSmoke(ContentExample.mathBlock); + // testContentSmoke(ContentExample.mathBlock); /// Make a [TargetFontSizeFinder] to pass to [checkFontSizeRatio], /// from a target [Pattern] (such as a string).