mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-03-18 21:30:38 +01:00
[apps/escher/poincare] Empty expression char is now ø
This commit is contained in:
@@ -19,7 +19,7 @@ PythonCommandBin = "bin(x)"
|
||||
PythonCommandCeil = "ceil(x)"
|
||||
PythonCommandChoice = "choice(list)"
|
||||
PythonCommandCmathFunction = "cmath.function"
|
||||
PythonCommandCmathFunctionWithoutArg = "cmath.•"
|
||||
PythonCommandCmathFunctionWithoutArg = "cmath.ø"
|
||||
PythonCommandColor = "color(r,g,b)"
|
||||
PythonCommandComplex = "complex(a,b)"
|
||||
PythonCommandCopySign = "copysign(x,y)"
|
||||
@@ -57,7 +57,7 @@ PythonCommandIsFinite = "isfinite(x)"
|
||||
PythonCommandIsInfinite = "isinf(x)"
|
||||
PythonCommandIsNaN = "isnan(x)"
|
||||
PythonCommandKandinskyFunction = "kandinsky.function"
|
||||
PythonCommandKandinskyFunctionWithoutArg = "kandinsky.•"
|
||||
PythonCommandKandinskyFunctionWithoutArg = "kandinsky.ø"
|
||||
PythonCommandLdexp = "ldexp(x,i)"
|
||||
PythonCommandLgamma = "lgamma(x)"
|
||||
PythonCommandLength = "len(object)"
|
||||
@@ -66,7 +66,7 @@ PythonCommandLog10 = "log10(x)"
|
||||
PythonCommandLog2 = "log2(x)"
|
||||
PythonCommandLogComplex = "log(z,a)"
|
||||
PythonCommandMathFunction = "math.function"
|
||||
PythonCommandMathFunctionWithoutArg = "math.•"
|
||||
PythonCommandMathFunctionWithoutArg = "math.ø"
|
||||
PythonCommandMax = "max(list)"
|
||||
PythonCommandMin = "min(list)"
|
||||
PythonCommandModf = "modf(x)"
|
||||
@@ -80,7 +80,7 @@ PythonCommandRadians = "radians(x)"
|
||||
PythonCommandRandom = "random()"
|
||||
PythonCommandRandint = "randint(a,b)"
|
||||
PythonCommandRandomFunction = "random.function"
|
||||
PythonCommandRandomFunctionWithoutArg = "random.•"
|
||||
PythonCommandRandomFunctionWithoutArg = "random.ø"
|
||||
PythonCommandRandrange = "randrange(start, stop)"
|
||||
PythonCommandRangeStartStop = "range(start, stop)"
|
||||
PythonCommandRangeStop = "range(stop)"
|
||||
@@ -100,6 +100,6 @@ PythonCommandTanh = "tanh(x)"
|
||||
PythonCommandTrunc = "trunc(x)"
|
||||
PythonCommandImag = "z.imag"
|
||||
PythonCommandReal = "z.real"
|
||||
PythonCommandImagWithoutArg = "•.imag"
|
||||
PythonCommandRealWithoutArg = "•.real"
|
||||
PythonCommandImagWithoutArg = "ø.imag"
|
||||
PythonCommandRealWithoutArg = "ø.real"
|
||||
PythonCommandUniform = "uniform(a,b)"
|
||||
|
||||
@@ -20,27 +20,27 @@ NonEqualityCondition = "!="
|
||||
NonEqualityConditionWithArg = "x!=y"
|
||||
EqualityCondition = "=="
|
||||
EqualityConditionWithArg = "x==y"
|
||||
WhileLoop = "while •:\n "
|
||||
WhileLoop = "while ø:\n "
|
||||
WhileLoopWithArg = "while condition:\n instruction"
|
||||
IfOrIfElseStatement = "if • or :\n \nelse:\n "
|
||||
IfOrIfElseStatement = "if ø or :\n \nelse:\n "
|
||||
IfOrIfElseStatementWithArg = "if condition1 or condition2:\n instruction1\nelse:\n instruction2"
|
||||
IfAndIfElseStatement = "if • and :\n \nelse:\n "
|
||||
IfAndIfElseStatement = "if ø and :\n \nelse:\n "
|
||||
IfAndIfElseStatementWithArg = "if condition1 and condition2:\n instruction1\nelse:\n instruction2"
|
||||
IfElifElseStatement = "if •:\n \nelif :\n \nelse:\n "
|
||||
IfElifElseStatement = "if ø:\n \nelif :\n \nelse:\n "
|
||||
IfElifElseStatementWithArg = "if condition1:\n instruction1\nelif condition2:\n instruction2\nelse:\n instruction3"
|
||||
IfThenStatement= "if •:\n "
|
||||
IfThenStatement= "if ø:\n "
|
||||
IfThenStatementWithArg = "if condition:\n instruction"
|
||||
IfElseStatement = "if •:\n \nelse:\n "
|
||||
IfElseStatement = "if ø:\n \nelse:\n "
|
||||
IfElseStatementWithArg = "if condition:\n instruction1\nelse:\n instruction2"
|
||||
ForInListLoop = "for i in •:\n "
|
||||
ForInListLoop = "for i in ø:\n "
|
||||
ForInListLoopWithArg = "for i in list:\n instruction"
|
||||
ForInRange3ArgsLoop = "for i in range(•,,):\n "
|
||||
ForInRange3ArgsLoop = "for i in range(ø,,):\n "
|
||||
ForInRange3ArgsLoopWithArg = "for i in range(start, stop, step):\n instruction"
|
||||
ForInRange2ArgsLoop = "for i in range(•,):\n "
|
||||
ForInRange2ArgsLoop = "for i in range(ø,):\n "
|
||||
ForInRange2ArgsLoopWithArg = "for i in range(start, stop):\n instruction"
|
||||
ForInRange1ArgLoop = "for i in range(•):\n "
|
||||
ForInRange1ArgLoop = "for i in range(ø):\n "
|
||||
ForInRange1ArgLoopWithArg = "for i in range(size):\n instruction"
|
||||
PythonCommandDef = "def •():\n "
|
||||
PythonCommandDef = "def ø():\n "
|
||||
PythonCommandDefWithArg = "def function(x):"
|
||||
PythonCommandReturn = "return "
|
||||
RandomModule = "random"
|
||||
|
||||
@@ -14,7 +14,7 @@ ion_special_characters = {
|
||||
u'σ': "Ion::Charset::SmallSigma",
|
||||
u'≤': "Ion::Charset::LessEqual",
|
||||
u'≈': "Ion::Charset::AlmostEqual",
|
||||
u'•': "Ion::Charset::Empty"
|
||||
u'ø': "Ion::Charset::Empty"
|
||||
}
|
||||
|
||||
def ion_char(i18n_letter):
|
||||
|
||||
@@ -39,7 +39,7 @@ LcmCommandWithArg = "lcm(p,q)"
|
||||
LeftIntegralFirstLegend = "P(X≤"
|
||||
LeftIntegralSecondLegend = ")="
|
||||
LogCommandWithArg = "log(x,a)"
|
||||
MatrixCommand = "[[•]]"
|
||||
MatrixCommand = "[[ø]]"
|
||||
MatrixCommandWithArg = "[[1,2][3,4]]"
|
||||
MaxCommandWithArg = "max(L)"
|
||||
MinCommandWithArg = "min(L)"
|
||||
|
||||
@@ -188,7 +188,7 @@ bool ExpressionLayoutField::handleEventWithText(const char * text, bool indentat
|
||||
if (currentNumberOfLayouts >= k_maxNumberOfLayouts - 6) {
|
||||
/* We add -6 because in some cases (Ion::Events::Division,
|
||||
* Ion::Events::Exp...) we let the layout cursor handle the layout insertion
|
||||
* and these events may add at most 6 layouts (e.g *10^•). */
|
||||
* and these events may add at most 6 layouts (e.g *10^ø). */
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ QUIZ_CASE(poincare_fraction_layout_delete) {
|
||||
assert(cursor1.isEquivalentTo(ExpressionLayoutCursor(layout1->editableChild(1), ExpressionLayoutCursor::Position::Right)));
|
||||
delete layout1;
|
||||
|
||||
/* •
|
||||
/* ø
|
||||
* 1 + --- -> "BackSpace" -> 1+|3
|
||||
* |3
|
||||
* */
|
||||
|
||||
Reference in New Issue
Block a user