UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Fix multiplication symbol before Symbol Expression

Browse Source 
This makes consistent 2x and 2θ (sign omission in both cases).
This commit is contained in:
Émilie Feral
2019-11-13 15:06:14 +01:00
committed by LeaNumworks
parent a3da08323b
commit 90b3e52c0c
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
poincare/include/poincare/symbol.h
View File

@@ -34,7 +34,7 @@ public:
/* Simplification */
Expression shallowReduce(ReductionContext reductionContext) override;
Expression shallowReplaceReplaceableSymbols(Context * context) override;
LayoutShape leftLayoutShape() const override { return strlen(m_name) > 1 ? LayoutShape::MoreLetters : LayoutShape::OneLetter; };
LayoutShape leftLayoutShape() const override;
/* Approximation */
Evaluation<float> approximate(SinglePrecision p, Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const override { return templatedApproximate<float>(context, complexFormat, angleUnit); }

9
poincare/src/symbol.cpp
View File

@@ -107,6 +107,15 @@ Expression SymbolNode::shallowReplaceReplaceableSymbols(Context * context) {
return Symbol(this).shallowReplaceReplaceableSymbols(context);
}
ExpressionNode::LayoutShape SymbolNode::leftLayoutShape() const {
UTF8Decoder decoder(m_name);
decoder.nextCodePoint();
if (decoder.nextCodePoint() == UCodePointNull) { // nextCodePoint asserts that the first character is non-null
return LayoutShape::OneLetter;
}
return LayoutShape::MoreLetters;
}
template<typename T>
Evaluation<T> SymbolNode::templatedApproximate(Context * context, Preferences::ComplexFormat complexFormat, Preferences::AngleUnit angleUnit) const {
Symbol s(this);