[omega] 1.22.1

This ensures the compiler doesn't assume that the username is fixed, allowing
us top change it before flashing, to let the user change his username.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,13 +2,26 @@
 name: Bug report
 about: Omega is not working like it should? Let us know!
 title: ''
-labels: Bug, Triage
+labels: 'Status: Triage, Type: Bug'
 assignees: ''
 
 ---
 
-#### Describe the bug
+**Describe the bug**
+A clear and concise description of what the bug is.
 
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
 
-#### Environment
- - Omega Version: {go to settings > about > Omega Version and type the version here}
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - Omega Version: [go to settings > about > Omega Version and type the version here]

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +1,17 @@
 ---
 name: Feature request
-about: Suggest an idea for an improvement of Omega
+about: Suggest an idea for Omega
 title: ''
-labels: Feature, Triage
+labels: 'Status: Triage, Type: Feature'
 assignees: ''
 
 ---
 
-#### What I want to see in the next version of Omega
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/omega-beta-only---bug-report.md

@@ -0,0 +1,28 @@
+---
+name: OMEGA BETA ONLY - Bug report
+about: Omega 1.21 is not working like it should? Let us know!
+title: "[BETA-1.21] …"
+labels: 'Status: Triage, Type: Bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - Omega Version: [go to settings > about > Omega Version and type the version here]
+ - Discord username: ..........#....

.github/ISSUE_TEMPLATE/other.md

@@ -1,8 +1,8 @@
 ---
 name: Other
-about: A question? A problem? ...
+about: A question? A problem? …
 title: ''
-labels: Triage
+labels: 'Status: Triage'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/problems-during-installation.md

@@ -2,18 +2,18 @@
 name: Problems during installation
 about: Need help to install Omega?
 title: ''
-labels: Installation issue, Triage
+labels: 'Status: Triage, Type: Installation issue'
 assignees: ''
 
 ---
 
-#### Describe the problem
+**Describe the problem**
 
 
-#### Logs
+**Logs**
 ```
 Copy/paste the logs here (If you have some)
 ```
 
-#### Environment
+**Environment**
  - Omega Version: {go to settings > about > Omega Version and type the version here}

.github/workflows/ci-workflow.yml

@@ -1,31 +1,54 @@
 name: Continuous integration
-on: [pull_request, push]
+#on: [pull_request, push]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      triggerIos:
+        description: 'Run iOS tests'
+        required: true
+        default: 'no'
+      triggerMacos:
+        description: 'Run macOS tests'
+        required: true
+        default: 'no'
+      trigger3DS:
+        description: 'Run 3DS tests'
+        required: true
+        default: 'no'
 
 jobs:
-  # nintendo_3ds:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb
-  #     - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb
-  #     - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru
-  #     - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro
-  #     - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM
-  #     - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH
-      
-  #     - uses: actions/checkout@v1
-  #       with:
-  #         submodules: true
-  #     - run: make -j2 PLATFORM=simulator TARGET=3ds
-  #     - uses: actions/upload-artifact@master
-  #       with:
-  #         name: epsilon-3ds.3dsx
-  #         path: output/release/simulator/3ds/epsilon.3dsx
-  android:
+  nintendo_3ds:
+    if: github.event.inputs.trigger3DS == 'yes'
     runs-on: ubuntu-latest
     steps:
+      - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman.amd64.deb -O /tmp/devkitpro-pacman.deb
+      - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb
+      - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru
+      - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro
+      - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM
+      - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH
+
       - uses: actions/checkout@v1
         with:
           submodules: true
+      - run: make -j2 PLATFORM=simulator TARGET=3ds
+      - run: make -j2 PLATFORM=simulator TARGET=3ds epsilon.cia
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-3ds.3dsx
+          path: output/release/simulator/3ds/epsilon.3dsx
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-3ds.cia
+          path: output/release/simulator/3ds/epsilon.cia
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator TARGET=android
       - uses: actions/upload-artifact@master
         with:
@@ -35,10 +58,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
-      - uses: numworks/setup-arm-toolchain@v1
-      - uses: actions/checkout@v1
+      - uses: numworks/setup-arm-toolchain@2020-q2
+      - uses: actions/checkout@v2
         with:
-          submodules: true
+          submodules: 'recursive'
       - run: mkdir final-output
       - run: make -j2 MODEL=n0100 EPSILON_I18N=en output/release/device/n0100/epsilon.onboarding.two_binaries
       - run: mv output/release/device/n0100/epsilon.onboarding.internal.bin final-output/epsilon.onboarding.internal.en.bin
@@ -76,10 +99,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
-      - uses: numworks/setup-arm-toolchain@v1
-      - uses: actions/checkout@v1
+      - uses: numworks/setup-arm-toolchain@2020-q2
+      - uses: actions/checkout@v2
         with:
-          submodules: true
+          submodules: 'recursive'
       - run: make -j2 epsilon.dfu
       - run: make -j2 epsilon.onboarding.dfu
       - run: make -j2 epsilon.onboarding.update.dfu
@@ -94,15 +117,31 @@ jobs:
         with:
           name: epsilon-binpack-n0110.tgz
           path: output/release/device/n0110/binpack-n0110.tgz
+  windows:
+    runs-on: windows-latest
+    defaults:
+       run:
+         shell: msys2 {0}
+    steps:
+      - uses: msys2/setup-msys2@v2
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng
+      - run: make -j2 PLATFORM=simulator
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-windows.exe
+          path: output/release/simulator/windows/epsilon.exe
   web:
     runs-on: ubuntu-latest
     steps:
-      - uses: numworks/setup-emscripten@v2
+      - uses: numworks/setup-emscripten@v1
         with:
           sdk: latest-upstream
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
-          submodules: true
+          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator TARGET=web
       - uses: actions/upload-artifact@master
         with:
@@ -112,12 +151,41 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
-          submodules: true
+          submodules: 'recursive'
       - run: make -j2 PLATFORM=simulator
       - uses: actions/upload-artifact@master
         with:
           name: epsilon-linux.bin
           path: output/release/simulator/linux/epsilon.bin
-      - run: make -j2 PLATFORM=simulator test.headless.bin
+  macos:
+    if: github.event.inputs.triggerMacos == 'yes'
+    runs-on: macOS-latest
+    steps:
+      - run: brew install numworks/tap/epsilon-sdk
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - run: make -j2 PLATFORM=simulator
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-macos.zip
+          path: output/release/simulator/macos/epsilon.app
+  ios:
+    if: github.event.inputs.triggerIos == 'yes'
+    runs-on: macOS-latest
+    steps:
+      - run: brew install numworks/tap/epsilon-sdk
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0
+      - run: make -j2 PLATFORM=simulator TARGET=ios EPSILON_TELEMETRY=0 APPLE_PLATFORM=ios-simulator
+      - uses: actions/upload-artifact@master
+        with:
+          name: epsilon-ios.ipa
+          path: output/release/simulator/ios/epsilon.ipa
+
+env:
+  ACCEPT_OFFICIAL_TOS: 1

.github/workflows/metric-workflow.yml

@@ -1,5 +1,5 @@
 name: Metrics
-on: [pull_request]
+on: [pull_request_target]
 
 jobs:
   binary-size:
@@ -8,7 +8,7 @@ jobs:
       - name: Install dependencies
         run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
       - name: Install ARM toolchain
-        uses: numworks/setup-arm-toolchain@v1
+        uses: numworks/setup-arm-toolchain@2020-q2
       - name: Checkout PR base
         uses: actions/checkout@v2
         with:
@@ -28,11 +28,14 @@ jobs:
       - name: Retrieve binary size analysis
         id: binary_size
         run: echo "::set-output name=table::$(python3 head/build/metrics/binary_size.py base/output/release/device/n0110/epsilon.elf head/output/release/device/n0110/epsilon.elf --labels Base Head --sections .text .rodata .bss .data --custom 'Total (RAM)' .data .bss --custom 'Total (ROM)' .text .rodata .data --escape)"
-      - name: Prepare comment auth
-        run: echo "::set-env name=GITHUB_TOKEN::$(echo YjgxYTk1YTQ4YzYxNjU4ZTA3YWQzNDYwNTk3ZTI2MTlkODU5MThlOQo= | base64 --decode)"
       - name: Add comment
-        uses: actions/github@v1.0.0
-        env:
-          GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
+        uses: actions/github-script@v3.0.0
         with:
-          args: comment ${{ steps.binary_size.outputs.table }}
+          github-token: ${{ secrets.OMEGA_ROBOT_TOKEN }}
+          script: |
+            await github.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              body: `${{ steps.binary_size.outputs.table }}`,
+            });

.github/workflows/unit-workflow.yml

@@ -0,0 +1,14 @@
+name: Unit tests
+on: [pull_request_target]
+
+jobs:
+  units:
+    runs-on: ubuntu-latest
+    steps:
+      - run: sudo apt-get install build-essential imagemagick libfreetype6-dev libjpeg-dev libpng-dev pkg-config
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
+      - run: make -j2 PLATFORM=simulator test.headless.bin
+      - run: output/release/simulator/linux/test.headless.bin
+

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "apps/rpn"]
 	path = apps/rpn
 	url = https://github.com/Omega-Numworks/Omega-RPN.git
-[submodule "apps/atom"]
-	path = apps/atom
-	url = https://github.com/Omega-Numworks/Omega-Atom.git
-[submodule "themes"]
-	path = themes
-	url = https://github.com/Omega-Numworks/Omega-Themes.git
+[submodule "apps/atomic"]
+	path = apps/atomic
+	url = https://github.com/Omega-Numworks/Omega-Atomic.git

Makefile

@@ -40,7 +40,6 @@ info:
 	@echo "BUILD_DIR = $(BUILD_DIR)"
 	@echo "PLATFORM" = $(PLATFORM)
 	@echo "DEBUG" = $(DEBUG)
-	@echo "LEDS_CHOICE" = $(LEDS_CHOICE)
 	@echo "EPSILON_GETOPT" = $(EPSILON_GETOPT)
 	@echo "ESCHER_LOG_EVENTS_BINARY" = $(ESCHER_LOG_EVENTS_BINARY)
 	@echo "QUIZ_USE_CONSOLE" = $(QUIZ_USE_CONSOLE)
@@ -178,7 +177,7 @@ cleanandcompile:
 .PHONY: start
 start:
 	@echo "INFO Starting output/$(BUILD_TYPE)/simulator/$(HOST)/epsilon.$(EXE)"
-	@$(Q) output/$(BUILD_TYPE)/simulator/$(HOST)/epsilon.$(EXE)
+	@$(Q) output/$(BUILD_TYPE)/simulator/$(HOST)/epsilon.$(EXE) -v
 
 .PHONY: clean_run
 clean_run: cleanandcompile

README.fr.md

@@ -0,0 +1,177 @@
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
+
+<p align="center">
+  <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
+  <a href="https://github.com/Omega-Numworks/Omega/issues"><img alt="Issues" src="https://img.shields.io/github/issues/Omega-Numworks/Omega.svg?labelColor=292929&logo=git&style=for-the-badge" /></a>
+  <br/>
+  <a href="https://discord.gg/X2TWhh9"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
+</p>
+
+> Don't understand french ? speak english ? here's the [english README](./README.md) !
+
+## À propos
+
+Omega est un fork d'Epsilon, l'OS de Numworks tournant sur les calculatrices du même nom, qui apporte beaucoup de fonctionnalités en plus. Omega est fait pour ceux qui aimeraient ajouter certaines fonctionnalités ayant été rejetées par Numworks à leurs calculatrices (pour des raisons 100% compréhensibles !). [Essayez en ligne](https://getomega.web.app/simulator).
+
+### Quelques fonctionnalités supplémentaires
+- Retour du calcul littéral
+- Une application RPN
+- Application Externes
+- Des thèmes
+- Python amélioré (module os, méthode open...)
+- Un tableau périodique et toutes les masses molaires des éléments dans la toolbox
+- *Ainsi que d'autres à découvrir...* [Changelogs complets](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Fonctionnalités princpales & captures d'écran](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
+
+## Installation
+
+### Automatique
+
+Vous pouvez installer Omega automatiquement depuis [notre site](https://getomega.web.app/) sur la page "installer".
+
+<a href="https://getomega.web.app"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86352956-e9000480-bc66-11ea-82b7-79fd7e56fa27.png" /></p></a>
+
+### Manuelle
+
+Tout d'abord, suivez **la première étape** [ici](https://www.numworks.com/resources/engineering/software/build/), puis :
+
+<details>
+  <summary><b>Modèle n0100</b></summary>
+
+(note : vous pouvez changer `EPSILON_I18N=fr` en `en`, `nl`, `pt`, `it`, `de`, `es` ou `hu`).
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make MODEL=n0100 clean
+make MODEL=n0100 EPSILON_I18N=fr OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
+make MODEL=n0100 epsilon_flash
+```
+
+Important : N'oubliez pas l'argument `--recursive`, Omega a besoin de sous-modules.
+Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
+
+</details>
+
+<details>
+  <summary><b>Modèle n0110</b></summary>
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make clean
+make OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
+make epsilon_flash
+```
+
+Important : N'oubliez pas l'argument `--recursive`, Omega a besoin de sous-modules.
+Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
+
+</details>
+
+<details>
+  <summary><b>Fichiers binaires</b></summary>
+  
+Ces fichiers peuvent être utilisés pour distribuer Omega (pour que tout le monde puisse le flasher via [Webdfu_Numworks](https://ti-planet.github.io/webdfu_numworks/)).
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make clean
+make MODEL=n0100 OMEGA_USERNAME="" -j8
+make MODEL=n0100 OMEGA_USERNAME="" binpack -j8
+make OMEGA_USERNAME="" -j8
+make OMEGA_USERNAME="" binpack -j8
+```
+
+Important : N'oubliez pas l'argument `--recursive`, Omega a besoin de sous-modules.
+Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
+  
+</details>
+
+<details>
+  <summary><b>Simulateur web</b></summary>
+  
+D'abord, installez emsdk :
+
+```bash
+git clone https://github.com/emscripten-core/emsdk.git
+cd emsdk
+./emsdk install latest-fastcomp
+./emsdk activate latest-fastcomp
+source emsdk_env.sh
+```
+
+Puis, compilez Omega :
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout omega-master
+make clean
+make PLATFORM=simulator TARGET=web OMEGA_USERNAME="{Votre nom ici, 15 caractères max}" -j4
+```
+
+Le simulateur se trouve dans `output/release/simulator/web/simulator.zip`
+
+Important : N'oubliez pas l'argument `--recursive`, Omega a besoin de sous-modules.
+Vous pouvez aussi changer le nombre de processus parallèles pendant la compilation en changeant la valeur suivant `-j`.
+
+</details>
+
+<details>
+  <summary><b>Simulateur 3DS</b></summary>
+  
+Vous aurez besoin de devkitPro et de devkitARM disponible dans votre `$PATH` (instructions [ici](https://devkitpro.org/wiki/Getting_Started) (en anglais))
+
+```bash
+git clone --recursive https://github.com/Omega-Numworks/Omega.git
+cd Omega
+git checkout --recursive omega-dev
+make PLATFORM=simulator TARGET=3ds -j
+```
+
+Vous pouvez ensuite copier epsilon.3dsx sur une carte SD pour l'exécuter depuis le HBC ou utiliser 3dslink pour le lancer via le réseau :
+
+```bash
+3dslink output/release/simulator/3ds/epsilon.3dsx -a <ADRESSE IP 3DS>
+```
+
+</details>
+
+Si vous avez besoin d'aide, n'hésitez pas à rejoindre notre serveur discord : https://discord.gg/X2TWhh9
+
+<a href="https://discord.gg/X2TWhh9"><p align="center"><img alt="Omega Banner Discord" src="https://user-images.githubusercontent.com/12123721/86287349-54ef5800-bbe8-11ea-80c1-34eb1f93eebd.png" /></p></a>
+---
+
+## Contribution
+
+Pour contribuer, merci de lire le [Wiki](https://github.com/Omega-Numworks/Omega/wiki/Contributing)
+
+## Nos autres projets
+
+* [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
+* [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
+* [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
+* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
+* [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
+* [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
+* [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)
+* [External Apps](https://github.com/Omega-Numworks/External-Apps)
+
+## À propos d'Epsilon
+
+Omega est un fork d'Epsilon, un système d'exploitation performant pour calculatrices graphiques. Il inclut huit applications pour les mathématiques de lycée et d'études supérieurs
+
+Vous pouvez essayer Epsilon depuis votre navigateur sur le [simulateur en ligne](https://www.numworks.com/simulator/).
+
+## Licence
+
+NumWorks est une marque déposée de NumWorks SAS, 24 Rue Godot de Mauroy, 75009 Paris, France.
+Nintendo est Nintendo 3DS sont des marques déposées de Nintendo of America Inc, 4600 150th Ave NE, Redmond, WA 98052, Etats-Unis.
+NumWorks SAS et Nintendo of America Inc ne sont en aucun cas associés avec ce projet.
+
+* NumWorks Epsilon est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).
+* Omega est disponible sous [Lisense CC BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode).

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://user-images.githubusercontent.com/12123721/87953533-75a22380-caab-11ea-8cde-c40291c4a9ae.png" /></p>
+<p align="center"><img src="https://user-images.githubusercontent.com/12123721/111199951-80bd3d00-85c1-11eb-936c-28cf590208b8.png" /></p>
 
 <p align="center">
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="cc by-nc-sa 4.0" src="https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-525252.svg?labelColor=292929&logo=creative%20commons&style=for-the-badge" /></a>
@@ -7,19 +7,20 @@
   <a href="https://discord.gg/X2TWhh9"><img alt="Discord" src="https://img.shields.io/discord/663420259851567114?color=blue&labelColor=292929&label=chat%20-%20discord&logo=discord&style=for-the-badge" /></a>
 </p>
 
+> Vous ne comprenez pas l'anglais ? vous êtes francophone ? Regardez le [*LISEZ-MOI* français](./README.fr.md) !
+
 ## About
 
-Omega is a fork of Numworks' Epsilon, the OS that runs on their calculator, which brings many features to it. Omega is for the people who want to add features to the calculator, but cannot because they have been rejected by Numworks (for reasons that are 100% understandable!).
+Omega is a fork of Numworks' Epsilon, the OS that runs on their calculator, which brings many features to it. Omega is for the people who want to add features to the calculator, but cannot because they have been rejected by Numworks (for reasons that are 100% understandable!). [Try it online](https://getomega.web.app/simulator).
 
-## Some new features
+### Some new features
 - Adding symbolic calculation back into the calculator
 - An app for RPN
+- Exernal apps
+- A theme engine
+- New python features (os module, open method...)
 - A periodic table app + all of the molar masses for the elements in the toolbox
-- More steps for brightness (16 instead of 5)
-- ~~32 KB Python heap instead of 16 KB~~ Now available on Epsilon `>=13.2.0`!
-- And more...
-
-The main new features are listed [here](https://github.com/Omega-Numworks/Omega/wiki/Main-features), and the complete changelog can be found [here](https://github.com/Omega-Numworks/Omega/wiki/Complete-changelog).
+- *And much more to discover...* [Complete changelog](https://github.com/Omega-Numworks/Omega/wiki/Changelog) | [Main new features + screenshots](https://github.com/Omega-Numworks/Omega/wiki/Main-features).
 
 ## Installation
 
@@ -36,12 +37,14 @@ First of all, follow **step 1** [here](https://www.numworks.com/resources/engine
 <details>
   <summary><b>Model n0100</b></summary>
 
-```
+(note: you can change the `EPSILON_I18N=en` flag to `fr`, `nl`, `pt`, `it`, `de`, `es` or `hu`).
+
+```bash
 git clone --recursive https://github.com/Omega-Numworks/Omega.git
 cd Omega
 git checkout omega-master
 make MODEL=n0100 clean
-make MODEL=n0100 USERNAME="{Your name, max 15 characters}" -j4
+make MODEL=n0100 EPSILON_I18N=en OMEGA_USERNAME="{Your name, max 15 characters}" -j4
 make MODEL=n0100 epsilon_flash
 ```
 
@@ -53,12 +56,12 @@ Also, you can change the number of processes that run in parallel during the bui
 <details>
   <summary><b>Model n0110</b></summary>
 
-```
+```bash
 git clone --recursive https://github.com/Omega-Numworks/Omega.git
 cd Omega
 git checkout omega-master
 make clean
-make USERNAME="{Your name, max 15 characters}" -j4
+make OMEGA_USERNAME="{Your name, max 15 characters}" -j4
 make epsilon_flash
 ```
 
@@ -72,15 +75,15 @@ Also, you can change the number of processes that run in parallel during the bui
   
 These can be used to distribute Omega (so that it can be flashed by anyone with [Webdfu_Numworks](https://ti-planet.github.io/webdfu_numworks/)).
 
-```
+```bash
 git clone --recursive https://github.com/Omega-Numworks/Omega.git
 cd Omega
 git checkout omega-master
 make clean
-make MODEL=n0100 USERNAME="" -j8
-make MODEL=n0100 USERNAME="" binpack -j8
-make USERNAME="" -j8
-make USERNAME="" binpack -j8
+make MODEL=n0100 OMEGA_USERNAME="" -j8
+make MODEL=n0100 OMEGA_USERNAME="" binpack -j8
+make OMEGA_USERNAME="" -j8
+make OMEGA_USERNAME="" binpack -j8
 ```
 
 Important: Don't forget the `--recursive` tag, because Omega relies on submodules.
@@ -93,7 +96,7 @@ Also, you can change the number of processes that run in parallel during the bui
   
 First, install emsdk :
 
-```
+```bash
 git clone https://github.com/emscripten-core/emsdk.git
 cd emsdk
 ./emsdk install latest-fastcomp
@@ -103,12 +106,12 @@ source emsdk_env.sh
 
 Then, compile Omega :
 
-```
+```bash
 git clone --recursive https://github.com/Omega-Numworks/Omega.git
 cd Omega
 git checkout omega-master
 make clean
-make PLATFORM=simulator TARGET=web USERNAME="{Your name, max 15 characters}" -j4
+make PLATFORM=simulator TARGET=web OMEGA_USERNAME="{Your name, max 15 characters}" -j4
 ```
 
 The simulator is now in `output/release/simulator/web/simulator.zip`
@@ -122,14 +125,16 @@ Also, you can change the number of processes that run in parallel during the bui
   <summary><b>3DS Simulator</b></summary>
   
 You need devkitPro and devkitARM installed and in your path (instructions [here](https://devkitpro.org/wiki/Getting_Started))
-```
+
+```bash
 git clone --recursive https://github.com/Omega-Numworks/Omega.git
 cd Omega
 git checkout --recursive omega-dev
 make PLATFORM=simulator TARGET=3ds -j
 ```
 You can then put epsilon.3dsx on a SD card to run it from the HBC or use 3dslink to launch it over the network:
-```
+
+```bash
 3dslink output/release/simulator/3ds/epsilon.3dsx -a <3DS' IP ADDRESS>
 ```
 
@@ -144,20 +149,16 @@ If you need help, you can join our Discord server here : https://discord.gg/X2TW
 
 To contribute, please refer to the [Wiki](https://github.com/Omega-Numworks/Omega/wiki/Contributing)
 
-## Branches
-
-* `omega-master` : stable releases
-* `omega-dev` : beta releases
-* `omega-hotfix` : developers only, branch to fix issues
-
 ## Related repositories
 
 * [Omega Themes](https://github.com/Omega-Numworks/Omega-Themes)
 * [Omega Website](https://github.com/Omega-Numworks/Omega-Website)
 * [Omega RPN `APP`](https://github.com/Omega-Numworks/Omega-RPN)
-* [Omega Atom `APP`](https://github.com/Omega-Numworks/Omega-Atom)
+* [Omega Atomic `APP`](https://github.com/Omega-Numworks/Omega-Atomic)
 * [Omega Design](https://github.com/Omega-Numworks/Omega-Design)
+* [Omega Discord Bot](https://github.com/Omega-Numworks/Omega-Discord-Bot)
 * [Omega App Template `BETA`](https://github.com/Omega-Numworks/Omega-App-Template)
+* [External Apps](https://github.com/Omega-Numworks/External-Apps)
 
 ## About Epsilon
 

apps/Makefile

@@ -11,6 +11,25 @@ apps =
 # (path to the apps header).
 $(foreach i,${apps_list},${eval include apps/$(i)/Makefile})
 
+app_equals = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
+# We list all the apps that are missing
+apps_missing = $(foreach i, ${apps_list}, $(if $(call app_equals, apps/$(i)/Makefile, $(wildcard apps/$(i)/Makefile)),, $(i) ) )
+
+# If the two doesn't match, we got an error.
+ifneq ($(strip $(apps_missing)),)
+    miss_modules = 0
+
+    # Check if the missing apps are one that are supposed to be submodules
+    $(foreach i, $(SUBMODULES_APPS), $(if $(call app_equals, $(filter $(i), $(apps_missing)), $(i)), $(eval miss_modules=1)))
+
+    ifeq ($(miss_modules), 1)
+        PLS_IGNORE := $(shell >&2 printf "\nSome submodules apps seem to be missing. To download them, assumming you git clone'd the repo, do\n")
+        PLS_IGNORE := $(shell >&2 printf "  git submodule init\n")
+        PLS_IGNORE := $(shell >&2 printf "  git submodule update\n\n")
+    endif
+    $(error Missing apps: $(strip $(apps_missing)))
+endif
+
 apps_src += $(addprefix apps/,\
   alternate_empty_nested_menu_controller.cpp \
   apps_container.cpp \
@@ -25,6 +44,7 @@ apps_src += $(addprefix apps/,\
   backlight_dimming_timer.cpp \
   battery_timer.cpp \
   battery_view.cpp \
+  clock_timer.cpp \
   empty_battery_window.cpp \
   exam_pop_up_controller.cpp \
   exam_mode_configuration_official.cpp:+official \
@@ -41,7 +61,10 @@ apps_src += $(addprefix apps/,\
   title_bar_view.cpp \
 )
 
-tests_src += apps/exam_mode_configuration_non_official.cpp
+tests_src += $(addprefix apps/,\
+  exam_mode_configuration_non_official.cpp \
+)
+
 
 snapshots_declaration = $(foreach i,$(apps),$(i)::Snapshot m_snapshot$(subst :,,$(i))Snapshot;)
 apps_declaration = $(foreach i,$(apps),$(i) m_$(subst :,,$(i));)
@@ -51,10 +74,13 @@ snapshots_count = $(words $(apps))
 snapshot_includes = $(foreach i,$(app_headers),-include $(i) )
 epsilon_app_names = '$(foreach i,${apps_list},"$(i)", )'
 
-$(call object_for,apps/apps_container_storage.cpp apps/apps_container.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) -DUSERNAME="$(USERNAME)"
+$(call object_for,apps/apps_container_storage.cpp apps/apps_container.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) -DOMEGA_USERNAME="$(OMEGA_USERNAME)"
 
 # I18n file generation
 
+country_preferences = apps/country_preferences.csv
+language_preferences = apps/language_preferences.csv
+
 # The header is refered to as <apps/i18n.h> so make sure it's findable this way
 SFLAGS += -I$(BUILD_DIR)
 
@@ -64,14 +90,14 @@ i18n_files += $(addprefix apps/language_,$(addsuffix _iso6391.universal.i18n, $(
 endif
 
 i18n_files += $(call i18n_with_universal_for,shared)
-i18n_files += $(call i18n_without_universal_for,toolbox)
+i18n_files += $(call i18n_with_universal_for,toolbox)
 i18n_files += $(call i18n_without_universal_for,variables)
 
 $(eval $(call rule_for, \
   I18N, \
   apps/i18n.cpp, \
   $(i18n_files), \
-  $$(PYTHON) apps/i18n.py --codepoints $(code_points) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --files $$^ --generateISO6391locales $$(EPSILON_GETOPT), \
+  $$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^ --generateISO6391locales $$(EPSILON_GETOPT), \
   global \
 ))
 
@@ -84,9 +110,10 @@ $(BUILD_DIR)/apps/i18n.h: $(BUILD_DIR)/apps/i18n.cpp
 $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png))
 
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/i18n.h
+$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/home/apps_layout.h
 $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
 
-apps_tests_src = $(app_calculation_test_src) $(app_code_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_settings_test_src) $(app_solver_test_src)
+apps_tests_src = $(app_calculation_test_src) $(app_code_test_src) $(app_graph_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_settings_test_src) $(app_solver_test_src)
 
 apps_tests_src += $(addprefix apps/,\
   alternate_empty_nested_menu_controller.cpp \

apps/apps_container.cpp

@@ -8,6 +8,8 @@
 #include <ion/backlight.h>
 #include <poincare/preferences.h>
 
+#include <algorithm>
+
 extern "C" {
 #include <assert.h>
 }
@@ -31,6 +33,7 @@ AppsContainer::AppsContainer() :
   m_batteryTimer(),
   m_suspendTimer(),
   m_backlightDimmingTimer(),
+  m_clockTimer(ClockTimer(this)),
   m_homeSnapshot(),
   m_onBoardingSnapshot(),
   m_hardwareTestSnapshot(),
@@ -58,8 +61,23 @@ AppsContainer::AppsContainer() :
 }
 
 bool AppsContainer::poincareCircuitBreaker() {
+  constexpr uint64_t minimalPressDuration = 20;
+  static uint64_t beginningOfInterruption = 0;
   Ion::Keyboard::State state = Ion::Keyboard::scan();
-  return state.keyDown(Ion::Keyboard::Key::Back);
+  bool interrupt = state.keyDown(Ion::Keyboard::Key::Back) || state.keyDown(Ion::Keyboard::Key::Home) || state.keyDown(Ion::Keyboard::Key::OnOff);
+  if (!interrupt) {
+    beginningOfInterruption = 0;
+    return false;
+  }
+  if (beginningOfInterruption == 0) {
+    beginningOfInterruption = Ion::Timing::millis();
+    return false;
+  }
+  if (Ion::Timing::millis() - beginningOfInterruption > minimalPressDuration) {
+    beginningOfInterruption = 0;
+    return true;
+  }
+  return false;
 }
 
 App::Snapshot * AppsContainer::hardwareTestAppSnapshot() {
@@ -202,6 +220,13 @@ bool AppsContainer::dispatchEvent(Ion::Events::Event event) {
   return didProcessEvent || alphaLockWantsRedraw;
 }
 
+static constexpr Ion::Events::Event switch_events[] = {
+    Ion::Events::ShiftSeven, Ion::Events::ShiftEight, Ion::Events::ShiftNine,
+    Ion::Events::ShiftFour, Ion::Events::ShiftFive, Ion::Events::ShiftSix,
+    Ion::Events::ShiftOne, Ion::Events::ShiftTwo, Ion::Events::ShiftThree,
+    Ion::Events::ShiftZero, Ion::Events::ShiftDot, Ion::Events::ShiftEE
+};
+
 bool AppsContainer::processEvent(Ion::Events::Event event) {
   // Warning: if the window is dirtied, you need to call window()->redraw()
   if (event == Ion::Events::USBPlug) {
@@ -226,6 +251,15 @@ bool AppsContainer::processEvent(Ion::Events::Event event) {
     switchTo(appSnapshotAtIndex(1));
     return true;
   }
+
+  for(int i = 0; i < std::min((int) (sizeof(switch_events) / sizeof(Ion::Events::Event)), APPS_CONTAINER_SNAPSHOT_COUNT); i++) {
+    if (event == switch_events[i]) {
+      m_window.redraw(true);
+      switchTo(appSnapshotAtIndex(i+1));
+      return true;
+    }
+  }
+
   if (event == Ion::Events::OnOff) {
     suspend(true);
     return true;
@@ -304,6 +338,10 @@ void AppsContainer::run() {
   switchTo(nullptr);
 }
 
+bool AppsContainer::updateClock() {
+  return m_window.updateClock();
+}
+
 bool AppsContainer::updateBatteryState() {
   bool batteryLevelUpdated = m_window.updateBatteryLevel();
   bool pluggedStateUpdated = m_window.updatePluggedState();
@@ -336,7 +374,7 @@ void AppsContainer::shutdownDueToLowBattery() {
    * case. */
     return;
   }
-  while (Ion::Battery::level() == Ion::Battery::Charge::EMPTY) {
+  while (Ion::Battery::level() == Ion::Battery::Charge::EMPTY && !Ion::USB::isPlugged()) {
     Ion::Backlight::setBrightness(0);
     if (!GlobalPreferences::sharedGlobalPreferences()->isInExamMode()) {
       /* Unless the LED is lit up for the exam mode, switch off the LED. IF the
@@ -360,7 +398,7 @@ bool AppsContainer::updateAlphaLock() {
   return m_window.updateAlphaLock();
 }
 
-OnBoarding::PopUpController * AppsContainer::promptController() {
+OnBoarding::PromptController * AppsContainer::promptController() {
   if (k_promptNumberOfMessages == 0) {
     return nullptr;
   }
@@ -374,30 +412,7 @@ void AppsContainer::redrawWindow(bool force) {
 void AppsContainer::activateExamMode(GlobalPreferences::ExamMode examMode) {
   assert(examMode != GlobalPreferences::ExamMode::Off && examMode != GlobalPreferences::ExamMode::Unknown);
   reset();
-  Preferences * preferences = Preferences::sharedPreferences();
-  switch ((int)preferences->colorOfLED()) {
-    case 0:
-      Ion::LED::setColor(KDColorRed);
-      break;
-    case 1:
-      Ion::LED::setColor(KDColorWhite);
-      break;
-    case 2:
-      Ion::LED::setColor(KDColorGreen);
-      break;
-    case 3:
-      Ion::LED::setColor(KDColorBlue);
-      break;
-    case 4:
-      Ion::LED::setColor(KDColorYellow);
-      break;
-    case 5:
-      Ion::LED::setColor(KDColorPurple);
-      break;
-    case 6:
-      Ion::LED::setColor(KDColorOrange);
-      break;
-  }
+  Ion::LED::setColor(KDColorRed);
   /* The Dutch exam mode LED is supposed to be orange but we can only make
    * blink "pure" colors: with RGB leds on or off (as the PWM is used for
    * blinking). The closest "pure" color is Yellow. Moreover, Orange LED is
@@ -432,11 +447,11 @@ Window * AppsContainer::window() {
 }
 
 int AppsContainer::numberOfContainerTimers() {
-  return 3;
+  return 4;
 }
 
 Timer * AppsContainer::containerTimerAtIndex(int i) {
-  Timer * timers[3] = {&m_batteryTimer, &m_suspendTimer, &m_backlightDimmingTimer};
+  Timer * timers[4] = {&m_batteryTimer, &m_suspendTimer, &m_backlightDimmingTimer, &m_clockTimer};
   return timers[i];
 }
 

apps/apps_container.h

@@ -16,7 +16,8 @@
 #include "global_preferences.h"
 #include "backlight_dimming_timer.h"
 #include "shared/global_context.h"
-#include "on_boarding/pop_up_controller.h"
+#include "clock_timer.h"
+#include "on_boarding/prompt_controller.h"
 
 #include <ion/events.h>
 
@@ -39,13 +40,14 @@ public:
   bool dispatchEvent(Ion::Events::Event event) override;
   bool switchTo(App::Snapshot * snapshot) override;
   void run() override;
+  bool updateClock();
   bool updateBatteryState();
   void refreshPreferences();
   void reloadTitleBarView();
   void displayExamModePopUp(GlobalPreferences::ExamMode mode);
   void shutdownDueToLowBattery();
   void setShiftAlphaStatus(Ion::Events::ShiftAlphaStatus newStatus);
-  OnBoarding::PopUpController * promptController();
+  OnBoarding::PromptController * promptController();
   void redrawWindow(bool force = false);
   void activateExamMode(GlobalPreferences::ExamMode examMode);
   // Exam pop-up controller delegate
@@ -72,10 +74,11 @@ private:
   MathToolbox m_mathToolbox;
   MathVariableBoxController m_variableBoxController;
   ExamPopUpController m_examPopUpController;
-  OnBoarding::PopUpController m_promptController;
+  OnBoarding::PromptController m_promptController;
   BatteryTimer m_batteryTimer;
   SuspendTimer m_suspendTimer;
   BacklightDimmingTimer m_backlightDimmingTimer;
+  ClockTimer m_clockTimer;
   Home::App::Snapshot m_homeSnapshot;
   OnBoarding::App::Snapshot m_onBoardingSnapshot;
   HardwareTest::App::Snapshot m_hardwareTestSnapshot;

apps/apps_window.cpp

@@ -3,6 +3,7 @@
 extern "C" {
 #include <assert.h>
 }
+#include <ion/rtc.h>
 
 AppsWindow::AppsWindow() :
   Window(),
@@ -19,6 +20,11 @@ bool AppsWindow::updateBatteryLevel() {
   return m_titleBarView.setChargeState(Ion::Battery::level());
 }
 
+bool AppsWindow::updateClock() {
+  Ion::RTC::DateTime dateTime = Ion::RTC::dateTime();
+  return m_titleBarView.setClock(dateTime.tm_hour, dateTime.tm_min, Ion::RTC::mode() != Ion::RTC::Mode::Disabled);
+}
+
 bool AppsWindow::updateIsChargingState() {
   return m_titleBarView.setIsCharging(Ion::Battery::isCharging());
 }

apps/apps_window.h

@@ -9,6 +9,7 @@ public:
   AppsWindow();
   void setTitle(I18n::Message title);
   bool updateBatteryLevel();
+  bool updateClock();
   bool updateIsChargingState();
   bool updatePluggedState();
   void refreshPreferences();

apps/battery_timer.cpp

@@ -9,7 +9,7 @@ BatteryTimer::BatteryTimer() :
 bool BatteryTimer::fire() {
   AppsContainer * container = AppsContainer::sharedAppsContainer();
   bool needRedrawing = container->updateBatteryState();
-  if (Ion::Battery::level() == Ion::Battery::Charge::EMPTY) {
+  if (Ion::Battery::level() == Ion::Battery::Charge::EMPTY && !Ion::USB::isPlugged()) {
     container->shutdownDueToLowBattery();
   }
   return needRedrawing;

apps/calculation/Makefile

@@ -17,6 +17,7 @@ app_calculation_src = $(addprefix apps/calculation/,\
   additional_outputs/integer_list_controller.cpp \
   additional_outputs/scrollable_three_expressions_cell.cpp \
   additional_outputs/list_controller.cpp \
+  additional_outputs/matrix_list_controller.cpp \
   additional_outputs/rational_list_controller.cpp \
   additional_outputs/trigonometry_graph_cell.cpp \
   additional_outputs/trigonometry_list_controller.cpp \

apps/calculation/additional_outputs/complex_list_controller.cpp

@@ -26,10 +26,10 @@ void ComplexListController::setExpression(Poincare::Expression e) {
   }
   Poincare::Context * context = App::app()->localContext();
   // Fill Calculation Store
-  m_calculationStore.push("im(z)", context);
-  m_calculationStore.push("re(z)", context);
-  m_calculationStore.push("arg(z)", context);
-  m_calculationStore.push("abs(z)", context);
+  m_calculationStore.push("im(z)", context, CalculationHeight);
+  m_calculationStore.push("re(z)", context, CalculationHeight);
+  m_calculationStore.push("arg(z)", context, CalculationHeight);
+  m_calculationStore.push("abs(z)", context, CalculationHeight);
 
   // Set Complex illustration
   // Compute a and b as in Expression::hasDefinedComplexApproximation to ensure the same defined result

apps/calculation/additional_outputs/expressions_list_controller.cpp

@@ -11,7 +11,7 @@ ExpressionsListController::ExpressionsListController(EditExpressionController *
   ListController(editExpressionController),
   m_cells{}
 {
-  for (int i = 0; i < k_maxNumberOfCells; i++) {
+  for (int i = 0; i < k_maxNumberOfRows; i++) {
     m_cells[i].setParentResponder(m_listController.selectableTableView());
   }
 }
@@ -21,15 +21,20 @@ void ExpressionsListController::didEnterResponderChain(Responder * previousFirst
 }
 
 int ExpressionsListController::reusableCellCount(int type) {
-  return k_maxNumberOfCells;
+  return k_maxNumberOfRows;
 }
 
 void ExpressionsListController::viewDidDisappear() {
   ListController::viewDidDisappear();
-  // Reset cell memoization to avoid taking extra space in the pool
-  for (int i = 0; i < k_maxNumberOfCells; i++) {
+  // Reset layout and cell memoization to avoid taking extra space in the pool
+  for (int i = 0; i < k_maxNumberOfRows; i++) {
     m_cells[i].setLayout(Layout());
+    /* By reseting m_layouts, numberOfRow will go down to 0, and the highlighted
+     * cells won't be unselected. Therefore we unselect them here. */
+    m_cells[i].setHighlighted(false);
+    m_layouts[i] = Layout();
   }
+  m_expression = Expression();
 }
 
 HighlightCell * ExpressionsListController::reusableCell(int index, int type) {
@@ -43,24 +48,34 @@ KDCoordinate ExpressionsListController::rowHeight(int j) {
 }
 
 void ExpressionsListController::willDisplayCellForIndex(HighlightCell * cell, int index) {
+  /* Note : To further optimize memoization space in the pool, layout
+   * serialization could be memoized instead, and layout would be recomputed
+   * here, when setting cell's layout. */
   ExpressionTableCellWithPointer * myCell = static_cast<ExpressionTableCellWithPointer *>(cell);
   myCell->setLayout(layoutAtIndex(index));
   myCell->setAccessoryMessage(messageAtIndex(index));
   myCell->reloadScroll();
 }
 
+int ExpressionsListController::numberOfRows() const {
+  int nbOfRows = 0;
+  for (size_t i = 0; i < k_maxNumberOfRows; i++) {
+    if (!m_layouts[i].isUninitialized()) {
+      nbOfRows++;
+    }
+  }
+  return nbOfRows;
+}
+
 void ExpressionsListController::setExpression(Poincare::Expression e) {
   // Reinitialize memoization
-  for (int i = 0; i < k_maxNumberOfCells; i++) {
+  for (int i = 0; i < k_maxNumberOfRows; i++) {
     m_layouts[i] = Layout();
   }
   m_expression = e;
 }
 
 Poincare::Layout ExpressionsListController::layoutAtIndex(int index) {
-  if (m_layouts[index].isUninitialized()) {
-    computeLayoutAtIndex(index);
-  }
   assert(!m_layouts[index].isUninitialized());
   return m_layouts[index];
 }

apps/calculation/additional_outputs/expressions_list_controller.h

@@ -22,22 +22,22 @@ public:
   KDCoordinate rowHeight(int j) override;
   int typeAtLocation(int i, int j) override { return 0; }
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
+  int numberOfRows() const override;
 
   // IllustratedListController
   void setExpression(Poincare::Expression e) override;
 
 protected:
-  constexpr static int k_maxNumberOfCells = 4;
+  constexpr static int k_maxNumberOfRows = 5;
   int textAtIndex(char * buffer, size_t bufferSize, int index) override;
   Poincare::Expression m_expression;
   // Memoization of layouts
-  mutable Poincare::Layout m_layouts[k_maxNumberOfCells];
+  mutable Poincare::Layout m_layouts[k_maxNumberOfRows];
 private:
   Poincare::Layout layoutAtIndex(int index);
-  virtual void computeLayoutAtIndex(int index) = 0;
   virtual I18n::Message messageAtIndex(int index) = 0;
   // Cells
-  ExpressionTableCellWithPointer m_cells[k_maxNumberOfCells];
+  ExpressionTableCellWithPointer m_cells[k_maxNumberOfRows];
 };
 
 }

apps/calculation/additional_outputs/illustrated_list_controller.cpp

@@ -11,6 +11,7 @@ namespace Calculation {
 
 IllustratedListController::IllustratedListController(EditExpressionController * editExpressionController) :
   ListController(editExpressionController, this),
+  m_calculationStore(m_calculationStoreBuffer, k_calculationStoreBufferSize),
   m_additionalCalculationCells{}
 {
   for (int i = 0; i < k_maxNumberOfAdditionalCalculations; i++) {
@@ -80,16 +81,7 @@ KDCoordinate IllustratedListController::rowHeight(int j) {
   }
   Shared::ExpiringPointer<Calculation> calculation = m_calculationStore.calculationAtIndex(calculationIndex);
   constexpr bool expanded = true;
-  KDCoordinate result = calculation->memoizedHeight(expanded);
-  if (result < 0) {
-    result = ScrollableThreeExpressionsCell::Height(calculation.pointer());
-    if (result < 0) {
-      // Raise, because Height modified the calculation and failed.
-      Poincare::ExceptionCheckpoint::Raise();
-    }
-    calculation->setMemoizedHeight(expanded, result);
-  }
-  return result + Metric::CellSeparatorThickness;
+  return calculation->height(expanded) + Metric::CellSeparatorThickness;
 }
 
 int IllustratedListController::typeAtLocation(int i, int j) {
@@ -98,7 +90,6 @@ int IllustratedListController::typeAtLocation(int i, int j) {
 
 void IllustratedListController::willDisplayCellForIndex(HighlightCell * cell, int index) {
   if (index == 0) {
-    // TODO ?
     return;
   }
   Poincare::Context * context = App::app()->localContext();
@@ -106,7 +97,6 @@ void IllustratedListController::willDisplayCellForIndex(HighlightCell * cell, in
   Calculation * c = m_calculationStore.calculationAtIndex(index-1).pointer();
   myCell->setCalculation(c);
   myCell->setDisplayCenter(c->displayOutput(context) != Calculation::DisplayOutput::ApproximateOnly);
-  //myCell->setHighlighted(myCell->isHighlighted()); //TODO??
 }
 
 void IllustratedListController::tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY, bool withinTemporarySelection) {

apps/calculation/additional_outputs/illustrated_list_controller.h

@@ -10,8 +10,6 @@
 namespace Calculation {
 
 class IllustratedListController : public ListController, public SelectableTableViewDelegate {
-/* TODO There is factorizable code between this and
- * Calculation::HistoryController (at least rowHeight). */
 public:
   IllustratedListController(EditExpressionController * editExpressionController);
 
@@ -35,12 +33,16 @@ public:
 
   constexpr static KDCoordinate k_illustrationHeight = 120;
 protected:
+  static KDCoordinate CalculationHeight(Calculation * c, bool expanded) { return ScrollableThreeExpressionsCell::Height(c); }
   Poincare::Expression m_savedExpression;
   CalculationStore m_calculationStore;
 private:
   int textAtIndex(char * buffer, size_t bufferSize, int index) override;
   virtual CodePoint expressionSymbol() const = 0;
+  // Set the size of the buffer needed to store the additional calculation
   constexpr static int k_maxNumberOfAdditionalCalculations = 4;
+  constexpr static int k_calculationStoreBufferSize = k_maxNumberOfAdditionalCalculations * (sizeof(Calculation) + Calculation::k_numberOfExpressions * Constant::MaxSerializedExpressionSize + sizeof(Calculation *));
+  char m_calculationStoreBuffer[k_calculationStoreBufferSize];
   // Cells
   virtual HighlightCell * illustrationCell() = 0;
   ScrollableThreeExpressionsCell m_additionalCalculationCells[k_maxNumberOfAdditionalCalculations];

apps/calculation/additional_outputs/integer_list_controller.cpp

@@ -11,10 +11,6 @@ using namespace Shared;
 
 namespace Calculation {
 
-int IntegerListController::numberOfRows() const {
-  return 3 + factorExpressionIsComputable();
-}
-
 Integer::Base baseAtIndex(int index) {
   switch (index) {
     case 0:
@@ -27,12 +23,20 @@ Integer::Base baseAtIndex(int index) {
   }
 }
 
-void IntegerListController::computeLayoutAtIndex(int index) {
-  assert(m_expression.type() == ExpressionNode::Type::BasedInteger);
-  // For index = k_indexOfFactorExpression, the layout is assumed to be alreday memoized because it is needed to compute the numberOfRows
-  assert(index < k_indexOfFactorExpression);
-  Integer i = static_cast<BasedInteger &>(m_expression).integer();
-  m_layouts[index] = i.createLayout(baseAtIndex(index));
+void IntegerListController::setExpression(Poincare::Expression e) {
+  ExpressionsListController::setExpression(e);
+  static_assert(k_maxNumberOfRows >= k_indexOfFactorExpression + 1, "k_maxNumberOfRows must be greater than k_indexOfFactorExpression");
+  assert(!m_expression.isUninitialized() && m_expression.type() == ExpressionNode::Type::BasedInteger);
+  Integer integer = static_cast<BasedInteger &>(m_expression).integer();
+  for (int index = 0; index < k_indexOfFactorExpression; ++index) {
+    m_layouts[index] = integer.createLayout(baseAtIndex(index));
+  }
+  // Computing factorExpression
+  Expression factor = Factor::Builder(m_expression.clone());
+  PoincareHelpers::Simplify(&factor, App::app()->localContext(), ExpressionNode::ReductionTarget::User);
+  if (!factor.isUndefined()) {
+    m_layouts[k_indexOfFactorExpression] = PoincareHelpers::CreateLayout(factor);
+  }
 }
 
 I18n::Message IntegerListController::messageAtIndex(int index) {
@@ -48,20 +52,4 @@ I18n::Message IntegerListController::messageAtIndex(int index) {
   }
 }
 
-bool IntegerListController::factorExpressionIsComputable() const {
-  if (!m_layouts[k_indexOfFactorExpression].isUninitialized()) {
-    // The factor expression is already memoized
-    return !m_layouts[k_indexOfFactorExpression].isEmpty();
-  }
-  Poincare::Context * context = App::app()->localContext();
-  Expression factor = Factor::Builder(m_expression.clone());
-  PoincareHelpers::Simplify(&factor, context, ExpressionNode::ReductionTarget::User);
-  if (!factor.isUndefined()) {
-    m_layouts[k_indexOfFactorExpression] = PoincareHelpers::CreateLayout(factor);
-    return true;
-  }
-  m_layouts[k_indexOfFactorExpression] = EmptyLayout::Builder();
-  return false;
-}
-
 }

apps/calculation/additional_outputs/integer_list_controller.h

@@ -10,13 +10,11 @@ public:
   IntegerListController(EditExpressionController * editExpressionController) :
     ExpressionsListController(editExpressionController) {}
 
-  //ListViewDataSource
-  int numberOfRows() const override;
+  void setExpression(Poincare::Expression e) override;
+
 private:
   static constexpr int k_indexOfFactorExpression = 3;
-  void computeLayoutAtIndex(int index) override;
   I18n::Message messageAtIndex(int index) override;
-  bool factorExpressionIsComputable() const;
 };
 
 }

apps/calculation/additional_outputs/matrix_list_controller.cpp

@@ -0,0 +1,106 @@
+#include "matrix_list_controller.h"
+#include "../app.h"
+#include "../../shared/poincare_helpers.h"
+#include <apps/global_preferences.h>
+#include <poincare_nodes.h>
+#include <poincare/matrix.h>
+#include <string.h>
+
+using namespace Poincare;
+using namespace Shared;
+
+namespace Calculation {
+
+void MatrixListController::setExpression(Poincare::Expression e) {
+  ExpressionsListController::setExpression(e);
+  assert(!m_expression.isUninitialized());
+  static_assert(k_maxNumberOfRows >= k_maxNumberOfOutputRows, "k_maxNumberOfRows must be greater than k_maxNumberOfOutputRows");
+
+  Poincare::Preferences * preferences = Poincare::Preferences::sharedPreferences();
+  Poincare::Preferences::ComplexFormat currentComplexFormat = preferences->complexFormat();
+  if (currentComplexFormat == Poincare::Preferences::ComplexFormat::Real) {
+    /* Temporary change complex format to avoid all additional expressions to be
+     * "unreal" (with [i] for instance). As additional results are computed from
+     * the output, which is built taking ComplexFormat into account, there are
+     * no risks of displaying additional results on an unreal output. */
+    preferences->setComplexFormat(Poincare::Preferences::ComplexFormat::Cartesian);
+  }
+
+  Context * context = App::app()->localContext();
+  ExpressionNode::ReductionContext reductionContext(
+    context,
+    preferences->complexFormat(),
+    preferences->angleUnit(),
+    GlobalPreferences::sharedGlobalPreferences()->unitFormat(),
+    ExpressionNode::ReductionTarget::SystemForApproximation,
+    ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined);
+
+  // The expression must be reduced to call methods such as determinant or trace
+  assert(m_expression.type() == ExpressionNode::Type::Matrix);
+
+  bool mIsSquared = (static_cast<Matrix &>(m_expression).numberOfRows() == static_cast<Matrix &>(m_expression).numberOfColumns());
+  size_t index = 0;
+  size_t messageIndex = 0;
+  // 1. Matrix determinant if square matrix
+  if (mIsSquared) {
+    /* Determinant is reduced so that a null determinant can be detected.
+     * However, some exceptions remain such as cos(x)^2+sin(x)^2-1 which will
+     * not be reduced to a rational, but will be null in theory. */
+    Expression determinant = Determinant::Builder(m_expression.clone()).reduce(reductionContext);
+    m_indexMessageMap[index] = messageIndex++;
+    m_layouts[index++] = getLayoutFromExpression(determinant, context, preferences);
+    // 2. Matrix inverse if invertible matrix
+    // A squared matrix is invertible if and only if determinant is non null
+    if (!determinant.isUndefined() && determinant.nullStatus(context) != ExpressionNode::NullStatus::Null) {
+      // TODO: Handle ExpressionNode::NullStatus::Unknown
+      m_indexMessageMap[index] = messageIndex++;
+      m_layouts[index++] = getLayoutFromExpression(MatrixInverse::Builder(m_expression.clone()), context, preferences);
+    }
+  }
+  // 3. Matrix row echelon form
+  messageIndex = 2;
+  Expression rowEchelonForm = MatrixRowEchelonForm::Builder(m_expression.clone());
+  m_indexMessageMap[index] = messageIndex++;
+  m_layouts[index++] = getLayoutFromExpression(rowEchelonForm, context, preferences);
+  /* 4. Matrix reduced row echelon form
+   *    it can be computed from row echelon form to save computation time.*/
+  m_indexMessageMap[index] = messageIndex++;
+  m_layouts[index++] = getLayoutFromExpression(MatrixReducedRowEchelonForm::Builder(rowEchelonForm), context, preferences);
+  // 5. Matrix trace if square matrix
+  if (mIsSquared) {
+    m_indexMessageMap[index] = messageIndex++;
+    m_layouts[index++] = getLayoutFromExpression(MatrixTrace::Builder(m_expression.clone()), context, preferences);
+  }
+  // Reset complex format as before
+  preferences->setComplexFormat(currentComplexFormat);
+}
+
+Poincare::Layout MatrixListController::getLayoutFromExpression(Expression e, Context * context, Poincare::Preferences * preferences) {
+  assert(!e.isUninitialized());
+  // Simplify or approximate expression
+  Expression approximateExpression;
+  Expression simplifiedExpression;
+  e.simplifyAndApproximate(&simplifiedExpression, &approximateExpression, context,
+    preferences->complexFormat(), preferences->angleUnit(), GlobalPreferences::sharedGlobalPreferences()->unitFormat(),
+    ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined);
+  // simplify might have been interrupted, in which case we use approximate
+  if (simplifiedExpression.isUninitialized()) {
+    assert(!approximateExpression.isUninitialized());
+    return Shared::PoincareHelpers::CreateLayout(approximateExpression);
+  }
+  return Shared::PoincareHelpers::CreateLayout(simplifiedExpression);
+}
+
+I18n::Message MatrixListController::messageAtIndex(int index) {
+  // Message index is mapped in setExpression because it depends on the Matrix.
+  assert(index < k_maxNumberOfOutputRows && index >=0);
+  I18n::Message messages[k_maxNumberOfOutputRows] = {
+    I18n::Message::AdditionalDeterminant,
+    I18n::Message::AdditionalInverse,
+    I18n::Message::AdditionalRowEchelonForm,
+    I18n::Message::AdditionalReducedRowEchelonForm,
+    I18n::Message::AdditionalTrace};
+  return messages[m_indexMessageMap[index]];
+}
+
+}

apps/calculation/additional_outputs/matrix_list_controller.h

@@ -0,0 +1,27 @@
+#ifndef CALCULATION_ADDITIONAL_OUTPUTS_MATRIX_LIST_CONTROLLER_H
+#define CALCULATION_ADDITIONAL_OUTPUTS_MATRIX_LIST_CONTROLLER_H
+
+#include "expressions_list_controller.h"
+
+namespace Calculation {
+
+class MatrixListController : public ExpressionsListController {
+public:
+  MatrixListController(EditExpressionController * editExpressionController) :
+    ExpressionsListController(editExpressionController) {}
+
+  void setExpression(Poincare::Expression e) override;
+
+private:
+  I18n::Message messageAtIndex(int index) override;
+  Poincare::Layout getLayoutFromExpression(Poincare::Expression e, Poincare::Context * context, Poincare::Preferences * preferences);
+  // Map from cell index to message index
+  constexpr static int k_maxNumberOfOutputRows = 5;
+  int m_indexMessageMap[k_maxNumberOfOutputRows];
+};
+
+}
+
+#endif
+
+

apps/calculation/additional_outputs/rational_list_controller.cpp

@@ -9,34 +9,31 @@ using namespace Shared;
 
 namespace Calculation {
 
-int RationalListController::numberOfRows() const {
-  return 2;
-}
-
 Integer extractInteger(const Expression e) {
   assert(e.type() == ExpressionNode::Type::BasedInteger);
   return static_cast<const BasedInteger &>(e).integer();
 }
 
-void RationalListController::computeLayoutAtIndex(int index) {
+void RationalListController::setExpression(Poincare::Expression e) {
+  ExpressionsListController::setExpression(e);
+  assert(!m_expression.isUninitialized());
+  static_assert(k_maxNumberOfRows >= 2, "k_maxNumberOfRows must be greater than 2");
+
   bool negative = false;
   Expression div = m_expression;
   if (m_expression.type() == ExpressionNode::Type::Opposite) {
     negative = true;
     div = m_expression.childAtIndex(0);
   }
+
   assert(div.type() == ExpressionNode::Type::Division);
   Integer numerator = extractInteger(div.childAtIndex(0));
   numerator.setNegative(negative);
   Integer denominator = extractInteger(div.childAtIndex(1));
-  Expression e;
-  if (index == 0) {
-    e = Integer::CreateMixedFraction(numerator, denominator);
-  } else {
-    assert(index == 1);
-    e = Integer::CreateEuclideanDivision(numerator, denominator);
-  }
-  m_layouts[index] = PoincareHelpers::CreateLayout(e);
+
+  int index = 0;
+  m_layouts[index++] = PoincareHelpers::CreateLayout(Integer::CreateMixedFraction(numerator, denominator));
+  m_layouts[index++] = PoincareHelpers::CreateLayout(Integer::CreateEuclideanDivision(numerator, denominator));
 }
 
 I18n::Message RationalListController::messageAtIndex(int index) {

apps/calculation/additional_outputs/rational_list_controller.h

@@ -10,10 +10,9 @@ public:
   RationalListController(EditExpressionController * editExpressionController) :
     ExpressionsListController(editExpressionController) {}
 
-  //ListViewDataSource
-  int numberOfRows() const override;
+  void setExpression(Poincare::Expression e) override;
+
 private:
-  void computeLayoutAtIndex(int index) override;
   I18n::Message messageAtIndex(int index) override;
   int textAtIndex(char * buffer, size_t bufferSize, int index) override;
 };

apps/calculation/additional_outputs/scrollable_three_expressions_cell.cpp

@@ -8,8 +8,8 @@ void ScrollableThreeExpressionsView::resetMemoization() {
   setLayouts(Poincare::Layout(), Poincare::Layout(), Poincare::Layout());
 }
 
-void ScrollableThreeExpressionsView::setCalculation(Calculation * calculation, bool * didForceOutput) {
-  assert(!didForceOutput || *didForceOutput == false);
+// TODO: factorize with HistoryViewCell!
+void ScrollableThreeExpressionsView::setCalculation(Calculation * calculation, bool canChangeDisplayOutput) {
   Poincare::Context * context = App::app()->localContext();
 
   // Clean the layouts to make room in the pool
@@ -24,13 +24,10 @@ void ScrollableThreeExpressionsView::setCalculation(Calculation * calculation, b
     bool couldNotCreateExactLayout = false;
     exactOutputLayout = calculation->createExactOutputLayout(&couldNotCreateExactLayout);
     if (couldNotCreateExactLayout) {
-      if (calculation->displayOutput(context) == ::Calculation::Calculation::DisplayOutput::ExactOnly) {
-        Poincare::ExceptionCheckpoint::Raise();
-      } else {
+      if (canChangeDisplayOutput && calculation->displayOutput(context) != ::Calculation::Calculation::DisplayOutput::ExactOnly) {
         calculation->forceDisplayOutput(::Calculation::Calculation::DisplayOutput::ApproximateOnly);
-        if (didForceOutput) {
-          *didForceOutput = true;
-        }
+      } else {
+        Poincare::ExceptionCheckpoint::Raise();
       }
     }
   }
@@ -44,21 +41,18 @@ void ScrollableThreeExpressionsView::setCalculation(Calculation * calculation, b
     bool couldNotCreateApproximateLayout = false;
     approximateOutputLayout = calculation->createApproximateOutputLayout(context, &couldNotCreateApproximateLayout);
     if (couldNotCreateApproximateLayout) {
-      if (calculation->displayOutput(context) == ::Calculation::Calculation::DisplayOutput::ApproximateOnly) {
-        Poincare::ExceptionCheckpoint::Raise();
-      } else {
+      if (canChangeDisplayOutput && calculation->displayOutput(context) != ::Calculation::Calculation::DisplayOutput::ApproximateOnly) {
         /* Set the display output to ApproximateOnly, make room in the pool by
          * erasing the exact layout, and retry to create the approximate layout */
         calculation->forceDisplayOutput(::Calculation::Calculation::DisplayOutput::ApproximateOnly);
-        if (didForceOutput) {
-          *didForceOutput = true;
-        }
         exactOutputLayout = Poincare::Layout();
         couldNotCreateApproximateLayout = false;
         approximateOutputLayout = calculation->createApproximateOutputLayout(context, &couldNotCreateApproximateLayout);
         if (couldNotCreateApproximateLayout) {
           Poincare::ExceptionCheckpoint::Raise();
         }
+      } else {
+        Poincare::ExceptionCheckpoint::Raise();
       }
     }
 
@@ -74,16 +68,7 @@ void ScrollableThreeExpressionsView::setCalculation(Calculation * calculation, b
 
 KDCoordinate ScrollableThreeExpressionsCell::Height(Calculation * calculation) {
   ScrollableThreeExpressionsCell cell;
-  bool didForceOutput = false;
-  cell.setCalculation(calculation, &didForceOutput);
-  if (didForceOutput) {
-    /* We could not compute the height of the calculation as it is (the display
-     * output was forced to another value during the height computation).
-     * Warning: the display output of calculation was actually changed, so it
-     * will cause problems if we already did some computations with another
-     * display value. */
-    return -1;
-  }
+  cell.setCalculation(calculation, true);
   KDRect leftFrame = KDRectZero;
   KDRect centerFrame = KDRectZero;
   KDRect approximateSignFrame = KDRectZero;
@@ -103,8 +88,8 @@ void ScrollableThreeExpressionsCell::reinitSelection() {
   m_view.reloadScroll();
 }
 
-void ScrollableThreeExpressionsCell::setCalculation(Calculation * calculation, bool * didForceOutput) {
-  m_view.setCalculation(calculation, didForceOutput);
+void ScrollableThreeExpressionsCell::setCalculation(Calculation * calculation, bool canChangeDisplayOutput) {
+  m_view.setCalculation(calculation, canChangeDisplayOutput);
   layoutSubviews();
 }
 

apps/calculation/additional_outputs/scrollable_three_expressions_cell.h

@@ -20,7 +20,7 @@ public:
     setBackgroundColor(Palette::BackgroundApps);
   }
   void resetMemoization();
-  void setCalculation(Calculation * calculation, bool * didForceOutput = nullptr);
+  void setCalculation(Calculation * calculation, bool canChangeDisplayOutput);
   void subviewFrames(KDRect * leftFrame, KDRect * centerFrame, KDRect * approximateSignFrame, KDRect * rightFrame) {
     return m_contentCell.subviewFrames(leftFrame, centerFrame, approximateSignFrame, rightFrame);
   }
@@ -61,7 +61,7 @@ public:
 
   void setHighlighted(bool highlight) override { m_view.evenOddCell()->setHighlighted(highlight); }
   void resetMemoization() { m_view.resetMemoization(); }
-  void setCalculation(Calculation * calculation, bool * didForceOutput = nullptr);
+  void setCalculation(Calculation * calculation, bool canChangeDisplayOutput = false);
   void setDisplayCenter(bool display);
   ScrollableThreeExpressionsView::SubviewPosition selectedSubviewPosition() { return m_view.selectedSubviewPosition(); }
   void setSelectedSubviewPosition(ScrollableThreeExpressionsView::SubviewPosition subviewPosition) { m_view.setSelectedSubviewPosition(subviewPosition); }

apps/calculation/additional_outputs/trigonometry_list_controller.cpp

@@ -11,9 +11,9 @@ void TrigonometryListController::setExpression(Poincare::Expression e) {
 
   // Fill calculation store
   Poincare::Context * context = App::app()->localContext();
-  m_calculationStore.push("sin(θ)", context);
-  m_calculationStore.push("cos(θ)", context);
-  m_calculationStore.push("θ", context);
+  m_calculationStore.push("sin(θ)", context, CalculationHeight);
+  m_calculationStore.push("cos(θ)", context, CalculationHeight);
+  m_calculationStore.push("θ", context, CalculationHeight);
 
   // Set trigonometry illustration
   float angle = Shared::PoincareHelpers::ApproximateToScalar<float>(m_calculationStore.calculationAtIndex(0)->approximateOutput(context, Calculation::NumberOfSignificantDigits::Maximal), context);

apps/calculation/additional_outputs/unit_list_controller.cpp

@@ -15,112 +15,62 @@ namespace Calculation {
 void UnitListController::setExpression(Poincare::Expression e) {
   ExpressionsListController::setExpression(e);
   assert(!m_expression.isUninitialized());
-  // Reinitialize m_memoizedExpressions
-  for (size_t i = 0; i < k_maxNumberOfCells; i++) {
-    m_memoizedExpressions[i] = Expression();
+  static_assert(k_maxNumberOfRows >= 3, "k_maxNumberOfRows must be greater than 3");
+
+  Poincare::Expression expressions[k_maxNumberOfRows];
+  // Initialize expressions
+  for (size_t i = 0; i < k_maxNumberOfRows; i++) {
+    expressions[i] = Expression();
   }
 
-  size_t numberOfMemoizedExpressions = 0;
-  // 1. First rows: miscellaneous classic units for some dimensions
+  /* 1. First rows: miscellaneous classic units for some dimensions, in both
+   * metric and imperial units. */
   Expression copy = m_expression.clone();
   Expression units;
   // Reduce to be able to recognize units
-  PoincareHelpers::Reduce(&copy, App::app()->localContext(), ExpressionNode::ReductionTarget::User);
-  copy = copy.removeUnit(&units);
-  bool requireSimplification = false;
-  bool canChangeUnitPrefix = false;
+  PoincareHelpers::ReduceAndRemoveUnit(&copy, App::app()->localContext(), ExpressionNode::ReductionTarget::User, &units);
+  double value = Shared::PoincareHelpers::ApproximateToScalar<double>(copy, App::app()->localContext());
+  ExpressionNode::ReductionContext reductionContext(
+      App::app()->localContext(),
+      Preferences::sharedPreferences()->complexFormat(),
+      Preferences::sharedPreferences()->angleUnit(),
+      GlobalPreferences::sharedGlobalPreferences()->unitFormat(),
+      ExpressionNode::ReductionTarget::User,
+      ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined);
+  int numberOfExpressions = Unit::SetAdditionalExpressions(units, value, expressions, k_maxNumberOfRows, reductionContext);
 
-  if (Unit::IsSISpeed(units)) {
-    // 1.a. Turn speed into km/h
-    m_memoizedExpressions[numberOfMemoizedExpressions++] = UnitConvert::Builder(
-        m_expression.clone(),
-        Multiplication::Builder(
-          Unit::Kilometer(),
-          Power::Builder(
-            Unit::Hour(),
-            Rational::Builder(-1)
-            )
-          )
-        );
-    requireSimplification = true; // Simplify the conversion
-  } else if (Unit::IsSIVolume(units)) {
-    // 1.b. Turn volume into L
-    m_memoizedExpressions[numberOfMemoizedExpressions++] = UnitConvert::Builder(
-        m_expression.clone(),
-        Unit::Liter()
-        );
-    requireSimplification = true; // Simplify the conversion
-    canChangeUnitPrefix = true; // Pick best prefix (mL)
-  } else if (Unit::IsSIEnergy(units)) {
-    // 1.c. Turn energy into Wh
-    m_memoizedExpressions[numberOfMemoizedExpressions++] = UnitConvert::Builder(
-        m_expression.clone(),
-        Multiplication::Builder(
-          Unit::Watt(),
-          Unit::Hour()
-          )
-        );
-    m_memoizedExpressions[numberOfMemoizedExpressions++] = UnitConvert::Builder(
-        m_expression.clone(),
-        Unit::ElectronVolt()
-        );
-    requireSimplification = true; // Simplify the conversion
-    canChangeUnitPrefix = true; // Pick best prefix (kWh)
-  } else if (Unit::IsSITime(units)) {
-    // Turn time into ? year + ? month + ? day + ? h + ? min + ? s
-    double value = Shared::PoincareHelpers::ApproximateToScalar<double>(copy, App::app()->localContext());
-    m_memoizedExpressions[numberOfMemoizedExpressions++] = Unit::BuildTimeSplit(value, App::app()->localContext(), Preferences::sharedPreferences()->complexFormat(), Preferences::sharedPreferences()->angleUnit());
-  }
-  // 1.d. Simplify and tune prefix of all computed expressions
-  size_t currentExpressionIndex = 0;
-  while (currentExpressionIndex < numberOfMemoizedExpressions) {
-    assert(!m_memoizedExpressions[currentExpressionIndex].isUninitialized());
-    if (requireSimplification) {
-      Shared::PoincareHelpers::Simplify(&m_memoizedExpressions[currentExpressionIndex], App::app()->localContext(), ExpressionNode::ReductionTarget::User);
-    }
-    if (canChangeUnitPrefix) {
-      Expression newUnits;
-      // Reduce to be able to removeUnit
-      PoincareHelpers::Reduce(&m_memoizedExpressions[currentExpressionIndex], App::app()->localContext(), ExpressionNode::ReductionTarget::User);
-      m_memoizedExpressions[currentExpressionIndex] = m_memoizedExpressions[currentExpressionIndex].removeUnit(&newUnits);
-      double value = Shared::PoincareHelpers::ApproximateToScalar<double>(m_memoizedExpressions[currentExpressionIndex], App::app()->localContext());
-      ExpressionNode::ReductionContext reductionContext(
-          App::app()->localContext(),
-          Preferences::sharedPreferences()->complexFormat(),
-          Preferences::sharedPreferences()->angleUnit(),
-          ExpressionNode::ReductionTarget::User,
-          ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined);
-      Unit::ChooseBestPrefixForValue(&newUnits, &value, reductionContext);
-      m_memoizedExpressions[currentExpressionIndex] = Multiplication::Builder(Number::FloatNumber(value), newUnits);
-    }
-    currentExpressionIndex++;
-  }
+  // 2. SI units only
+  assert(numberOfExpressions < k_maxNumberOfRows - 1);
+  expressions[numberOfExpressions] = m_expression.clone();
+  Shared::PoincareHelpers::Simplify(&expressions[numberOfExpressions], App::app()->localContext(), ExpressionNode::ReductionTarget::User, Poincare::ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition, Poincare::ExpressionNode::UnitConversion::InternationalSystem);
+  numberOfExpressions++;
 
-  // 2. IS units only
-  assert(numberOfMemoizedExpressions < k_maxNumberOfCells - 1);
-  m_memoizedExpressions[numberOfMemoizedExpressions] = m_expression.clone();
-  Shared::PoincareHelpers::Simplify(&m_memoizedExpressions[numberOfMemoizedExpressions], App::app()->localContext(), ExpressionNode::ReductionTarget::User, Poincare::ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition, Poincare::ExpressionNode::UnitConversion::InternationalSystem);
-  numberOfMemoizedExpressions++;
-
-  // 3. Get rid of duplicates
+  /* 3. Get rid of duplicates
+   * We find duplicates by comparing the serializations, to eliminate
+   * expressions that only differ by the types of their number nodes. */
   Expression reduceExpression = m_expression.clone();
-  // Make m_expression compareable to m_memoizedExpressions (turn BasedInteger into Rational for instance)
+  // Make m_expression comparable to expressions (turn BasedInteger into Rational for instance)
   Shared::PoincareHelpers::Simplify(&reduceExpression, App::app()->localContext(), ExpressionNode::ReductionTarget::User, Poincare::ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition, Poincare::ExpressionNode::UnitConversion::None);
-  currentExpressionIndex = 1;
-  while (currentExpressionIndex < numberOfMemoizedExpressions) {
+  int currentExpressionIndex = 0;
+  while (currentExpressionIndex < numberOfExpressions) {
     bool duplicateFound = false;
-    for (size_t i = 0; i < currentExpressionIndex + 1; i++) {
-      // Compare the currentExpression to all previous memoized expressions and to m_expression
-      Expression comparedExpression = i == currentExpressionIndex ? reduceExpression : m_memoizedExpressions[i];
+    constexpr int buffersSize = Constant::MaxSerializedExpressionSize;
+    char buffer1[buffersSize];
+    int size1 = PoincareHelpers::Serialize(expressions[currentExpressionIndex], buffer1, buffersSize);
+    for (int i = 0; i < currentExpressionIndex + 1; i++) {
+      // Compare the currentExpression to all previous expressions and to m_expression
+      Expression comparedExpression = i == currentExpressionIndex ? reduceExpression : expressions[i];
       assert(!comparedExpression.isUninitialized());
-      if (comparedExpression.isIdenticalTo(m_memoizedExpressions[currentExpressionIndex])) {
-        numberOfMemoizedExpressions--;
+      char buffer2[buffersSize];
+      int size2 = PoincareHelpers::Serialize(comparedExpression, buffer2, buffersSize);
+      if (size1 == size2 && strcmp(buffer1, buffer2) == 0) {
+        numberOfExpressions--;
         // Shift next expressions
-        for (size_t j = currentExpressionIndex; j < numberOfMemoizedExpressions; j++) {
-          m_memoizedExpressions[j] = m_memoizedExpressions[j+1];
+        for (int j = currentExpressionIndex; j < numberOfExpressions; j++) {
+          expressions[j] = expressions[j+1];
         }
         // Remove last expression
-        m_memoizedExpressions[numberOfMemoizedExpressions] = Expression();
+        expressions[numberOfExpressions] = Expression();
         // The current expression has been discarded, no need to increment the current index
         duplicateFound = true;
         break;
@@ -131,21 +81,12 @@ void UnitListController::setExpression(Poincare::Expression e) {
       currentExpressionIndex++;
     }
   }
-}
-
-int UnitListController::numberOfRows() const {
-  int nbOfRows = 0;
-  for (size_t i = 0; i < k_maxNumberOfCells; i++) {
-    if (!m_memoizedExpressions[i].isUninitialized()) {
-      nbOfRows++;
+  // Memoize layouts
+  for (size_t i = 0; i < k_maxNumberOfRows; i++) {
+    if (!expressions[i].isUninitialized()) {
+      m_layouts[i] = Shared::PoincareHelpers::CreateLayout(expressions[i]);
     }
   }
-  return nbOfRows;
-}
-
-void UnitListController::computeLayoutAtIndex(int index) {
-  assert(!m_memoizedExpressions[index].isUninitialized());
-  m_layouts[index] = Shared::PoincareHelpers::CreateLayout(m_memoizedExpressions[index]);
 }
 
 I18n::Message UnitListController::messageAtIndex(int index) {

apps/calculation/additional_outputs/unit_list_controller.h

@@ -12,13 +12,8 @@ public:
 
   void setExpression(Poincare::Expression e) override;
 
-  //ListViewDataSource
-  int numberOfRows() const override;
 private:
-  void computeLayoutAtIndex(int index) override;
   I18n::Message messageAtIndex(int index) override;
-  // Memoization of expressions
-  mutable Poincare::Expression m_memoizedExpressions[k_maxNumberOfCells];
 };
 
 }

apps/calculation/app.cpp

@@ -31,6 +31,8 @@ App * App::Snapshot::unpack(Container * container) {
 
 void App::Snapshot::reset() {
   m_calculationStore.deleteAll();
+  m_cacheBuffer[0] = 0;
+  m_cacheBufferInformation = 0;
 }
 
 App::Descriptor * App::Snapshot::descriptor() {
@@ -38,14 +40,14 @@ App::Descriptor * App::Snapshot::descriptor() {
   return &descriptor;
 }
 
-void App::Snapshot::tidy() {
-  m_calculationStore.tidy();
+App::Snapshot::Snapshot() : m_calculationStore(m_calculationBuffer, k_calculationBufferSize)
+{
 }
 
 App::App(Snapshot * snapshot) :
   ExpressionFieldDelegateApp(snapshot, &m_editExpressionController),
   m_historyController(&m_editExpressionController, snapshot->calculationStore()),
-  m_editExpressionController(&m_modalViewController, this, &m_historyController, snapshot->calculationStore())
+  m_editExpressionController(&m_modalViewController, this, snapshot->cacheBuffer(), snapshot->cacheBufferInformationAddress(), &m_historyController, snapshot->calculationStore())
 {
 }
 
@@ -70,7 +72,17 @@ bool App::isAcceptableExpression(const Poincare::Expression expression) {
       return false;
     }
   }
-  return !expression.isUninitialized();
+  return !(expression.isUninitialized() || expression.type() == ExpressionNode::Type::Equal);
+}
+
+void App::didBecomeActive(Window * window) {
+  m_editExpressionController.restoreInput();
+  Shared::ExpressionFieldDelegateApp::didBecomeActive(window);
+}
+
+void App::willBecomeInactive() {
+  m_editExpressionController.memoizeInput();
+  Shared::ExpressionFieldDelegateApp::willBecomeInactive();
 }
 
 }

apps/calculation/app.h

@@ -6,6 +6,7 @@
 #include "history_controller.h"
 #include "../shared/text_field_delegate_app.h"
 #include <escher.h>
+#include "../shared/shared_app.h"
 
 namespace Calculation {
 
@@ -18,15 +19,22 @@ public:
     App::Descriptor::ExaminationLevel examinationLevel() override;
     const Image * icon() override;
   };
-  class Snapshot : public ::App::Snapshot {
+  class Snapshot : public ::SharedApp::Snapshot {
   public:
+    Snapshot();
     App * unpack(Container * container) override;
     void reset() override;
     Descriptor * descriptor() override;
     CalculationStore * calculationStore() { return &m_calculationStore; }
+    char * cacheBuffer() { return m_cacheBuffer; }
+    size_t * cacheBufferInformationAddress() { return &m_cacheBufferInformation; }
   private:
-    void tidy() override;
     CalculationStore m_calculationStore;
+    // Set the size of the buffer needed to store the calculations
+    static constexpr int k_calculationBufferSize = 10 * (sizeof(Calculation) + Calculation::k_numberOfExpressions * Constant::MaxSerializedExpressionSize + sizeof(Calculation *));
+    char m_calculationBuffer[k_calculationBufferSize];
+    char m_cacheBuffer[EditExpressionController::k_cacheBufferSize];
+    size_t m_cacheBufferInformation;
   };
   static App * app() {
     return static_cast<App *>(Container::activeApp());
@@ -36,9 +44,12 @@ public:
   bool layoutFieldDidReceiveEvent(::LayoutField * layoutField, Ion::Events::Event event) override;
   // TextFieldDelegateApp
   bool isAcceptableExpression(const Poincare::Expression expression) override;
+
 private:
   App(Snapshot * snapshot);
   HistoryController m_historyController;
+  void didBecomeActive(Window * window) override;
+  void willBecomeInactive() override;
   EditExpressionController m_editExpressionController;
 };
 

apps/calculation/base.de.i18n

@@ -7,3 +7,8 @@ BinaryBase = "Binär"
 PrimeFactors = "Primfaktoren"
 MixedFraction = "Gemischte Zahl"
 EuclideanDivision = "Division mit Rest"
+AdditionalDeterminant = "Determinante"
+AdditionalInverse = "Inverse"
+AdditionalRowEchelonForm = "Stufenform"
+AdditionalReducedRowEchelonForm = "Reduzierte Stufenform"
+AdditionalTrace = "Spur"

apps/calculation/base.en.i18n

@@ -7,3 +7,8 @@ BinaryBase = "Binary"
 PrimeFactors = "Prime factors"
 MixedFraction = "Mixed fraction"
 EuclideanDivision = "Euclidean division"
+AdditionalDeterminant = "Determinant"
+AdditionalInverse = "Inverse"
+AdditionalRowEchelonForm = "Row echelon form"
+AdditionalReducedRowEchelonForm = "Reduced row echelon form"
+AdditionalTrace = "Trace"

apps/calculation/base.es.i18n

@@ -7,3 +7,8 @@ BinaryBase = "Binario"
 PrimeFactors = "Factores primos"
 MixedFraction = "Fracción mixta"
 EuclideanDivision = "División euclidiana"
+AdditionalDeterminant = "Determinante"
+AdditionalInverse = "Inversa"
+AdditionalRowEchelonForm = "Matriz escalonada"
+AdditionalReducedRowEchelonForm = "Matriz escalonada reducida"
+AdditionalTrace = "Traza"

apps/calculation/base.fr.i18n

@@ -7,3 +7,8 @@ BinaryBase = "Binaire"
 PrimeFactors = "Facteurs premiers"
 MixedFraction = "Fraction mixte"
 EuclideanDivision = "Division euclidienne"
+AdditionalDeterminant = "Déterminant"
+AdditionalInverse = "Inverse"
+AdditionalRowEchelonForm = "Forme échelonnée"
+AdditionalReducedRowEchelonForm = "Forme échelonnée réduite"
+AdditionalTrace = "Trace"

apps/calculation/base.hu.i18n

@@ -3,7 +3,12 @@ CalculAppCapital = "SZÁMOLÁS"
 AdditionalResults = "További eredmények"
 DecimalBase = "Decimális"
 HexadecimalBase = "Hexadecimális"
-BinaryBase = "Kétkomponensü"
+BinaryBase = "Bináris"
 PrimeFactors = "Alapvetö tényezök"
 MixedFraction = "Vegyes frakció"
 EuclideanDivision = "Euklideszi osztás"
+AdditionalDeterminant = "Meghatározó"
+AdditionalInverse = "inverz"
+AdditionalRowEchelonForm = "Sor echelon forma"
+AdditionalReducedRowEchelonForm = "Csökkentett sorú Echelon forma"
+AdditionalTrace = "Nyomkövetés"

apps/calculation/base.it.i18n

@@ -4,6 +4,11 @@ AdditionalResults = "Risultati complementari"
 DecimalBase = "Decimale"
 HexadecimalBase = "Esadecimale"
 BinaryBase = "Binario"
-PrimeFactors = "Fattori primi"
+PrimeFactors = "Fattorizzazione"
 MixedFraction = "Frazione mista"
 EuclideanDivision = "Divisione euclidea"
+AdditionalDeterminant = "Determinante"
+AdditionalInverse = "Inversa"
+AdditionalRowEchelonForm = "Matrice a scalini"
+AdditionalReducedRowEchelonForm = "Matrice ridotta a scalini"
+AdditionalTrace = "Traccia"

apps/calculation/base.nl.i18n

@@ -1,9 +1,14 @@
-CalculApp = "Calculatie"
-CalculAppCapital = "CALCULATIE"
-AdditionalResults = "Bijkomende resultaten"
+CalculApp = "Rekenen"
+CalculAppCapital = "REKENEN"
+AdditionalResults = "Aanvullende resultaten"
 DecimalBase = "Decimaal"
 HexadecimalBase = "Hexadecimaal"
-BinaryBase = "Binaire"
-PrimeFactors = "Priemfactoren"
+BinaryBase = "Binair"
+PrimeFactors = "Ontbinding"
 MixedFraction = "Gemengde breuk"
 EuclideanDivision = "Geheeltallige deling"
+AdditionalDeterminant = "Determinant"
+AdditionalInverse = "Inverse"
+AdditionalRowEchelonForm = "Echelonvorm"
+AdditionalReducedRowEchelonForm = "Gereduceerde echelonvorm"
+AdditionalTrace = "Spoor"

apps/calculation/base.pt.i18n

@@ -4,6 +4,11 @@ AdditionalResults = "Resultados adicionais"
 DecimalBase = "Decimal"
 HexadecimalBase = "Hexadecimal"
 BinaryBase = "Binário"
-PrimeFactors = "Fatores primos"
+PrimeFactors = "Fatorização"
 MixedFraction = "Fração mista"
 EuclideanDivision = "Divisão euclidiana"
+AdditionalDeterminant = "Determinante"
+AdditionalInverse = "Matriz inversa"
+AdditionalRowEchelonForm = "Matriz escalonada"
+AdditionalReducedRowEchelonForm = "Matriz escalonada reduzida"
+AdditionalTrace = "Traço"

apps/calculation/calculation.cpp

@@ -38,12 +38,6 @@ Calculation * Calculation::next() const {
   return reinterpret_cast<Calculation *>(const_cast<char *>(result));
 }
 
-void Calculation::tidy() {
-  /* Reset height memoization (the complex format could have changed when
-   * re-entering Calculation app which would impact the heights). */
-  resetHeightMemoization();
-}
-
 const char * Calculation::approximateOutputText(NumberOfSignificantDigits numberOfSignificantDigits) const {
   const char * exactOutput = exactOutputText();
   const char * approximateOutputTextWithMaxNumberOfDigits = exactOutput + strlen(exactOutput) + 1;
@@ -126,12 +120,15 @@ Layout Calculation::createApproximateOutputLayout(Context * context, bool * coul
   }
 }
 
-void Calculation::setMemoizedHeight(bool expanded, KDCoordinate height) {
-  if (expanded) {
-    m_expandedHeight = height;
-  } else {
-    m_height = height;
-  }
+KDCoordinate Calculation::height(bool expanded) {
+  KDCoordinate h = expanded ? m_expandedHeight : m_height;
+  assert(h >= 0);
+  return h;
+}
+
+void Calculation::setHeights(KDCoordinate height, KDCoordinate expandedHeight) {
+  m_height = height;
+  m_expandedHeight = expandedHeight;
 }
 
 Calculation::DisplayOutput Calculation::displayOutput(Context * context) {
@@ -172,7 +169,8 @@ Calculation::DisplayOutput Calculation::displayOutput(Context * context) {
             ExpressionNode::Type::Sum,
             ExpressionNode::Type::Derivative,
             ExpressionNode::Type::ConfidenceInterval,
-            ExpressionNode::Type::PredictionInterval
+            ExpressionNode::Type::PredictionInterval,
+            ExpressionNode::Type::Sequence
           };
           return e.isOfType(approximateOnlyTypes, sizeof(approximateOnlyTypes)/sizeof(ExpressionNode::Type));
         }, context)
@@ -190,9 +188,9 @@ Calculation::DisplayOutput Calculation::displayOutput(Context * context) {
 }
 
 void Calculation::forceDisplayOutput(DisplayOutput d) {
+  // Heights haven't been computed yet
+  assert(m_height == -1 && m_expandedHeight == -1);
   m_displayOutput = d;
-  // Reset heights memoization as it might have changed when we modify the display output
-  resetHeightMemoization();
 }
 
 bool Calculation::shouldOnlyDisplayExactOutput() {
@@ -219,8 +217,9 @@ Calculation::EqualSign Calculation::exactAndApproximateDisplayedOutputsAreEqual(
   Poincare::ExceptionCheckpoint ecp;
   if (ExceptionRun(ecp)) {
     Preferences * preferences = Preferences::sharedPreferences();
+    // TODO: complex format should not be needed here (as it is not used to create layouts)
     Preferences::ComplexFormat complexFormat = Expression::UpdatedComplexFormatWithTextInput(preferences->complexFormat(), m_inputText);
-    m_equalSign = Expression::ParsedExpressionsAreEqual(exactOutputText(), approximateOutputText(NumberOfSignificantDigits::UserDefined), context, complexFormat, preferences->angleUnit()) ? EqualSign::Equal : EqualSign::Approximation;
+    m_equalSign = Expression::ParsedExpressionsAreEqual(exactOutputText(), approximateOutputText(NumberOfSignificantDigits::UserDefined), context, complexFormat, preferences->angleUnit(), GlobalPreferences::sharedGlobalPreferences()->unitFormat()) ? EqualSign::Equal : EqualSign::Approximation;
     return m_equalSign;
   } else {
     /* Do not override m_equalSign in case there is enough room in the pool
@@ -256,25 +255,9 @@ Calculation::AdditionalInformationType Calculation::additionalInformationType(Co
   }
   if (o.hasUnit()) {
     Expression unit;
-    PoincareHelpers::Reduce(&o, App::app()->localContext(), ExpressionNode::ReductionTarget::User,ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined, ExpressionNode::UnitConversion::None);
-    o = o.removeUnit(&unit);
-    if (Unit::IsSI(unit)) {
-      if (Unit::IsSISpeed(unit) || Unit::IsSIVolume(unit) || Unit::IsSIEnergy(unit)) {
-        /* All these units will provide misc. classic representatives in
-         * addition to the SI unit in additional information. */
-        return AdditionalInformationType::Unit;
-      }
-      if (Unit::IsSITime(unit)) {
-        /* If the number of seconds is above 60s, we can write it in the form
-         * of an addition: 23_min + 12_s for instance. */
-        double value = Shared::PoincareHelpers::ApproximateToScalar<double>(o, App::app()->localContext());
-        if (value >  Unit::SecondsPerMinute) {
-          return AdditionalInformationType::Unit;
-        }
-      }
-      return AdditionalInformationType::None;
-    }
-    return AdditionalInformationType::Unit;
+    PoincareHelpers::ReduceAndRemoveUnit(&o, App::app()->localContext(), ExpressionNode::ReductionTarget::User, &unit, ExpressionNode::SymbolicComputation::ReplaceAllSymbolsWithDefinitionsOrUndefined, ExpressionNode::UnitConversion::None);
+    double value = PoincareHelpers::ApproximateToScalar<double>(o, App::app()->localContext());
+    return (Unit::ShouldDisplayAdditionalOutputs(value, unit, GlobalPreferences::sharedGlobalPreferences()->unitFormat())) ? AdditionalInformationType::Unit : AdditionalInformationType::None;
   }
   if (o.isBasedIntegerCappedBy(k_maximalIntegerWithAdditionalInformation)) {
     return AdditionalInformationType::Integer;
@@ -286,12 +269,10 @@ Calculation::AdditionalInformationType Calculation::additionalInformationType(Co
   if (o.hasDefinedComplexApproximation(context, complexFormat, preferences->angleUnit())) {
     return AdditionalInformationType::Complex;
   }
+  if (o.type() == ExpressionNode::Type::Matrix) {
+    return AdditionalInformationType::Matrix;
+  }
   return AdditionalInformationType::None;
 }
 
-void  Calculation::resetHeightMemoization() {
-  m_height = -1;
-  m_expandedHeight = -1;
-}
-
 }

apps/calculation/calculation.h

@@ -21,6 +21,7 @@ class CalculationStore;
 class Calculation {
 friend CalculationStore;
 public:
+  static constexpr int k_numberOfExpressions = 4;
   enum class EqualSign : uint8_t {
     Unknown,
     Approximation,
@@ -40,6 +41,7 @@ public:
     Rational,
     Trigonometry,
     Unit,
+    Matrix,
     Complex
   };
   static bool DisplaysExact(DisplayOutput d) { return d != DisplayOutput::ApproximateOnly; }
@@ -48,7 +50,7 @@ public:
    * calculations instead of clearing less space, then fail to serialize, clear
    * more space, fail to serialize, clear more space, etc., until reaching
    * sufficient free space. */
-  static int MinimalSize() { return sizeof(uint8_t) + 2*sizeof(KDCoordinate) + sizeof(uint8_t) + 3*Constant::MaxSerializedExpressionSize; }
+  static int MinimalSize() { return sizeof(uint8_t) + 2*sizeof(KDCoordinate) + sizeof(uint8_t) + 3*Constant::MaxSerializedExpressionSize + sizeof(Calculation *); }
 
   Calculation() :
     m_displayOutput(DisplayOutput::Unknown),
@@ -61,8 +63,6 @@ public:
   bool operator==(const Calculation& c);
   Calculation * next() const;
 
-  void tidy();
-
   // Texts
   enum class NumberOfSignificantDigits {
     Maximal,
@@ -83,9 +83,8 @@ public:
   Poincare::Layout createExactOutputLayout(bool * couldNotCreateExactLayout);
   Poincare::Layout createApproximateOutputLayout(Poincare::Context * context, bool * couldNotCreateApproximateLayout);
 
-  // Memoization of height
-  KDCoordinate memoizedHeight(bool expanded) { return expanded ? m_expandedHeight : m_height; }
-  void setMemoizedHeight(bool expanded, KDCoordinate height);
+  // Heights
+  KDCoordinate height(bool expanded);
 
   // Displayed output
   DisplayOutput displayOutput(Poincare::Context * context);
@@ -96,11 +95,11 @@ public:
   // Additional Information
   AdditionalInformationType additionalInformationType(Poincare::Context * context);
 private:
-  static constexpr int maxWidth = 314;
-  static constexpr int k_numberOfExpressions = 4;
   static constexpr KDCoordinate k_heightComputationFailureHeight = 50;
   static constexpr const char * k_maximalIntegerWithAdditionalInformation = "10000000000000000";
-  void resetHeightMemoization();
+
+  void setHeights(KDCoordinate height, KDCoordinate expandedHeight);
+
   /* Buffers holding text expressions have to be longer than the text written
    * by user (of maximum length TextField::maxBufferSize()) because when we
    * print an expression we add omitted signs (multiplications, parenthesis...) */

apps/calculation/calculation_store.cpp

@@ -12,58 +12,47 @@ using namespace Shared;
 
 namespace Calculation {
 
-CalculationStore::CalculationStore() :
-  m_bufferEnd(m_buffer),
-  m_numberOfCalculations(0),
-  m_slidedBuffer(false),
-  m_indexOfFirstMemoizedCalculationPointer(0)
+CalculationStore::CalculationStore(char * buffer, int size) :
+  m_buffer(buffer),
+  m_bufferSize(size),
+  m_calculationAreaEnd(m_buffer),
+  m_numberOfCalculations(0)
 {
-  resetMemoizedModelsAfterCalculationIndex(-1);
+  assert(m_buffer != nullptr);
+  assert(m_bufferSize > 0);
 }
 
+// Returns an expiring pointer to the calculation of index i
 ExpiringPointer<Calculation> CalculationStore::calculationAtIndex(int i) {
-  assert(!m_slidedBuffer);
   assert(i >= 0 && i < m_numberOfCalculations);
-  assert(m_indexOfFirstMemoizedCalculationPointer >= 0);
-  if (i >= m_indexOfFirstMemoizedCalculationPointer && i < m_indexOfFirstMemoizedCalculationPointer + k_numberOfMemoizedCalculationPointers) {
-    // The calculation is within the range of memoized calculations
-    Calculation * c = m_memoizedCalculationPointers[i-m_indexOfFirstMemoizedCalculationPointer];
-    if (c != nullptr) {
-      // The pointer was memoized
-      return ExpiringPointer<Calculation>(c);
-    }
-    c = bufferCalculationAtIndex(i);
-    m_memoizedCalculationPointers[i-m_indexOfFirstMemoizedCalculationPointer] = c;
-    return c;
+  // m_buffer is the adress of the oldest calculation in calculation store
+  Calculation * c = (Calculation *) m_buffer;
+  if (i != m_numberOfCalculations-1) {
+    // The calculation we want is not the oldest one so we get its pointer
+    c = *reinterpret_cast<Calculation**>(addressOfPointerToCalculationOfIndex(i+1));
   }
-  // Slide the memoization buffer
-  if (i >= m_indexOfFirstMemoizedCalculationPointer) {
-    // Slide the memoization buffer to the left
-    memmove(m_memoizedCalculationPointers, m_memoizedCalculationPointers+1, (k_numberOfMemoizedCalculationPointers - 1) * sizeof(Calculation *));
-    m_memoizedCalculationPointers[k_numberOfMemoizedCalculationPointers - 1] = nullptr;
-    m_indexOfFirstMemoizedCalculationPointer++;
-  } else {
-    // Slide the memoization buffer to the right
-    memmove(m_memoizedCalculationPointers+1, m_memoizedCalculationPointers, (k_numberOfMemoizedCalculationPointers - 1) * sizeof(Calculation *));
-    m_memoizedCalculationPointers[0] = nullptr;
-    m_indexOfFirstMemoizedCalculationPointer--;
-  }
-  return calculationAtIndex(i);
+  return ExpiringPointer<Calculation>(c);
 }
 
-ExpiringPointer<Calculation> CalculationStore::push(const char * text, Context * context) {
-  /* Compute ans now, before the buffer is slided and before the calculation
+// Pushes an expression in the store
+ExpiringPointer<Calculation> CalculationStore::push(const char * text, Context * context, HeightComputer heightComputer) {
+  /* Compute ans now, before the buffer is updated and before the calculation
    * might be deleted */
   Expression ans = ansExpression(context);
 
-  // Prepare the buffer for the new calculation
-  int minSize = Calculation::MinimalSize();
-  assert(k_bufferSize > minSize);
-  while (remainingBufferSize() < minSize || m_numberOfCalculations > k_maxNumberOfCalculations) {
-    deleteLastCalculation();
+  /* Prepare the buffer for the new calculation
+   *The minimal size to store the new calculation is the minimal size of a calculation plus the pointer to its end */
+  int minSize = Calculation::MinimalSize() + sizeof(Calculation *);
+  assert(m_bufferSize > minSize);
+  while (remainingBufferSize() < minSize) {
+    // If there is no more space to store a calculation, we delete the oldest one
+    deleteOldestCalculation();
   }
-  char * newCalculationsLocation = slideCalculationsToEndOfBuffer();
-  char * nextSerializationLocation = m_buffer;
+
+  // Getting the adresses of the limits of the free space
+  char * beginingOfFreeSpace = (char *)m_calculationAreaEnd;
+  char * endOfFreeSpace = beginingOfMemoizationArea();
+  char * previousCalc = beginingOfFreeSpace;
 
   // Add the beginning of the calculation
   {
@@ -71,23 +60,23 @@ ExpiringPointer<Calculation> CalculationStore::push(const char * text, Context *
      * available, so this memmove will not overide anything. */
     Calculation newCalc = Calculation();
     size_t calcSize = sizeof(newCalc);
-    memmove(nextSerializationLocation, &newCalc, calcSize);
-    nextSerializationLocation += calcSize;
+    memcpy(beginingOfFreeSpace, &newCalc, calcSize);
+    beginingOfFreeSpace += calcSize;
   }
 
   /* Add the input expression.
    * We do not store directly the text entered by the user because we do not
    * want to keep Ans symbol in the calculation store. */
-  const char * inputSerialization = nextSerializationLocation;
+  const char * inputSerialization = beginingOfFreeSpace;
   {
     Expression input = Expression::Parse(text, context).replaceSymbolWithExpression(Symbol::Ans(), ans);
-    if (!pushSerializeExpression(input, nextSerializationLocation, &newCalculationsLocation)) {
+    if (!pushSerializeExpression(input, beginingOfFreeSpace, &endOfFreeSpace)) {
       /* If the input does not fit in the store (event if the current
        * calculation is the only calculation), just replace the calculation with
        * undef. */
-      return emptyStoreAndPushUndef(context);
+      return emptyStoreAndPushUndef(context, heightComputer);
     }
-    nextSerializationLocation += strlen(nextSerializationLocation) + 1;
+    beginingOfFreeSpace += strlen(beginingOfFreeSpace) + 1;
   }
 
   // Compute and serialize the outputs
@@ -110,65 +99,73 @@ ExpiringPointer<Calculation> CalculationStore::push(const char * text, Context *
       if (i == numberOfOutputs - 1) {
         numberOfSignificantDigits = Poincare::Preferences::sharedPreferences()->numberOfSignificantDigits();
       }
-      if (!pushSerializeExpression(outputs[i], nextSerializationLocation, &newCalculationsLocation, numberOfSignificantDigits)) {
+      if (!pushSerializeExpression(outputs[i], beginingOfFreeSpace, &endOfFreeSpace, numberOfSignificantDigits)) {
         /* If the exat/approximate output does not fit in the store (event if the
          * current calculation is the only calculation), replace the output with
          * undef if it fits, else replace the whole calcualtion with undef. */
         Expression undef = Undefined::Builder();
-        if (!pushSerializeExpression(undef, nextSerializationLocation, &newCalculationsLocation)) {
-          return emptyStoreAndPushUndef(context);
+        if (!pushSerializeExpression(undef, beginingOfFreeSpace, &endOfFreeSpace)) {
+          return emptyStoreAndPushUndef(context, heightComputer);
         }
       }
-      nextSerializationLocation += strlen(nextSerializationLocation) + 1;
+      beginingOfFreeSpace += strlen(beginingOfFreeSpace) + 1;
     }
   }
+  // Storing the pointer of the end of the new calculation
+  memcpy(endOfFreeSpace-sizeof(Calculation*),&beginingOfFreeSpace,sizeof(beginingOfFreeSpace));
 
-  // Restore the other calculations
-  size_t slideSize = m_buffer + k_bufferSize - newCalculationsLocation;
-  memcpy(nextSerializationLocation, newCalculationsLocation, slideSize);
-  m_slidedBuffer = false;
+  // The new calculation is now stored
   m_numberOfCalculations++;
-  m_bufferEnd+= nextSerializationLocation - m_buffer;
 
-  // Clean the memoization
-  resetMemoizedModelsAfterCalculationIndex(-1);
-
-  return ExpiringPointer<Calculation>(reinterpret_cast<Calculation *>(m_buffer));
+  // The end of the calculation storage area is updated
+  m_calculationAreaEnd += beginingOfFreeSpace - previousCalc;
+  ExpiringPointer<Calculation> calculation = ExpiringPointer<Calculation>(reinterpret_cast<Calculation *>(previousCalc));
+  /* Heights are computed now to make sure that the display output is decided
+   * accordingly to the remaining size in the Poincare pool. Once it is, it
+   * can't change anymore: the calculation heights are fixed which ensures that
+   * scrolling computation is right. */
+  calculation->setHeights(
+      heightComputer(calculation.pointer(), false),
+      heightComputer(calculation.pointer(), true));
+  return calculation;
 }
 
+// Delete the calculation of index i
 void CalculationStore::deleteCalculationAtIndex(int i) {
   assert(i >= 0 && i < m_numberOfCalculations);
-  assert(!m_slidedBuffer);
-  ExpiringPointer<Calculation> calcI = calculationAtIndex(i);
-  char * nextCalc = reinterpret_cast<char *>(calcI->next());
-  assert(m_bufferEnd >= nextCalc);
-  size_t slidingSize = m_bufferEnd - nextCalc;
-  memmove((char *)(calcI.pointer()), nextCalc, slidingSize);
-  m_bufferEnd -= (nextCalc - (char *)(calcI.pointer()));
-  m_numberOfCalculations--;
-  resetMemoizedModelsAfterCalculationIndex(i);
-}
-
-void CalculationStore::deleteAll() {
-  /* We might call deleteAll because the app closed due to a pool allocation
-   * failure, so we cannot assert that m_slidedBuffer is false. */
-  m_slidedBuffer = false;
-  m_bufferEnd = m_buffer;
-  m_numberOfCalculations = 0;
-  resetMemoizedModelsAfterCalculationIndex(-1);
-}
-
-void CalculationStore::tidy() {
-  if (m_slidedBuffer) {
-    deleteAll();
+  if (i == 0) {
+    ExpiringPointer<Calculation> lastCalculationPointer = calculationAtIndex(0);
+    m_calculationAreaEnd = (char *)(lastCalculationPointer.pointer());
+    m_numberOfCalculations--;
     return;
   }
-  resetMemoizedModelsAfterCalculationIndex(-1);
-  for (Calculation * c : *this) {
-    c->tidy();
-  }
+  char * calcI = (char *)calculationAtIndex(i).pointer();
+  char * nextCalc = (char *) calculationAtIndex(i-1).pointer();
+  assert(m_calculationAreaEnd >= nextCalc);
+  size_t slidingSize = m_calculationAreaEnd - nextCalc;
+  // Slide the i-1 most recent calculations right after the i+1'th
+  memmove(calcI, nextCalc, slidingSize);
+  m_calculationAreaEnd -= nextCalc - calcI;
+  // Recompute pointer to calculations after the i'th
+  recomputeMemoizedPointersAfterCalculationIndex(i);
+  m_numberOfCalculations--;
 }
 
+// Delete the oldest calculation in the store and returns the amount of space freed by the operation
+size_t CalculationStore::deleteOldestCalculation() {
+  char * oldBufferEnd = (char *) m_calculationAreaEnd;
+  deleteCalculationAtIndex(numberOfCalculations()-1);
+  char * newBufferEnd = (char *) m_calculationAreaEnd;
+  return oldBufferEnd - newBufferEnd;
+}
+
+// Delete all calculations
+void CalculationStore::deleteAll() {
+  m_calculationAreaEnd = m_buffer;
+  m_numberOfCalculations = 0;
+}
+
+// Replace "Ans" by its expression
 Expression CalculationStore::ansExpression(Context * context) {
   if (numberOfCalculations() == 0) {
     return Rational::Builder(0);
@@ -187,92 +184,42 @@ Expression CalculationStore::ansExpression(Context * context) {
   return mostRecentCalculation->exactOutput();
 }
 
-Calculation * CalculationStore::bufferCalculationAtIndex(int i) {
-  int currentIndex = 0;
-  for (Calculation * c : *this) {
-    if (currentIndex == i) {
-      return c;
-    }
-    currentIndex++;
-  }
-  assert(false);
-  return nullptr;
-}
-
+// Push converted expression in the buffer
 bool CalculationStore::pushSerializeExpression(Expression e, char * location, char * * newCalculationsLocation, int numberOfSignificantDigits) {
-  assert(m_slidedBuffer);
-  assert(*newCalculationsLocation <= m_buffer + k_bufferSize);
+  assert(*newCalculationsLocation <= m_buffer + m_bufferSize);
   bool expressionIsPushed = false;
   while (true) {
     size_t locationSize = *newCalculationsLocation - location;
     expressionIsPushed = (PoincareHelpers::Serialize(e, location, locationSize, numberOfSignificantDigits) < (int)locationSize-1);
-    if (expressionIsPushed || *newCalculationsLocation >= m_buffer + k_bufferSize) {
+    if (expressionIsPushed || *newCalculationsLocation >= m_buffer + m_bufferSize) {
       break;
     }
-    *newCalculationsLocation = *newCalculationsLocation + deleteLastCalculation();
-    assert(*newCalculationsLocation <= m_buffer + k_bufferSize);
+    *newCalculationsLocation = *newCalculationsLocation + deleteOldestCalculation();
+    assert(*newCalculationsLocation <= m_buffer + m_bufferSize);
   }
   return expressionIsPushed;
 }
 
-char * CalculationStore::slideCalculationsToEndOfBuffer() {
-  int calculationsSize = m_bufferEnd - m_buffer;
-  char * calculationsNewPosition = m_buffer + k_bufferSize - calculationsSize;
-  memmove(calculationsNewPosition, m_buffer, calculationsSize);
-  m_slidedBuffer = true;
-  return calculationsNewPosition;
-}
 
-size_t CalculationStore::deleteLastCalculation(const char * calculationsStart) {
-  assert(m_numberOfCalculations > 0);
-  size_t result;
-  if (!m_slidedBuffer) {
-    assert(calculationsStart == nullptr);
-    const char * previousBufferEnd = m_bufferEnd;
-    m_bufferEnd = lastCalculationPosition(m_buffer);
-    assert(previousBufferEnd > m_bufferEnd);
-    result = previousBufferEnd - m_bufferEnd;
-  } else {
-    assert(calculationsStart != nullptr);
-    const char * lastCalc = lastCalculationPosition(calculationsStart);
-    assert(*lastCalc == 0);
-    result = m_buffer + k_bufferSize - lastCalc;
-    memmove(const_cast<char *>(calculationsStart + result), calculationsStart, m_buffer + k_bufferSize - calculationsStart - result);
-  }
-  m_numberOfCalculations--;
-  resetMemoizedModelsAfterCalculationIndex(-1);
-  return result;
-}
 
-const char * CalculationStore::lastCalculationPosition(const char * calculationsStart) const {
-  assert(calculationsStart >= m_buffer && calculationsStart < m_buffer + k_bufferSize);
-  Calculation * c = reinterpret_cast<Calculation *>(const_cast<char *>(calculationsStart));
-  int calculationIndex = 0;
-  while (calculationIndex < m_numberOfCalculations - 1) {
-    c = c->next();
-    calculationIndex++;
-  }
-  return reinterpret_cast<const char *>(c);
-}
-
-Shared::ExpiringPointer<Calculation> CalculationStore::emptyStoreAndPushUndef(Context * context) {
+Shared::ExpiringPointer<Calculation> CalculationStore::emptyStoreAndPushUndef(Context * context, HeightComputer heightComputer) {
   /* We end up here as a result of a failed calculation push. The store
    * attributes are not necessarily clean, so we need to reset them. */
-  m_slidedBuffer = false;
   deleteAll();
-  return push(Undefined::Name(), context);
+  return push(Undefined::Name(), context, heightComputer);
 }
 
-void CalculationStore::resetMemoizedModelsAfterCalculationIndex(int index) {
-  if (index < m_indexOfFirstMemoizedCalculationPointer) {
-    memset(&m_memoizedCalculationPointers, 0, k_numberOfMemoizedCalculationPointers * sizeof(Calculation *));
-    return;
-  }
-  if (index >= m_indexOfFirstMemoizedCalculationPointer + k_numberOfMemoizedCalculationPointers) {
-    return;
-  }
-  for (int i = index - m_indexOfFirstMemoizedCalculationPointer; i < k_numberOfMemoizedCalculationPointers; i++) {
-    m_memoizedCalculationPointers[i] = nullptr;
+// Recompute memoized pointers to the calculations after index i
+void CalculationStore::recomputeMemoizedPointersAfterCalculationIndex(int index) {
+  assert(index < m_numberOfCalculations);
+  // Clear pointer and recompute new ones
+  Calculation * c = calculationAtIndex(index).pointer();
+  Calculation * nextCalc;
+  while (index != 0) {
+    nextCalc = c->next();
+    memcpy(addressOfPointerToCalculationOfIndex(index), &nextCalc, sizeof(Calculation *));
+    c = nextCalc;
+    index--;
   }
 }
 

apps/calculation/calculation_store.h

@@ -7,36 +7,45 @@
 
 namespace Calculation {
 
-/* To optimize the storage space, we use one big buffer for all calculations.
- *
- * The previous solution was to keep 10 calculations, each containing 3 buffers
- * (for input and outputs). To optimize the storage, we then wanted to put all
- * outputs in a cache where they could be deleted to add a new entry, and
- * recomputed on cache miss. However, the computation depends too much on the
- * state of the memory for this to be possible. For instance:
- * 6->a
- * a+1
- * Perform some big computations that remove a+1 from the cache
- * Delete a from the variable box.
- * Scroll up to display a+1 : a does not exist anymore so the outputs won't be
- * recomputed correctly.
- *
- * Now we do not cap the number of calculations and just delete the oldests to
- * create space for a new calculation. */
+/*
+  To optimize the storage space, we use one big buffer for all calculations.
+  The calculations are stored one after another while pointers to the end of each
+  calculation are stored at the end of the buffer, in the opposite direction.
+  By doing so, we can memoize every calculation entered while not limiting
+  the number of calculation stored in the buffer.
+
+  If the remaining space is too small for storing a new calculation, we
+  delete the oldest one.
+
+ Memory layout :
+                                                                <- Available space for new calculations ->
++--------------------------------------------------------------------------------------------------------------------+
+|               |               |               |               |                                        |  |  |  |  |
+| Calculation 3 | Calculation 2 | Calculation 1 | Calculation O |                                        |p0|p1|p2|p3|
+|     Oldest    |               |               |               |                                        |  |  |  |  |
++--------------------------------------------------------------------------------------------------------------------+
+^               ^               ^               ^               ^                                        ^
+m_buffer        p3              p2              p1              p0                                       a
+
+m_calculationAreaEnd = p0
+a = addressOfPointerToCalculation(0)
+*/
 
 class CalculationStore {
 public:
   CalculationStore();
+  CalculationStore(char * buffer, int size);
   Shared::ExpiringPointer<Calculation> calculationAtIndex(int i);
-  Shared::ExpiringPointer<Calculation> push(const char * text, Poincare::Context * context);
+  typedef KDCoordinate (*HeightComputer)(Calculation * c, bool expanded);
+  Shared::ExpiringPointer<Calculation> push(const char * text, Poincare::Context * context, HeightComputer heightComputer);
   void deleteCalculationAtIndex(int i);
   void deleteAll();
+  int remainingBufferSize() const { assert(m_calculationAreaEnd >= m_buffer); return m_bufferSize - (m_calculationAreaEnd - m_buffer) - m_numberOfCalculations*sizeof(Calculation*); }
   int numberOfCalculations() const { return m_numberOfCalculations; }
   Poincare::Expression ansExpression(Poincare::Context * context);
-  void tidy();
+  int bufferSize() { return m_bufferSize; }
+
 private:
-  static constexpr int k_maxNumberOfCalculations = 25;
-  static constexpr int k_bufferSize = 10 * Calculation::k_numberOfExpressions * Constant::MaxSerializedExpressionSize;
 
   class CalculationIterator {
   public:
@@ -52,26 +61,22 @@ private:
   };
 
   CalculationIterator begin() const { return CalculationIterator(m_buffer); }
-  CalculationIterator end() const { return CalculationIterator(m_bufferEnd); }
+  CalculationIterator end() const { return CalculationIterator(m_calculationAreaEnd); }
 
-  Calculation * bufferCalculationAtIndex(int i);
-  int remainingBufferSize() const { assert(m_bufferEnd >= m_buffer); return k_bufferSize - (m_bufferEnd - m_buffer); }
   bool pushSerializeExpression(Poincare::Expression e, char * location, char * * newCalculationsLocation, int numberOfSignificantDigits = Poincare::PrintFloat::k_numberOfStoredSignificantDigits);
-  char * slideCalculationsToEndOfBuffer(); // returns the new position of the calculations
-  size_t deleteLastCalculation(const char * calculationsStart = nullptr);
-  const char * lastCalculationPosition(const char * calculationsStart) const;
-  Shared::ExpiringPointer<Calculation> emptyStoreAndPushUndef(Poincare::Context * context);
+  Shared::ExpiringPointer<Calculation> emptyStoreAndPushUndef(Poincare::Context * context, HeightComputer heightComputer);
 
-  char m_buffer[k_bufferSize];
-  const char * m_bufferEnd;
+  char * m_buffer;
+  int m_bufferSize;
+  const char * m_calculationAreaEnd;
   int m_numberOfCalculations;
-  bool m_slidedBuffer;
+
+  size_t deleteOldestCalculation();
+  char * addressOfPointerToCalculationOfIndex(int i) {return m_buffer + m_bufferSize - (m_numberOfCalculations - i)*sizeof(Calculation *);}
 
   // Memoization
-  static constexpr int k_numberOfMemoizedCalculationPointers = 10;
-  void resetMemoizedModelsAfterCalculationIndex(int index);
-  int m_indexOfFirstMemoizedCalculationPointer;
-  mutable Calculation * m_memoizedCalculationPointers[k_numberOfMemoizedCalculationPointers];
+  char * beginingOfMemoizationArea() {return addressOfPointerToCalculationOfIndex(0);};
+  void recomputeMemoizedPointersAfterCalculationIndex(int index);
 };
 
 }

apps/calculation/edit_expression_controller.cpp

@@ -38,13 +38,14 @@ void EditExpressionController::ContentView::reload() {
   markRectAsDirty(bounds());
 }
 
-EditExpressionController::EditExpressionController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, HistoryController * historyController, CalculationStore * calculationStore) :
+EditExpressionController::EditExpressionController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, char * cacheBuffer, size_t * cacheBufferInformation, HistoryController * historyController, CalculationStore * calculationStore) :
   ViewController(parentResponder),
+  m_cacheBuffer(cacheBuffer),
+  m_cacheBufferInformation(cacheBufferInformation),
   m_historyController(historyController),
   m_calculationStore(calculationStore),
   m_contentView(this, static_cast<CalculationSelectableTableView *>(m_historyController->view()), inputEventHandlerDelegate, this, this)
 {
-  m_cacheBuffer[0] = 0;
 }
 
 void EditExpressionController::insertTextBody(const char * text) {
@@ -58,6 +59,15 @@ void EditExpressionController::didBecomeFirstResponder() {
   Container::activeApp()->setFirstResponder(m_contentView.expressionField());
 }
 
+void EditExpressionController::restoreInput() {
+  m_contentView.expressionField()->restoreContent(m_cacheBuffer, *m_cacheBufferInformation);
+  clearCacheBuffer();
+}
+
+void EditExpressionController::memoizeInput() {
+  *m_cacheBufferInformation = m_contentView.expressionField()->moveCursorAndDumpContent(m_cacheBuffer, k_cacheBufferSize);
+}
+
 void EditExpressionController::viewWillAppear() {
   m_historyController->viewWillAppear();
 }
@@ -122,13 +132,13 @@ bool EditExpressionController::inputViewDidReceiveEvent(Ion::Events::Event event
     if (!myApp->isAcceptableText(m_cacheBuffer)) {
       return true;
     }
-    m_calculationStore->push(m_cacheBuffer, myApp->localContext());
+    m_calculationStore->push(m_cacheBuffer, myApp->localContext(), HistoryViewCell::Height);
     m_historyController->reload();
     return true;
   }
   if (event == Ion::Events::Up) {
     if (m_calculationStore->numberOfCalculations() > 0) {
-      m_cacheBuffer[0] = 0;
+      clearCacheBuffer();
       m_contentView.expressionField()->setEditing(false, false);
       Container::activeApp()->setFirstResponder(m_historyController);
     }
@@ -145,7 +155,7 @@ bool EditExpressionController::inputViewDidFinishEditing(const char * text, Layo
   } else {
     layoutR.serializeParsedExpression(m_cacheBuffer, k_cacheBufferSize, context);
   }
-  m_calculationStore->push(m_cacheBuffer, context);
+  m_calculationStore->push(m_cacheBuffer, context, HistoryViewCell::Height);
   m_historyController->reload();
   m_contentView.expressionField()->setEditing(true, true);
   telemetryReportEvent("Input", m_cacheBuffer);

apps/calculation/edit_expression_controller.h

@@ -7,7 +7,6 @@
 #include "../shared/text_field_delegate.h"
 #include "../shared/layout_field_delegate.h"
 #include "history_controller.h"
-#include "calculation_store.h"
 #include "selectable_table_view.h"
 
 namespace Calculation {
@@ -15,11 +14,23 @@ namespace Calculation {
 /* TODO: implement a split view */
 class EditExpressionController : public ViewController, public Shared::TextFieldDelegate, public Shared::LayoutFieldDelegate {
 public:
-  EditExpressionController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, HistoryController * historyController, CalculationStore * calculationStore);
+  EditExpressionController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, char * cacheBuffer, size_t * cacheBufferInformation, HistoryController * historyController, CalculationStore * calculationStore);
+
+  /* k_layoutBufferMaxSize dictates the size under which the expression being
+   * edited can be remembered when the user leaves Calculation. */
+  static constexpr int k_layoutBufferMaxSize = 1024;
+  /* k_cacheBufferSize is the size of the array to which m_cacheBuffer points.
+   * It is used both as a way to buffer expression when pushing them the
+   * CalculationStore, and as a storage for the current input when leaving the
+   * application. */
+  static constexpr int k_cacheBufferSize = (k_layoutBufferMaxSize < Constant::MaxSerializedExpressionSize) ? Constant::MaxSerializedExpressionSize : k_layoutBufferMaxSize;
+
   View * view() override { return &m_contentView; }
   void didBecomeFirstResponder() override;
   void viewWillAppear() override;
   void insertTextBody(const char * text);
+  void restoreInput();
+  void memoizeInput();
 
   /* TextFieldDelegate */
   bool textFieldDidReceiveEvent(::TextField * textField, Ion::Events::Event event) override;
@@ -47,11 +58,12 @@ private:
     ExpressionField m_expressionField;
   };
   void reloadView();
+  void clearCacheBuffer() { m_cacheBuffer[0] = 0; *m_cacheBufferInformation = 0; }
   bool inputViewDidReceiveEvent(Ion::Events::Event event, bool shouldDuplicateLastCalculation);
   bool inputViewDidFinishEditing(const char * text, Poincare::Layout layoutR);
   bool inputViewDidAbortEditing(const char * text);
-  static constexpr int k_cacheBufferSize = Constant::MaxSerializedExpressionSize;
-  char m_cacheBuffer[k_cacheBufferSize];
+  char * m_cacheBuffer;
+  size_t * m_cacheBufferInformation;
   HistoryController * m_historyController;
   CalculationStore * m_calculationStore;
   ContentView m_contentView;

apps/calculation/expression_field.cpp

@@ -17,7 +17,8 @@ bool ExpressionField::handleEvent(Ion::Events::Event event) {
        event == Ion::Events::Power ||
        event == Ion::Events::Square ||
        event == Ion::Events::Division ||
-       event == Ion::Events::Sto)) {
+       event == Ion::Events::Sto ||
+       event == Ion::Events::EE)) {
     handleEventWithText(Poincare::Symbol::k_ans);
   }
   return(::ExpressionField::handleEvent(event));

apps/calculation/history_controller.cpp

@@ -17,7 +17,8 @@ HistoryController::HistoryController(EditExpressionController * editExpressionCo
   m_integerController(editExpressionController),
   m_rationalController(editExpressionController),
   m_trigonometryController(editExpressionController),
-  m_unitController(editExpressionController)
+  m_unitController(editExpressionController),
+  m_matrixController(editExpressionController)
 {
   for (int i = 0; i < k_maxNumberOfDisplayedRows; i++) {
     m_calculationHistory[i].setParentResponder(&m_selectableTableView);
@@ -110,6 +111,8 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
         vc = &m_rationalController;
       } else if (additionalInfoType == Calculation::AdditionalInformationType::Unit) {
         vc = &m_unitController;
+      } else if (additionalInfoType == Calculation::AdditionalInformationType::Matrix) {
+        vc = &m_matrixController;
       }
       if (vc) {
         vc->setExpression(e);
@@ -129,7 +132,9 @@ bool HistoryController::handleEvent(Ion::Events::Event event) {
       return true;
     }
     m_selectableTableView.selectCellAtLocation(0, focusRow > 0 ? focusRow - 1 : 0);
-    setSelectedSubviewType(subviewType, true, 0, selectedRow());
+    /* The parameters 'sameCell' and 'previousSelectedY' are chosen to enforce
+     * toggling of the output when necessary. */
+    setSelectedSubviewType(subviewType, false, 0, (subviewType == SubviewType::Input) ? selectedRow() : -1);
     return true;
   }
   if (event == Ion::Events::Clear) {
@@ -204,20 +209,7 @@ KDCoordinate HistoryController::rowHeight(int j) {
   }
   Shared::ExpiringPointer<Calculation> calculation = calculationAtIndex(j);
   bool expanded = j == selectedRow() && selectedSubviewType() == SubviewType::Output;
-  KDCoordinate result = calculation->memoizedHeight(expanded);
-  if (result < 0) {
-    result = HistoryViewCell::Height(calculation.pointer(), expanded);
-    if (result < 0) {
-      // Raise, because Height modified the calculation and failed.
-      Poincare::ExceptionCheckpoint::Raise();
-    }
-    calculation->setMemoizedHeight(expanded, result);
-  }
-  /* We might want to put an assertion here to check the memoization:
-   * assert(result == HistoryViewCell::Height(calculation.pointer(), expanded));
-   * However, Height might fail due to pool memory exhaustion, in which case the
-   * assertion fails even if "result" had the right value. */
-  return result;
+  return calculation->height(expanded);
 }
 
 int HistoryController::typeAtLocation(int i, int j) {

apps/calculation/history_controller.h

@@ -10,6 +10,7 @@
 #include "additional_outputs/rational_list_controller.h"
 #include "additional_outputs/trigonometry_list_controller.h"
 #include "additional_outputs/unit_list_controller.h"
+#include "additional_outputs/matrix_list_controller.h"
 
 namespace Calculation {
 
@@ -48,6 +49,7 @@ private:
   RationalListController m_rationalController;
   TrigonometryListController m_trigonometryController;
   UnitListController m_unitController;
+  MatrixListController m_matrixController;
 };
 
 }

apps/calculation/history_view_cell.cpp

@@ -36,16 +36,7 @@ void HistoryViewCellDataSource::setSelectedSubviewType(SubviewType subviewType,
 
 KDCoordinate HistoryViewCell::Height(Calculation * calculation, bool expanded) {
   HistoryViewCell cell(nullptr);
-  bool didForceOutput = false;
-  cell.setCalculation(calculation, expanded, &didForceOutput);
-  if (didForceOutput) {
-    /* We could not compute the height of the calculation as it is (the display
-     * output was forced to another value during the height computation).
-     * Warning: the display output of calculation was actually changed, so it
-     * will cause problems if we already did some computations with another
-     * display value. */
-    return -1;
-  }
+  cell.setCalculation(calculation, expanded, true);
   KDRect ellipsisFrame = KDRectZero;
   KDRect inputFrame = KDRectZero;
   KDRect outputFrame = KDRectZero;
@@ -246,8 +237,7 @@ void HistoryViewCell::resetMemoization() {
   m_calculationCRC32 = 0;
 }
 
-void HistoryViewCell::setCalculation(Calculation * calculation, bool expanded, bool * didForceOutput) {
-  assert(!didForceOutput || *didForceOutput == false);
+void HistoryViewCell::setCalculation(Calculation * calculation, bool expanded, bool canChangeDisplayOutput) {
   uint32_t newCalculationCRC = Ion::crc32Byte((const uint8_t *)calculation, ((char *)calculation->next()) - ((char *) calculation));
   if (newCalculationCRC == m_calculationCRC32 && m_calculationExpanded == expanded) {
     return;
@@ -273,11 +263,8 @@ void HistoryViewCell::setCalculation(Calculation * calculation, bool expanded, b
     bool couldNotCreateExactLayout = false;
     exactOutputLayout = calculation->createExactOutputLayout(&couldNotCreateExactLayout);
     if (couldNotCreateExactLayout) {
-      if (calculation->displayOutput(context) != ::Calculation::Calculation::DisplayOutput::ExactOnly) {
+      if (canChangeDisplayOutput && calculation->displayOutput(context) != ::Calculation::Calculation::DisplayOutput::ExactOnly) {
         calculation->forceDisplayOutput(::Calculation::Calculation::DisplayOutput::ApproximateOnly);
-        if (didForceOutput) {
-          *didForceOutput = true;
-        }
       } else {
         /* We should only display the exact result, but we cannot create it
          * -> raise an exception. */
@@ -294,27 +281,25 @@ void HistoryViewCell::setCalculation(Calculation * calculation, bool expanded, b
     bool couldNotCreateApproximateLayout = false;
     approximateOutputLayout = calculation->createApproximateOutputLayout(context, &couldNotCreateApproximateLayout);
     if (couldNotCreateApproximateLayout) {
-      if (calculation->displayOutput(context) == ::Calculation::Calculation::DisplayOutput::ApproximateOnly) {
-        Poincare::ExceptionCheckpoint::Raise();
-      } else {
+      if (canChangeDisplayOutput && calculation->displayOutput(context) != ::Calculation::Calculation::DisplayOutput::ApproximateOnly) {
         /* Set the display output to ApproximateOnly, make room in the pool by
          * erasing the exact layout, and retry to create the approximate layout */
         calculation->forceDisplayOutput(::Calculation::Calculation::DisplayOutput::ApproximateOnly);
-        if (didForceOutput) {
-          *didForceOutput = true;
-        }
         exactOutputLayout = Poincare::Layout();
         couldNotCreateApproximateLayout = false;
         approximateOutputLayout = calculation->createApproximateOutputLayout(context, &couldNotCreateApproximateLayout);
         if (couldNotCreateApproximateLayout) {
           Poincare::ExceptionCheckpoint::Raise();
         }
+      } else {
+        Poincare::ExceptionCheckpoint::Raise();
       }
     }
   }
   m_calculationDisplayOutput = calculation->displayOutput(context);
 
   // We must set which subviews are displayed before setLayouts to mark the right rectangle as dirty
+  m_scrollableOutputView.setDisplayableCenter(m_calculationDisplayOutput == Calculation::DisplayOutput::ExactAndApproximate || m_calculationDisplayOutput == Calculation::DisplayOutput::ExactAndApproximateToggle);
   m_scrollableOutputView.setDisplayCenter(m_calculationDisplayOutput == Calculation::DisplayOutput::ExactAndApproximate || m_calculationExpanded);
   m_scrollableOutputView.setLayouts(Poincare::Layout(), exactOutputLayout, approximateOutputLayout);
   I18n::Message equalMessage = calculation->exactAndApproximateDisplayedOutputsAreEqual(context) == Calculation::EqualSign::Equal ? I18n::Message::Equal : I18n::Message::AlmostEqual;

apps/calculation/history_view_cell.h

@@ -51,7 +51,7 @@ public:
   Poincare::Layout layout() const override;
   KDColor backgroundColor() const override { return m_even ? Palette::CalculationBackgroundEven : Palette::CalculationBackgroundOdd; }
   void resetMemoization();
-  void setCalculation(Calculation * calculation, bool expanded, bool * didForceOutput = nullptr);
+  void setCalculation(Calculation * calculation, bool expanded, bool canChangeDisplayOutput = false);
   int numberOfSubviews() const override { return 2 + displayedEllipsis(); }
   View * subviewAtIndex(int index) override;
   void layoutSubviews(bool force = false) override;

apps/calculation/test/calculation_store.cpp

@@ -5,124 +5,149 @@
 #include <assert.h>
 #include "../calculation_store.h"
 
+typedef ::Calculation::Calculation::DisplayOutput DisplayOutput;
+typedef ::Calculation::Calculation::EqualSign EqualSign ;
+typedef ::Calculation::Calculation::NumberOfSignificantDigits NumberOfSignificantDigits;
+
 using namespace Poincare;
 using namespace Calculation;
 
+static constexpr int calculationBufferSize = 10 * (sizeof(::Calculation::Calculation) + ::Calculation::Calculation::k_numberOfExpressions * ::Constant::MaxSerializedExpressionSize + sizeof(::Calculation::Calculation *));
+char calculationBuffer[calculationBufferSize];
+
+
 void assert_store_is(CalculationStore * store, const char * * result) {
   for (int i = 0; i < store->numberOfCalculations(); i++) {
     quiz_assert(strcmp(store->calculationAtIndex(i)->inputText(), result[i]) == 0);
   }
 }
 
+KDCoordinate dummyHeight(::Calculation::Calculation * c, bool expanded) { return 0; }
 
 QUIZ_CASE(calculation_store) {
   Shared::GlobalContext globalContext;
-  CalculationStore store;
+  CalculationStore store(calculationBuffer,calculationBufferSize);
   // Store is now {9, 8, 7, 6, 5, 4, 3, 2, 1, 0}
   const char * result[] = {"9", "8", "7", "6", "5", "4", "3", "2", "1", "0"};
   for (int i = 0; i < 10; i++) {
     char text[2] = {(char)(i+'0'), 0};
-    store.push(text, &globalContext);
+    store.push(text, &globalContext, dummyHeight);
     quiz_assert(store.numberOfCalculations() == i+1);
   }
   assert_store_is(&store, result);
 
   for (int i = 9; i > 0; i = i-2) {
-   store.deleteCalculationAtIndex(i);
+    store.deleteCalculationAtIndex(i);
   }
   // Store is now {9, 7, 5, 3, 1}
   const char * result2[] = {"9", "7", "5", "3", "1"};
   assert_store_is(&store, result2);
 
   store.deleteAll();
+
+  // Checking if the store handles correctly the delete of the oldest calculation when full
+  static int minSize = ::Calculation::Calculation::MinimalSize();
+  char text[2] = {'0', 0};
+  while (store.remainingBufferSize() > minSize) {
+    store.push(text, &globalContext, dummyHeight);
+  }
+  int numberOfCalculations1 = store.numberOfCalculations();
+  /* The buffer is now to  full to push a new calculation.
+   * Trying to push a new one should delete the oldest one*/
+  store.push(text, &globalContext, dummyHeight);
+  int numberOfCalculations2 = store.numberOfCalculations();
+  // The numberOfCalculations should be the same
+  quiz_assert(numberOfCalculations1 == numberOfCalculations2);
+  store.deleteAll();
+  quiz_assert(store.remainingBufferSize() == store.bufferSize());
 }
 
 QUIZ_CASE(calculation_ans) {
   Shared::GlobalContext globalContext;
-  CalculationStore store;
+  CalculationStore store(calculationBuffer,calculationBufferSize);
 
-  store.push("1+3/4", &globalContext);
-  store.push("ans+2/3", &globalContext);
+  store.push("1+3/4", &globalContext, dummyHeight);
+  store.push("ans+2/3", &globalContext, dummyHeight);
   Shared::ExpiringPointer<::Calculation::Calculation> lastCalculation = store.calculationAtIndex(0);
-  quiz_assert(lastCalculation->displayOutput(&globalContext) == ::Calculation::Calculation::DisplayOutput::ExactAndApproximate);
+  quiz_assert(lastCalculation->displayOutput(&globalContext) == DisplayOutput::ExactAndApproximate);
   quiz_assert(strcmp(lastCalculation->exactOutputText(),"29/12") == 0);
 
-  store.push("ans+0.22", &globalContext);
+  store.push("ans+0.22", &globalContext, dummyHeight);
   lastCalculation = store.calculationAtIndex(0);
-  quiz_assert(lastCalculation->displayOutput(&globalContext) == ::Calculation::Calculation::DisplayOutput::ExactAndApproximateToggle);
-  quiz_assert(strcmp(lastCalculation->approximateOutputText(::Calculation::Calculation::NumberOfSignificantDigits::Maximal),"2.6366666666667") == 0);
+  quiz_assert(lastCalculation->displayOutput(&globalContext) == DisplayOutput::ExactAndApproximateToggle);
+  quiz_assert(strcmp(lastCalculation->approximateOutputText(NumberOfSignificantDigits::Maximal),"2.6366666666667") == 0);
 
   store.deleteAll();
 }
 
-void assertCalculationIs(const char * input, ::Calculation::Calculation::DisplayOutput display, ::Calculation::Calculation::EqualSign sign, const char * exactOutput, const char * displayedApproximateOutput, const char * storedApproximateOutput, Context * context, CalculationStore * store) {
-  store->push(input, context);
+void assertCalculationIs(const char * input, DisplayOutput display, EqualSign sign, const char * exactOutput, const char * displayedApproximateOutput, const char * storedApproximateOutput, Context * context, CalculationStore * store) {
+  store->push(input, context, dummyHeight);
   Shared::ExpiringPointer<::Calculation::Calculation> lastCalculation = store->calculationAtIndex(0);
   quiz_assert(lastCalculation->displayOutput(context) == display);
-  if (sign != ::Calculation::Calculation::EqualSign::Unknown) {
+  if (sign != EqualSign::Unknown) {
     quiz_assert(lastCalculation->exactAndApproximateDisplayedOutputsAreEqual(context) == sign);
   }
   if (exactOutput) {
     quiz_assert_print_if_failure(strcmp(lastCalculation->exactOutputText(), exactOutput) == 0, input);
   }
   if (displayedApproximateOutput) {
-    quiz_assert_print_if_failure(strcmp(lastCalculation->approximateOutputText(::Calculation::Calculation::NumberOfSignificantDigits::UserDefined), displayedApproximateOutput) == 0, input);
+    quiz_assert_print_if_failure(strcmp(lastCalculation->approximateOutputText(NumberOfSignificantDigits::UserDefined), displayedApproximateOutput) == 0, input);
   }
   if (storedApproximateOutput) {
-    quiz_assert_print_if_failure(strcmp(lastCalculation->approximateOutputText(::Calculation::Calculation::NumberOfSignificantDigits::Maximal), storedApproximateOutput) == 0, input);
+    quiz_assert_print_if_failure(strcmp(lastCalculation->approximateOutputText(NumberOfSignificantDigits::Maximal), storedApproximateOutput) == 0, input);
   }
   store->deleteAll();
 }
 
 QUIZ_CASE(calculation_significant_digits) {
   Shared::GlobalContext globalContext;
-  CalculationStore store;
+  CalculationStore store(calculationBuffer,calculationBufferSize);
 
-  assertCalculationIs("123456789", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "123456789", "1.234568ᴇ8", "123456789", &globalContext, &store);
-  assertCalculationIs("1234567", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Equal, "1234567", "1234567", "1234567", &globalContext, &store);
+  assertCalculationIs("123456789", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "123456789", "1.234568ᴇ8", "123456789", &globalContext, &store);
+  assertCalculationIs("1234567", DisplayOutput::ApproximateOnly, EqualSign::Equal, "1234567", "1234567", "1234567", &globalContext, &store);
 
 }
 
 QUIZ_CASE(calculation_display_exact_approximate) {
   Shared::GlobalContext globalContext;
-  CalculationStore store;
+  CalculationStore store(calculationBuffer,calculationBufferSize);
 
-  assertCalculationIs("1/2", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Equal, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("1/3", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("1/0", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("2x-x", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("[[1,2,3]]", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("[[1,x,3]]", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "undef", "undef", &globalContext, &store);
-  assertCalculationIs("28^7", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("3+√(2)→a", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "√(2)+3", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("1/2", DisplayOutput::ExactAndApproximate, EqualSign::Equal, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("1/3", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("1/0", DisplayOutput::ExactOnly, EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("2x-x", DisplayOutput::ExactOnly, EqualSign::Unknown, "x", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("[[1,2,3]]", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("[[1,x,3]]", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, "[[1,undef,3]]", "[[1,undef,3]]", &globalContext, &store);
+  assertCalculationIs("28^7", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("3+√(2)→a", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "√(2)+3", nullptr, nullptr, &globalContext, &store);
   Ion::Storage::sharedStorage()->recordNamed("a.exp").destroy();
-  assertCalculationIs("3+2→a", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Equal, "5", "5", "5", &globalContext, &store);
+  assertCalculationIs("3+2→a", DisplayOutput::ApproximateOnly, EqualSign::Equal, "5", "5", "5", &globalContext, &store);
   Ion::Storage::sharedStorage()->recordNamed("a.exp").destroy();
-  assertCalculationIs("3→a", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Equal, "3", "3", "3", &globalContext, &store);
+  assertCalculationIs("3→a", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", "3", "3", &globalContext, &store);
   Ion::Storage::sharedStorage()->recordNamed("a.exp").destroy();
-  assertCalculationIs("3+x→f(x)", ::Calculation::Calculation::DisplayOutput::ExactOnly, ::Calculation::Calculation::EqualSign::Unknown, "x+3", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("3+x→f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+3", nullptr, nullptr, &globalContext, &store);
   Ion::Storage::sharedStorage()->recordNamed("f.func").destroy();
-  assertCalculationIs("1+1+random()", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("1+1+round(1.343,2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "3.34", "3.34", &globalContext, &store);
-  assertCalculationIs("randint(2,2)+3", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, "5", "5", "5", &globalContext, &store);
-  assertCalculationIs("confidence(0.5,2)+3", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("prediction(0.5,2)+3", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("prediction95(0.5,2)+3", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("1+1+random()", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("1+1+round(1.343,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "3.34", "3.34", &globalContext, &store);
+  assertCalculationIs("randint(2,2)+3", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "5", "5", "5", &globalContext, &store);
+  assertCalculationIs("confidence(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("prediction(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("prediction95(0.5,2)+3", DisplayOutput::ExactOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
 
 }
 
 QUIZ_CASE(calculation_symbolic_computation) {
   Shared::GlobalContext globalContext;
-  CalculationStore store;
+  CalculationStore store(calculationBuffer,calculationBufferSize);
 
-  assertCalculationIs("x+x+1+3+√(π)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("f(x)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("1+x→f(x)", ::Calculation::Calculation::DisplayOutput::ExactOnly, ::Calculation::Calculation::EqualSign::Unknown, "x+1", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("f(x)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, "undef", "undef", "undef", &globalContext, &store);
-  assertCalculationIs("f(2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Equal, "3", "3", "3", &globalContext, &store);
-  assertCalculationIs("2→x", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Equal, "2", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("f(x)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Equal, "3", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("x+x+1+3+√(π)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "√(π)+8", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("x+x+1+3+√(π)", DisplayOutput::ExactOnly, EqualSign::Unknown, "2×x+√(π)+4", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "f×x", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("1+x→f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+1", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ExactOnly, EqualSign::Unknown, "x+1", "undef", "undef", &globalContext, &store);
+  assertCalculationIs("f(2)", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", "3", "3", &globalContext, &store);
+  assertCalculationIs("2→x", DisplayOutput::ApproximateOnly, EqualSign::Equal, "2", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("f(x)", DisplayOutput::ApproximateOnly, EqualSign::Equal, "3", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("x+x+1+3+√(π)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "√(π)+8", nullptr, nullptr, &globalContext, &store);
 
   Ion::Storage::sharedStorage()->recordNamed("f.func").destroy();
   Ion::Storage::sharedStorage()->recordNamed("x.exp").destroy();
@@ -130,18 +155,18 @@ QUIZ_CASE(calculation_symbolic_computation) {
 
 QUIZ_CASE(calculation_symbolic_computation_and_parametered_expressions) {
   Shared::GlobalContext globalContext;
-  CalculationStore store;
+  CalculationStore store(calculationBuffer,calculationBufferSize);
 
-  assertCalculationIs("int((ℯ^(-x))-x^(0.5), x, 0, 3)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store); // Tests a bug with symbolic computation
-  assertCalculationIs("int(x,x,0,2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "2", "2", &globalContext, &store);
-  assertCalculationIs("sum(x,x,0,2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "3", "3", &globalContext, &store);
-  assertCalculationIs("product(x,x,1,2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "2", "2", &globalContext, &store);
-  assertCalculationIs("diff(x^2,x,3)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "6", "6", &globalContext, &store);
-  assertCalculationIs("2→x", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("int(x,x,0,2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "2", "2", &globalContext, &store);
-  assertCalculationIs("sum(x,x,0,2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "3", "3", &globalContext, &store);
-  assertCalculationIs("product(x,x,1,2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "2", "2", &globalContext, &store);
-  assertCalculationIs("diff(x^2,x,3)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "6", "6", &globalContext, &store);
+  assertCalculationIs("int((ℯ^(-x))-x^(0.5), x, 0, 3)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store); // Tests a bug with symbolic computation
+  assertCalculationIs("int(x,x,0,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "2", "2", &globalContext, &store);
+  assertCalculationIs("sum(x,x,0,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "3", "3", &globalContext, &store);
+  assertCalculationIs("product(x,x,1,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "2", "2", &globalContext, &store);
+  assertCalculationIs("diff(x^2,x,3)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "6", "6", &globalContext, &store);
+  assertCalculationIs("2→x", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("int(x,x,0,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "2", "2", &globalContext, &store);
+  assertCalculationIs("sum(x,x,0,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "3", "3", &globalContext, &store);
+  assertCalculationIs("product(x,x,1,2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "2", "2", &globalContext, &store);
+  assertCalculationIs("diff(x^2,x,3)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "6", "6", &globalContext, &store);
 
   Ion::Storage::sharedStorage()->recordNamed("x.exp").destroy();
 }
@@ -149,34 +174,34 @@ QUIZ_CASE(calculation_symbolic_computation_and_parametered_expressions) {
 
 QUIZ_CASE(calculation_complex_format) {
   Shared::GlobalContext globalContext;
-  CalculationStore store;
+  CalculationStore store(calculationBuffer,calculationBufferSize);
 
   Poincare::Preferences::sharedPreferences()->setComplexFormat(Poincare::Preferences::ComplexFormat::Real);
-  assertCalculationIs("1+𝐢", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "1+𝐢", "1+𝐢", &globalContext, &store);
-  assertCalculationIs("√(-1)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, "unreal", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("ln(-2)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "unreal", "unreal", &globalContext, &store);
-  assertCalculationIs("√(-1)×√(-1)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "unreal", "unreal", &globalContext, &store);
-  assertCalculationIs("(-8)^(1/3)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "-2", "-2", &globalContext, &store);
-  assertCalculationIs("(-8)^(2/3)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "4", "4", &globalContext, &store);
-  assertCalculationIs("(-2)^(1/4)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "unreal", "unreal", &globalContext, &store);
+  assertCalculationIs("1+𝐢", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "1+𝐢", "1+𝐢", &globalContext, &store);
+  assertCalculationIs("√(-1)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, "unreal", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("ln(-2)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "unreal", "unreal", &globalContext, &store);
+  assertCalculationIs("√(-1)×√(-1)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "unreal", "unreal", &globalContext, &store);
+  assertCalculationIs("(-8)^(1/3)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "-2", "-2", &globalContext, &store);
+  assertCalculationIs("(-8)^(2/3)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "4", "4", &globalContext, &store);
+  assertCalculationIs("(-2)^(1/4)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "unreal", "unreal", &globalContext, &store);
 
   Poincare::Preferences::sharedPreferences()->setComplexFormat(Poincare::Preferences::ComplexFormat::Cartesian);
-  assertCalculationIs("1+𝐢", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "1+𝐢", "1+𝐢", &globalContext, &store);
-  assertCalculationIs("√(-1)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "𝐢", "𝐢", &globalContext, &store);
-  assertCalculationIs("ln(-2)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "ln(-2)", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("√(-1)×√(-1)", ::Calculation::Calculation::DisplayOutput::ApproximateOnly, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "-1", "-1", &globalContext, &store);
-  assertCalculationIs("(-8)^(1/3)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "1+√(3)×𝐢", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("(-8)^(2/3)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "-2+2×√(3)×𝐢", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("(-2)^(1/4)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "root(8,4)/2+root(8,4)/2×𝐢", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("1+𝐢", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "1+𝐢", "1+𝐢", &globalContext, &store);
+  assertCalculationIs("√(-1)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "𝐢", "𝐢", &globalContext, &store);
+  assertCalculationIs("ln(-2)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "ln(-2)", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("√(-1)×√(-1)", DisplayOutput::ApproximateOnly, EqualSign::Unknown, nullptr, "-1", "-1", &globalContext, &store);
+  assertCalculationIs("(-8)^(1/3)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "1+√(3)×𝐢", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("(-8)^(2/3)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "-2+2×√(3)×𝐢", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("(-2)^(1/4)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "root(8,4)/2+root(8,4)/2×𝐢", nullptr, nullptr, &globalContext, &store);
 
   Poincare::Preferences::sharedPreferences()->setComplexFormat(Poincare::Preferences::ComplexFormat::Polar);
-  assertCalculationIs("1+𝐢", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "√(2)×ℯ^\u0012π/4×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("√(-1)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "ℯ^\u0012π/2×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("ln(-2)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "ln(-2)", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("√(-1)×√(-1)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "ℯ^\u00123.141593×𝐢\u0013", "ℯ^\u00123.1415926535898×𝐢\u0013", &globalContext, &store);
-  assertCalculationIs("(-8)^(1/3)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "2×ℯ^\u0012π/3×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("(-8)^(2/3)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "4×ℯ^\u0012\u00122×π\u0013/3×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
-  assertCalculationIs("(-2)^(1/4)", ::Calculation::Calculation::DisplayOutput::ExactAndApproximate, ::Calculation::Calculation::EqualSign::Approximation, "root(2,4)×ℯ^\u0012π/4×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("1+𝐢", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "√(2)×ℯ^\u0012π/4×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("√(-1)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "ℯ^\u0012π/2×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("ln(-2)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "ln(-2)", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("√(-1)×√(-1)", DisplayOutput::ExactAndApproximate, EqualSign::Unknown, nullptr, "ℯ^\u00123.141593×𝐢\u0013", "ℯ^\u00123.1415926535898×𝐢\u0013", &globalContext, &store);
+  assertCalculationIs("(-8)^(1/3)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "2×ℯ^\u0012π/3×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("(-8)^(2/3)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "4×ℯ^\u0012\u00122×π\u0013/3×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
+  assertCalculationIs("(-2)^(1/4)", DisplayOutput::ExactAndApproximate, EqualSign::Approximation, "root(2,4)×ℯ^\u0012π/4×𝐢\u0013", nullptr, nullptr, &globalContext, &store);
 
   Poincare::Preferences::sharedPreferences()->setComplexFormat(Poincare::Preferences::ComplexFormat::Cartesian);
 }

apps/clock_timer.cpp

@@ -0,0 +1,12 @@
+#include "clock_timer.h"
+#include "apps_container.h"
+
+ClockTimer::ClockTimer(AppsContainer * container) :
+  Timer(1),
+  m_container(container)
+{
+}
+
+bool ClockTimer::fire() {
+  return m_container->updateClock();
+}

apps/clock_timer.h

@@ -0,0 +1,16 @@
+#ifndef APPS_CLOCK_TIMER_H
+#define APPS_CLOCK_TIMER_H
+
+#include <escher.h>
+
+class AppsContainer;
+
+class ClockTimer : public Timer {
+public:
+  ClockTimer(AppsContainer * container);
+private:
+  bool fire() override;
+  AppsContainer * m_container;
+};
+
+#endif

apps/code/Makefile

@@ -15,6 +15,7 @@ app_code_src = $(addprefix apps/code/,\
   sandbox_controller.cpp \
   script_name_cell.cpp \
   script_parameter_controller.cpp \
+  toolbox_ion_keys.cpp \
 )
 
 app_code_test_src = $(addprefix apps/code/,\

apps/code/app.cpp

@@ -25,6 +25,7 @@ const Image * App::Descriptor::icon() {
 App::Snapshot::Snapshot() :
 #if EPSILON_GETOPT
   m_lockOnConsole(false),
+  m_hasBeenWiped(false),
 #endif
   m_scriptStore()
 {
@@ -49,10 +50,12 @@ bool App::Snapshot::lockOnConsole() const {
 }
 
 void App::Snapshot::setOpt(const char * name, const char * value) {
-  if (strcmp(name, "wipe") == 0) {
-    m_scriptStore.deleteAllScripts();
-  }
   if (strcmp(name, "script") == 0) {
+    if (!m_hasBeenWiped) {
+      m_hasBeenWiped = true;
+      m_scriptStore.deleteAllScripts();
+    }
+  
     char * separator = const_cast<char *>(UTF8Helper::CodePointSearch(value, ':'));
     if (*separator == 0) {
       return;
@@ -86,16 +89,18 @@ App::App(Snapshot * snapshot) :
       , snapshot->lockOnConsole()
 #endif
       ),
-  m_listFooter(&m_codeStackViewController, &m_menuController, &m_menuController, ButtonRowController::Position::Bottom, ButtonRowController::Style::EmbossedGrey, ButtonRowController::Size::Large),
+  m_listFooter(&m_codeStackViewController, &m_menuController, &m_menuController, ButtonRowController::Position::Bottom, ButtonRowController::Style::EmbossedGray, ButtonRowController::Size::Large),
   m_menuController(&m_listFooter, this, snapshot->scriptStore(), &m_listFooter),
   m_codeStackViewController(&m_modalViewController, &m_listFooter),
   m_variableBoxController(snapshot->scriptStore())
 {
+  Clipboard::sharedClipboard()->enterPython();
 }
 
 App::~App() {
   assert(!m_consoleController.inputRunLoopActive());
   deinitPython();
+  Clipboard::sharedClipboard()->exitPython();
 }
 
 bool App::handleEvent(Ion::Events::Event event) {
@@ -119,6 +124,10 @@ Toolbox * App::toolboxForInputEventHandler(InputEventHandler * textInput) {
   return &m_toolbox;
 }
 
+Code::toolboxIonKeys * App::toolboxIonKeys() {
+  return &m_toolboxIonKeys;
+}
+
 VariableBoxController * App::variableBoxForInputEventHandler(InputEventHandler * textInput) {
   return &m_variableBoxController;
 }

apps/code/app.h

@@ -9,6 +9,8 @@
 #include "script_store.h"
 #include "python_toolbox.h"
 #include "variable_box_controller.h"
+#include "../shared/shared_app.h"
+#include "toolbox_ion_keys.h"
 
 namespace Code {
 
@@ -21,7 +23,7 @@ public:
     App::Descriptor::ExaminationLevel examinationLevel() override;
     const Image * icon() override;
   };
-  class Snapshot : public ::App::Snapshot {
+  class Snapshot : public SharedApp::Snapshot {
   public:
     Snapshot();
     App * unpack(Container * container) override;
@@ -34,6 +36,7 @@ public:
   private:
 #if EPSILON_GETOPT
     bool m_lockOnConsole;
+    bool m_hasBeenWiped;
 #endif
     ScriptStore m_scriptStore;
   };
@@ -73,7 +76,9 @@ public:
 
   VariableBoxController * variableBoxController() { return &m_variableBoxController; }
 
-  static constexpr int k_pythonHeapSize = 32768;
+  static constexpr int k_pythonHeapSize = 100000;
+
+  Code::toolboxIonKeys * toolboxIonKeys();
 
 private:
   /* Python delegate:
@@ -91,6 +96,7 @@ private:
   StackViewController m_codeStackViewController;
   PythonToolbox m_toolbox;
   VariableBoxController m_variableBoxController;
+  Code::toolboxIonKeys m_toolboxIonKeys;
 };
 
 }

apps/code/base.es.i18n

@@ -12,4 +12,4 @@ ImportedModulesAndScripts = "Módulos y archivos importados"
 NoWordAvailableHere = "No hay ninguna palabra disponible aquí."
 ScriptInProgress = "Archivo en curso"
 ScriptOptions = "Opciones del archivo"
-ScriptSize = "Script size"
+ScriptSize = "Tamaño del script"

apps/code/base.fr.i18n

@@ -12,4 +12,4 @@ ImportedModulesAndScripts = "Modules et scripts importés"
 NoWordAvailableHere = "Aucun mot disponible à cet endroit."
 ScriptInProgress = "Script en cours"
 ScriptOptions = "Options de script"
-ScriptSize = "Script size"
+ScriptSize = "Taille du script"

apps/code/base.hu.i18n

@@ -1,15 +1,15 @@
-AddScript = "Script hozzadáadása"
+AddScript = "Script hozzáadása"
 AllowedCharactersaz09 = "Engedélyezett karakterek: a-z, 0-9, _"
-Autocomplete = "Autocomplete"
+Autocomplete = "Önkiegészítés"
 AutoImportScript = "Script automata importálása"
-BuiltinsAndKeywords = "Builtins and keywords"
+BuiltinsAndKeywords = "Beépített fonkciók és szókincs"
 Console = "Konzol"
 DeleteScript = "Script törlése"
 DuplicateScript = "Script másolása"
 ExecuteScript = "Script indítása"
-FunctionsAndVariables = "Függvények és változók"
-ImportedModulesAndScripts = "Imported modules and scripts"
-NoWordAvailableHere = "No word available here."
-ScriptInProgress = "Script in progress"
+FunctionsAndVariables = "Fonktiók és változók"
+ImportedModulesAndScripts = "Importált scriptek és modulok"
+NoWordAvailableHere = "Nincs rendelkezésre álló szó."
+ScriptInProgress = "Script müködésben"
 ScriptOptions = "Script beállítások"
-ScriptSize = "Script size"
+ScriptSize = "Script mérete"

apps/code/base.it.i18n

@@ -1,7 +1,7 @@
 AddScript = "Aggiungere script"
 AllowedCharactersaz09 = "Caratteri consentiti : a-z, 0-9, _"
 Autocomplete = "Autocompletamento"
-AutoImportScript = "Importazione automatica dello script"
+AutoImportScript = "Auto importazione nella console"
 BuiltinsAndKeywords = "Funzioni native e parole chiave"
 Console = "Console d'esecuzione"
 DeleteScript = "Eliminare lo script"

apps/code/catalog.de.i18n

@@ -30,8 +30,8 @@ PythonColor = "Definiere eine RGB-Farbe"
 PythonColorBlack = "Black color"
 PythonColorBlue = "Blue color"
 PythonColorBrown = "Brown color"
+PythonColorGray = "Gray color"
 PythonColorGreen = "Green color"
-PythonColorGrey = "Grey color"
 PythonColorOrange = "Orange color"
 PythonColorPink = "Pink color"
 PythonColorPurple = "Purple color"
@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Zählt wie oft x vorkommt"
 PythonDegrees = "x von Radian zu Grad umwandeln"
 PythonDivMod = "Quotient und Rest"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Schreibt Text bei (x,y)"
 PythonErf = "Fehlerfunktion"
 PythonErfc = "Complementary error function"
@@ -69,6 +70,11 @@ PythonImportKandinsky = "kandinsky Modul importieren"
 PythonImportRandom = "random Modul importieren"
 PythonImportMath = "math Modul importieren"
 PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
+PythonImportOs = "os Modul importieren"
+PythonOsUname = "Informieren Sie sich über das System"
+PythonOsRemove = "Datei namens Dateiname entfernen"
+PythonOsRename = "Datei mit altem Namen in neuen Namen umbenennen"
+PythonOsListdir = "Dateien im Speicher auflisten"
 PythonImportTime = "time Modul importieren"
 PythonImportTurtle = "turtle Modul importieren"
 PythonIndex = "Index, bei dem x zuerst vorkommt"
@@ -81,52 +87,6 @@ PythonIsInfinite = "Prüft ob x unendlich ist"
 PythonIsNaN = "Prüft ob x NaN ist"
 PythonIsKeyDown = "true wenn k gedrückt ist"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "Linke Pfeiltaste"
-PythonKeyUp = "Pfeiltaste nach oben"
-PythonKeyDown = "Pfeiltaste nach unten"
-PythonKeyRight = "Rechte Pfeiltaste"
-PythonKeyOk = "OK Taste"
-PythonKeyBack = "ZURÜCK Taste"
-PythonKeyHome = "HOME Taste"
-PythonKeyOnOff = "AN/AUS Taste"
-PythonKeyShift = "SHIFT Taste"
-PythonKeyAlpha = "ALPHA Taste"
-PythonKeyXnt = "X,N,T Taste"
-PythonKeyVar = "VAR Taste"
-PythonKeyToolbox = "WERKZEUGBOX Taste"
-PythonKeyBackspace = "LÖSCHEN Taste"
-PythonKeyExp = "EXPONENTIAL Taste"
-PythonKeyLn = "NATURAL LOGARITHM Taste"
-PythonKeyLog = "DECIMAL LOGARITHM Taste"
-PythonKeyImaginary = "IMAGINÄRES I Taste"
-PythonKeyComma = "KOMMA Taste"
-PythonKeyPower = "HOCH Taste"
-PythonKeySine = "SINUS Taste"
-PythonKeyCosine = "COSINUS Taste"
-PythonKeyTangent = "TANGENZ Taste"
-PythonKeyPi = "PI Taste"
-PythonKeySqrt = "WURZEL Taste"
-PythonKeySquare = "QUADRAT Taste"
-PythonKeySeven = "7 Taste"
-PythonKeyEight = "8 Taste"
-PythonKeyNine = "9 Taste"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 Taste"
-PythonKeyFive = "5 Taste"
-PythonKeySix = "6 Taste"
-PythonKeyMultiplication = "MULTIPLIKATIONSTASTE"
-PythonKeyDivision = "DIVISIONSTASTE"
-PythonKeyOne = "1 Taste"
-PythonKeyTwo = "2 Taste"
-PythonKeyThree = "3 Taste"
-PythonKeyPlus = "PLUS Taste"
-PythonKeyMinus = "MINUS Taste"
-PythonKeyZero = "0 Taste"
-PythonKeyDot = "PUNKT Taste"
-PythonKeyEe = "10 HOCH X Taste"
-PythonKeyAns = "ANS Taste"
-PythonKeyExe = "EXE Taste"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"

apps/code/catalog.en.i18n

@@ -1,7 +1,7 @@
 PythonPound = "Comment"
 PythonPercent = "Modulo"
 Python1J = "Imaginary i"
-PythonLF = "line feed"
+PythonLF = "Line feed"
 PythonTab = "Tabulation"
 PythonAmpersand = "Bitwise and"
 PythonSymbolExp = "Bitwise exclusive or"
@@ -30,8 +30,8 @@ PythonColor = "Define a rgb color"
 PythonColorBlack = "Black color"
 PythonColorBlue = "Blue color"
 PythonColorBrown = "Brown color"
+PythonColorGray = "Gray color"
 PythonColorGreen = "Green color"
-PythonColorGrey = "Grey color"
 PythonColorOrange = "Orange color"
 PythonColorPink = "Pink color"
 PythonColorPurple = "Purple color"
@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "LEFT ARROW key"
-PythonKeyUp = "UP ARROW key"
-PythonKeyDown = "DOWN ARROW key"
-PythonKeyRight = "RIGHT ARROW key"
-PythonKeyOk = "OK key"
-PythonKeyBack = "BACK key"
-PythonKeyHome = "HOME key"
-PythonKeyOnOff = "ON/OFF key"
-PythonKeyShift = "SHIFT key"
-PythonKeyAlpha = "ALPHA key"
-PythonKeyXnt = "X,N,T key"
-PythonKeyVar = "VAR key"
-PythonKeyToolbox = "TOOLBOX key"
-PythonKeyBackspace = "BACKSPACE key"
-PythonKeyExp = "EXPONENTIAL key"
-PythonKeyLn = "NATURAL LOGARITHM key"
-PythonKeyLog = "DECIMAL LOGARITHM key"
-PythonKeyImaginary = "IMAGINARY I key"
-PythonKeyComma = "COMMA key"
-PythonKeyPower = "POWER key"
-PythonKeySine = "SINE key"
-PythonKeyCosine = "COSINE key"
-PythonKeyTangent = "TANGENT key"
-PythonKeyPi = "PI key"
-PythonKeySqrt = "SQUARE ROOT key"
-PythonKeySquare = "SQUARE key"
-PythonKeySeven = "7 key"
-PythonKeyEight = "8 key"
-PythonKeyNine = "9 key"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 key"
-PythonKeyFive = "5 key"
-PythonKeySix = "6 key"
-PythonKeyMultiplication = "MULTIPLICATION key"
-PythonKeyDivision = "DIVISION key"
-PythonKeyOne = "1 key"
-PythonKeyTwo = "2 key"
-PythonKeyThree = "3 key"
-PythonKeyPlus = "PLUS key"
-PythonKeyMinus = "MINUS key"
-PythonKeyZero = "0 key"
-PythonKeyDot = "DOT key"
-PythonKeyEe = "10 POWER X key"
-PythonKeyAns = "ANS key"
-PythonKeyExe = "EXE key"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"
@@ -196,6 +151,11 @@ PythonTurtleSpeed = "Drawing speed between 0 and 10"
 PythonTurtleWrite = "Display a text"
 PythonUniform = "Floating point number in [a,b]"
 PythonImportTime = "Import time module"
+PythonImportOs = "Import os module"
+PythonOsUname = "Get infos about the system"
+PythonOsRemove = "Remove file named filename"
+PythonOsRename = "Rename file oldname to newname"
+PythonOsListdir = "List files in memory"
 PythonTimePrefix = "time module function prefix"
 PythonTimeSleep = "Wait for n second"
 PythonMonotonic = "Return monotonic time"

apps/code/catalog.es.i18n

@@ -30,8 +30,8 @@ PythonColor = "Define a rgb color"
 PythonColorBlack = "Black color"
 PythonColorBlue = "Blue color"
 PythonColorBrown = "Brown color"
+PythonColorGray = "Gray color"
 PythonColorGreen = "Green color"
-PythonColorGrey = "Grey color"
 PythonColorOrange = "Orange color"
 PythonColorPink = "Pink color"
 PythonColorPurple = "Purple color"
@@ -45,6 +45,7 @@ PythonCosh = "Hyperbolic cosine"
 PythonCount = "Count the occurrences of x"
 PythonDegrees = "Convert x from radians to degrees"
 PythonDivMod = "Quotient and remainder"
+PythonDrawLine = "Draw a line"
 PythonDrawString = "Display a text from pixel (x,y)"
 PythonErf = "Error function"
 PythonErfc = "Complementary error function"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Check if x is infinity"
 PythonIsKeyDown = "Return True if the k key is down"
 PythonIsNaN = "Check if x is a NaN"
 PythonKandinskyFunction = "kandinsky module function prefix"
-PythonKeyLeft = "LEFT ARROW key"
-PythonKeyUp = "UP ARROW key"
-PythonKeyDown = "DOWN ARROW key"
-PythonKeyRight = "RIGHT ARROW key"
-PythonKeyOk = "OK key"
-PythonKeyBack = "BACK key"
-PythonKeyHome = "HOME key"
-PythonKeyOnOff = "ON/OFF key"
-PythonKeyShift = "SHIFT key"
-PythonKeyAlpha = "ALPHA key"
-PythonKeyXnt = "X,N,T key"
-PythonKeyVar = "VAR key"
-PythonKeyToolbox = "TOOLBOX key"
-PythonKeyBackspace = "BACKSPACE key"
-PythonKeyExp = "EXPONENTIAL key"
-PythonKeyLn = "NATURAL LOGARITHM key"
-PythonKeyLog = "DECIMAL LOGARITHM key"
-PythonKeyImaginary = "IMAGINARY I key"
-PythonKeyComma = "COMMA key"
-PythonKeyPower = "POWER key"
-PythonKeySine = "SINE key"
-PythonKeyCosine = "COSINE key"
-PythonKeyTangent = "TANGENT key"
-PythonKeyPi = "PI key"
-PythonKeySqrt = "SQUARE ROOT key"
-PythonKeySquare = "SQUARE key"
-PythonKeySeven = "7 key"
-PythonKeyEight = "8 key"
-PythonKeyNine = "9 key"
-PythonKeyLeftParenthesis = "LEFT PARENTHESIS key"
-PythonKeyRightParenthesis = "RIGHT PARENTHESIS key"
-PythonKeyFour = "4 key"
-PythonKeyFive = "5 key"
-PythonKeySix = "6 key"
-PythonKeyMultiplication = "MULTIPLICATION key"
-PythonKeyDivision = "DIVISION key"
-PythonKeyOne = "1 key"
-PythonKeyTwo = "2 key"
-PythonKeyThree = "3 key"
-PythonKeyPlus = "PLUS key"
-PythonKeyMinus = "MINUS key"
-PythonKeyZero = "0 key"
-PythonKeyDot = "DOT key"
-PythonKeyEe = "10 POWER X key"
-PythonKeyAns = "ANS key"
-PythonKeyExe = "EXE key"
 PythonLdexp = "Return x*(2**i), inverse of frexp"
 PythonLength = "Length of an object"
 PythonLgamma = "Log-gamma function"
@@ -196,6 +151,11 @@ PythonTurtleSpeed = "Drawing speed between 0 and 10"
 PythonTurtleWrite = "Display a text"
 PythonUniform = "Floating point number in [a,b]"
 PythonImportTime = "Import time module"
+PythonImportOs = "Import os module"
+PythonOsUname = " Información del sistema "
+PythonOsRemove = "Eliminar un archivo"
+PythonOsRename = "Renombrar archivo"
+PythonOsListdir = "Archivos de la lista"
 PythonTimePrefix = "time module function prefix"
 PythonTimeSleep = "Esperar n segundos"
 PythonMonotonic = "Tiempo monótono de retorno"

apps/code/catalog.fr.i18n

@@ -30,8 +30,8 @@ PythonColor = "Définit une couleur rvb"
 PythonColorBlack = "Couleur noire"
 PythonColorBlue = "Couleur bleue"
 PythonColorBrown = "Couleur marron"
+PythonColorGray = "Couleur grise"
 PythonColorGreen = "Couleur verte"
-PythonColorGrey = "Couleur grise"
 PythonColorOrange = "Couleur orange"
 PythonColorPink = "Couleur rose"
 PythonColorPurple = "Couleur violette"
@@ -45,6 +45,7 @@ PythonCosh = "Cosinus hyperbolique"
 PythonCount = "Compte les occurrences de x"
 PythonDegrees = "Conversion de radians en degrés"
 PythonDivMod = "Quotient et reste"
+PythonDrawLine = "Trace une ligne"
 PythonDrawString = "Affiche un texte au pixel (x,y)"
 PythonErf = "Fonction d'erreur"
 PythonErfc = "Fonction d'erreur complémentaire"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Teste si x est infini"
 PythonIsKeyDown = "Renvoie True si touche k enfoncée"
 PythonIsNaN = "Teste si x est NaN"
 PythonKandinskyFunction = "Préfixe fonction module kandinsky"
-PythonKeyLeft = "Touche FLECHE GAUCHE"
-PythonKeyUp = "Touche FLECHE HAUT"
-PythonKeyDown = "Touche FLECHE BAS"
-PythonKeyRight = "Touche FLECHE DROITE"
-PythonKeyOk = "Touche OK"
-PythonKeyBack = "Touche RETOUR"
-PythonKeyHome = "Touche HOME"
-PythonKeyOnOff = "Touche ON/OFF"
-PythonKeyShift = "Touche SHIFT"
-PythonKeyAlpha = "Touche ALPHA"
-PythonKeyXnt = "Touche X,N,T"
-PythonKeyVar = "Touche VAR"
-PythonKeyToolbox = "Touche BOITE A OUTILS"
-PythonKeyBackspace = "Touche EFFACER"
-PythonKeyExp = "Touche EXPONENTIELLE"
-PythonKeyLn = "Touche LOGARITHME NEPERIEN"
-PythonKeyLog = "Touche LOGARITHME DECIMAL"
-PythonKeyImaginary = "Touche I IMAGINAIRE"
-PythonKeyComma = "Touche VIRGULE"
-PythonKeyPower = "Touche PUISSANCE"
-PythonKeySine = "Touche SINUS"
-PythonKeyCosine = "Touche COSINUS"
-PythonKeyTangent = "Touche TANGENTE"
-PythonKeyPi = "Touche PI"
-PythonKeySqrt = "Touche RACINE CARREE"
-PythonKeySquare = "Touche CARRE"
-PythonKeySeven = "Touche 7"
-PythonKeyEight = "Touche 8"
-PythonKeyNine = "Touche 9"
-PythonKeyLeftParenthesis = "Touche PARENTHESE GAUCHE"
-PythonKeyRightParenthesis = "Touche PARENTHESE DROITE"
-PythonKeyFour = "Touche 4"
-PythonKeyFive = "Touche 5"
-PythonKeySix = "Touche 6"
-PythonKeyMultiplication = "Touche MULTIPLICATION"
-PythonKeyDivision = "Touche DIVISION"
-PythonKeyOne = "Touche 1"
-PythonKeyTwo = "Touche 2"
-PythonKeyThree = "Touche 3"
-PythonKeyPlus = "Touche PLUS"
-PythonKeyMinus = "Touche MOINS"
-PythonKeyZero = "Touche 0"
-PythonKeyDot = "Touche POINT"
-PythonKeyEe = "Touche 10 PUISSANCE X"
-PythonKeyAns = "Touche ANS"
-PythonKeyExe = "Touche EXE"
 PythonLdexp = "Inverse de frexp : x*(2**i)"
 PythonLength = "Longueur d'un objet"
 PythonLgamma = "Logarithme de la fonction gamma"
@@ -196,21 +151,26 @@ PythonTurtleSpeed = "Vitesse du tracé entre 0 et 10"
 PythonTurtleWrite = "Affiche un texte"
 PythonUniform = "Nombre décimal dans [a,b]"
 PythonImportTime = "Importation du module temps"
+PythonImportOs = "Importation du module os"
+PythonOsUname = "Donne des infos sur le système"
+PythonOsRemove = "Supprime le fichier nommé filename"
+PythonOsRename = "Renomme oldname en newname"
+PythonOsListdir = "Liste les fichiers"
 PythonTimePrefix = "Préfixe fonction du module temps"
 PythonTimeSleep = "Attendre n secondes"
-PythonMonotonic = "Retourne le temps monotonic"
+PythonMonotonic = "Retourne le temps monotone"
 PythonFileOpen = "Ouvre un fichier"
 PythonFileSeekable = "Indique si seek peut être utilisé"
 PythonFileSeek = "Déplace le curseur interne"
 PythonFileTell = "Donne la posititon du curseur"
 PythonFileClose = "Ferme un fichier"
 PythonFileClosed = "True si le fichier a été fermé"
-PythonFileRead = "Lis jusqu'à size bytes"
-PythonFileWrite = "Écris b dans le fichier"
-PythonFileReadline = "Lis une ligne ou jusqu'à size bytes"
-PythonFileReadlines = "Lis une liste de lignes"
+PythonFileRead = "Lit jusqu'à size bytes"
+PythonFileWrite = "Écrit b dans le fichier"
+PythonFileReadline = "Lit une ligne ou jusqu'à size bytes"
+PythonFileReadlines = "Lit une liste de lignes"
 PythonFileTruncate = "Redimensionne le fichier"
-PythonFileWritelines = "Écris une liste de lignes"
+PythonFileWritelines = "Écrit une liste de lignes"
 PythonFileName = "Nom du fichier"
 PythonFileMode = "Mode d'ouverture du fichier"
 PythonFileReadable = "Indique si read peut être utilisé"

apps/code/catalog.hu.i18n

@@ -1,217 +1,177 @@
 PythonPound = "Megjegyzés"
 PythonPercent = "Modulo"
 Python1J = "Képzeletbeli i"
-PythonLF = "Line feed"
+PythonLF = "Enter"
 PythonTab = "Táblázat"
-PythonAmpersand = "Bitwise és"
-PythonSymbolExp = "Bitwise exkluzív vagy"
-PythonVerticalBar = "Bitwise vagy"
+PythonAmpersand = "Logikus és"
+PythonSymbolExp = "logikus exkluzív vagy pedig"
+PythonVerticalBar = "logikus vagy pedig"
 PythonImag = "z képzeletbeli része"
 PythonReal = "z valódi része"
-PythonSingleQuote = "Egyetlen idézet"
-PythonAbs = "Abszolút érték / nagyság"
-PythonAcos = "Arc koszinusz"
-PythonAcosh = "Íves hiperbolikus koszinusz"
-PythonAppend = "x hozzáadása a lista végéhez"
-PythonArrow = "Arrow from (x,y) to (x+dx,y+dy)"
-PythonAsin = "Arc szinusz"
-PythonAsinh = "Íves hiperbolikus szinusz"
-PythonAtan = "Arc érintö"
-PythonAtan2 = "Visszatérés atan (y / x)"
-PythonAtanh = "Arc hiperbolikus érintö"
-PythonAxis = "Set axes to (xmin,xmax,ymin,ymax)"
-PythonBar = "Draw a bar plot with x values"
+PythonSingleQuote = "apostróf"
+PythonAbs = "Abszolút érték/nagyság"
+PythonAcos = "Ív (arc) koszinusz"
+PythonAcosh = "Hiperbolikus arc koszinusz"
+PythonAppend = "Lista végére hozzáadni x-et"
+PythonArrow = "(x,y) nyíla (x+dx,y+dy) nyílához"
+PythonAsin = "Ív (arc) szinusz"
+PythonAsinh = "Hiperbolikus ív (arc) szinusz"
+PythonAtan = "Ív (arc) érintö (tan)"
+PythonAtan2 = "atan(y/x) sámolása"
+PythonAtanh = "Hiperbolikus ív (arc) érintö (atan)"
+PythonAxis = "Tengelyeket (xmin,xmax,ymin,ymax)-ra állitani"
+PythonBar = "Az x lista oszlopdiagramja"
 PythonBin = "Egész szám konvertálása binárisra"
 PythonCeil = "Mennyezet"
 PythonChoice = "Véletlenszerü szám a listában"
 PythonClear = "A lista ürítése"
 PythonCmathFunction = "cmath modul funkció elötag"
-PythonColor = "Rgb szín meghatározása"
+PythonColor = "Rgb (pzk) szín allítása"
 PythonColorBlack = "Fekete szín"
 PythonColorBlue = "Kék szín"
 PythonColorBrown = "Barna szín"
 PythonColorGreen = "Zöld szín"
-PythonColorGrey = "Szürke szín"
+PythonColorGray = "Szürke szín"
 PythonColorOrange = "Narancssárga szín"
 PythonColorPink = "Rózsaszín szín"
 PythonColorPurple = "Lila szín"
 PythonColorRed = "Piros szín"
-PythonColorWhite = "White color"
+PythonColorWhite = "Fehér szín"
 PythonColorYellow = "Sárga szín"
 PythonComplex = "A + ib visszaadása"
-PythonCopySign = "Visszatérés x-val y jelével"
+PythonCopySign = "X visszaadása y jelével"
 PythonCos = "Koszinusz"
 PythonCosh = "Hiperbolikus koszinusz"
 PythonCount = "Számolja az x elöfordulását"
-PythonDegrees = "x konvertálása x-röl radiánokra fokokra"
+PythonDegrees = "x konvertálása radiánokrol fokokra"
 PythonDivMod = "Hányados és maradék"
-PythonDrawString = "Szöveg megjelenítése pixelböl (x, y)"
+PythonDrawLine = "Húzzon egy vonalat "
+PythonDrawString = "Szöveg megjelenítése (x, y)-en"
 PythonErf = "Hiba funkció"
-PythonErfc = "Kiegészítö hibafunkció"
+PythonErfc = "Kiegészítö hiba funkció"
 PythonEval = "Visszaadja az értékelt kifejezést"
 PythonExp = "Exponenciális függvény"
-PythonExpm1 = "Számítsuk ki az exp (x) -1-et"
+PythonExpm1 = "exp(x)-1 sámitása"
 PythonFabs = "Abszolút érték"
-PythonFillRect = "Töltsön meg egy téglalapot pixelnél (x, y)"
-PythonFloat = "x konvertálása float-ra"
-PythonFloor = "Emelet"
+PythonFillRect = "Téglalap töltése"
+PythonFloat = "Konvertálása tizedes számra"
+PythonFloor = "Egész része"
 PythonFmod = "a modulo b"
-PythonFrExp = "Mantissa és az x exponense"
+PythonFrExp = "X mantissája és kiállítója"
 PythonGamma = "Gamma funkció"
-PythonGetPixel = "Visszatérési pixel (x, y) szín"
-PythonGetrandbits = "Egész szám k véletlen bittel"
-PythonGrid = "Toggle the visibility of the grid"
-PythonHex = "Egész szám konvertálása hexadecimálisra"
-PythonHist = "Draw the histogram of x"
+PythonGetPixel = "Visszatéríti (x,y) színét"
+PythonGetrandbits = "Váletlenszám visszatérítése k biten"
+PythonGrid = "Rács megjelenítése/elrejtése"
+PythonHex = "Decimális szám konvertálása hexadecimális számra"
+PythonHist = "x hisztográmiája"
 PythonImportCmath = "cmath modul importálása"
 PythonImportIon = "Ion modul importálása"
 PythonImportKandinsky = "Kandinsky modul importálása"
 PythonImportRandom = "Véletlenszerü modul importálása"
-PythonImportMath = "Import matematikai modul"
-PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
-PythonImportTime = "Idömodul importálása"
-PythonImportTurtle = "Import teknös modul"
+PythonImportMath = "math modul importálása"
+PythonImportMatplotlibPyplot = "matplotlib.pyplot modul importálása"
+PythonImportTurtle = "turtle modul importálása"
+PythonImportTime = "time modul importálása"
 PythonIndex = "Az elsö x esemény indexe"
-PythonInput = "Érték kérése"
-PythonInsert = "Helyezzen x-t az i indexbe a listában"
-PythonInt = "x konvertálása egész számra"
+PythonInput = "Irjon egy értéket (számot)"
+PythonInsert = "x-et i. pozícióra helyezze a listában"
+PythonInt = "egész számra konvertálás"
 PythonIonFunction = "ion modul funkció elötag"
-PythonIsFinite = "Ellenörizze, hogy x véges-e"
-PythonIsInfinite = "Ellenörizze, hogy x végtelen-e"
-PythonIsKeyDown = "True true, ha a k gomb le van nyomva"
-PythonIsNaN = "Ellenörizze, hogy x nem NaN"
-PythonKandinskyFunction = "kandinsky modul function prefix"
-PythonKeyLeft = "Balra nyíl gomb"
-PythonKeyUp = "FEL NYÍL gomb"
-PythonKeyDown = "LE nyíl gomb"
-PythonKeyRight = "JOBB NYÍL gomb"
-PythonKeyOk = "OK gomb"
-PythonKeyBack = "VISSZA kulcs"
-PythonKeyHome = "HOME kulcs"
-PythonKeyOnOff = "BE / KI gomb"
-PythonKeyShift = "SHIFT kulcs"
-PythonKeyAlpha = "ALPHA kulcs"
-PythonKeyXnt = "X, N, T kulcs"
-PythonKeyVar = "VAR kulcs"
-PythonKeyToolbox = "TOOLBOX kulcs"
-PythonKeyBackspace = "BACKSPACE kulcs"
-PythonKeyExp = "EXPONENTIAL kulcs"
-PythonKeyLn = "NATURAL LOGARITHM kulcs"
-PythonKeyLog = "DECIMAL LOGARITHM kulcs"
-PythonKeyImaginary = "IMAGINÁRIS I kulcs"
-PythonKeyComma = "COMMA kulcs"
-PythonKeyPower = "POWER kulcs"
-PythonKeySine = "SINE kulcs"
-PythonKeyCosine = "KOSZIN kulcs"
-PythonKeyTangent = "TANGENT kulcs"
-PythonKeyPi = "PI kulcs"
-PythonKeySqrt = "SQUARE ROOT kulcs"
-PythonKeySquare = "SQUARE kulcs"
-PythonKeySeven = "7 kulcs"
-PythonKeyEight = "8 kulcs"
-PythonKeyNine = "9 kulcs"
-PythonKeyLeftParenthesis = "Bal oldali PARENTHESIS kulcs"
-PythonKeyRightParenthesis = "JOGOS SZÜLETÉS kulcs"
-PythonKeyFour = "4 kulcs"
-PythonKeyFive = "5 kulcs"
-PythonKeySix = "6 kulcs"
-PythonKeyMultiplication = "TÖBB MüKÖDÉS kulcs"
-PythonKeyDivision = "DIVISION kulcs"
-PythonKeyOne = "1 kulcs"
-PythonKeyTwo = "2 kulcs"
-PythonKeyThree = "3 kulcs"
-PythonKeyPlus = "PLUS kulcs"
-PythonKeyMinus = "MINUS kulcs"
-PythonKeyZero = "0 kulcs"
-PythonKeyDot = "DOT kulcs"
-PythonKeyEe = "10 POWER X kulcs"
-PythonKeyAns = "ANS kulcs"
-PythonKeyExe = "EXE kulcs"
-PythonLdexp = "Visszatérés x * (2 ** i), inverz a frexp értékhez"
-PythonLength = "Objektum hossza"
-PythonLgamma = "Log-gamma funkció"
-PythonLog = "Logaritmus az alap"
-PythonLog10 = "Logaritmus az alaphoz 10"
-PythonLog2 = "Logaritmus az alaphoz 2"
-PythonMathFunction = "matematikai modul funkció elötag"
-PythonMatplotlibPyplotFunction = "matplotlib.pyplot module prefix"
+PythonIsFinite = "x véges-e"
+PythonIsInfinite = "x végtelen-e"
+PythonIsKeyDown = "True-t válaszol ha a k gomb le van nyomva"
+PythonIsNaN = "Ellenörizze hogy x nem NaN"
+PythonKandinskyFunction = "kandinsky modul funkció elötag"
+PythonLdexp = "frexp ellentéte : x*(2**i)"
+PythonLength = "Egy targy hossza"
+PythonLgamma = "Gamma funkció logaritmusa"
+PythonLog = "a alapú logaritmus"
+PythonLog10 = "Decimális logaritmus"
+PythonLog2 = "Bináris logaritmus"
+PythonMathFunction = "math modul funkció elötag"
+PythonMatplotlibPyplotFunction = "matplotlib.pyplot elötag"
 PythonMax = "Maximum"
 PythonMin = "Minimum"
-PythonModf = "Az x tört és egész részei"
-PythonMonotonic = "A monoton óra értéke"
-PythonOct = "Egész szám konvertálása oktális értékre"
-PythonPhase = "z fázis"
-PythonPlot = "Plot y versus x as lines"
-PythonPolar = "z poláris koordinátákban"
-PythonPop = "Az utolsó elem eltávolítása és visszaküldése"
-PythonPower = "x emelve az y teljesítményre"
-PythonPrint = "Objektum nyomtatása"
-PythonRadians = "x konvertálása x fokról radiánra"
-PythonRandint = "Véletlen egész szám [a, b] -ben"
-PythonRandom = "Lebegöpontos szám [0,1-ben ["
-PythonRandomFunction = "véletlenszerü modul funkció elötag"
-PythonRandrange = "Véletlen szám a tartományban (start, stop)"
-PythonRangeStartStop = "Lista az elejétöl a stop-1-ig"
-PythonRangeStop = "Lista 0-tól stop-1-ig"
-PythonRect = "z derékszögü koordinátákban"
-PythonRemove = "Távolítsa el az x elsö elöfordulását"
-PythonReverse = "A lista elemeinek megfordítása"
-PythonRound = "N számjegyre kerekítve"
-PythonScatter = "Draw a scatter plot of y versus x"
-PythonSeed = "Inicializálja a véletlenszám-generátort"
-PythonSetPixel = "Színes pixel (x, y)"
-PythonShow = "Display the figure"
-PythonSin = "Sine"
+PythonModf = "x-nek tört és egész részei"
+PythonMonotonic = "Az óra értékét adja vissza"
+PythonOct = "Decimális szám konvertálása octális számra"
+PythonPhase = "z fázisa"
+PythonPlot = "y-t jelöli x függvényében"
+PythonPolar = "Verctorizálni"
+PythonPop = "Az utolsó elemet el törölni"
+PythonPower = "x y. kitevö"
+PythonPrint = "Ki irni a elemeket"
+PythonRadians = "Fokról radiánra konvertálni"
+PythonRandint = "Véletlen egész szám [a;b] -ban"
+PythonRandom = "Decimális szám [0;1] -ban"
+PythonRandomFunction = "random modul funkció elötag"
+PythonRandrange = "Véletlen szám range(start,stop)-ban"
+PythonRangeStartStop = "start-tol stop-ig listája"
+PythonRangeStop = "0 tol stop-ig lista"
+PythonRect = "Algebrai számra konvertálni"
+PythonRemove = "Elsö x elöfordulását törolni"
+PythonReverse = "A lista elemeit megfordítani (másik irány)"
+PythonRound = "N számjegyre kerekítni"
+PythonScatter = "(x,y) halmaza"
+PythonSeed = "Inicializálni a véletlenszám-választót"
+PythonSetPixel = "Az (x,y) pixel-t ki szinezni"
+PythonShow = "Mutassa az ábrát"
+PythonSin = "Szinusz"
 PythonSinh = "Hiperbolikus szinusz"
-PythonSleep = "A végrehajtás felfüggesztése t másodpercre"
-PythonSort = "A lista rendezése"
+PythonSleep = "t másodpercre meg állitani a programmot"
+PythonSort = "A listát rendezni"
 PythonSqrt = "Négyzetgyök"
-PythonSum = "Összegzi a lista elemeit"
-PythonTan = "Érintö"
-PythonTanh = "Hiperbolikus érintö"
-PythonText = "Display a text at (x,y) coordinates"
-PythonTimeFunction = "idömodul funkció elötag"
-PythonTrunc = "x egészre csonkítva"
-PythonTurtleBackward = "Visszalépés x pixelrel"
-PythonTurtleCircle = "r pixel sugarú kör"
-PythonTurtleColor = "Állítsa be az toll színét"
-PythonTurtleColorMode = "Set the color mode to 1.0 or 255"
-PythonTurtleForward = "Ugrás x pixelrel"
-PythonTurtleFunction = "teknös modul funkció elötag"
-PythonTurtleGoto = "Mozgatás (x, y) koordinátákra"
-PythonTurtleHeading = "Visszaadja az aktuális címsort"
+PythonSum = "Összeadni a lista elemeit"
+PythonTan = "Érintö (tan)"
+PythonTanh = "Hiperbolikus érintö (tan)"
+PythonText = "(x,y) nél egy szöveget irni"
+PythonTimeFunction = "time funkció elötag"
+PythonTrunc = "Egész csonka (?)"
+PythonTurtleBackward = "x pixelt hátra"
+PythonTurtleCircle = "r pixel sugarú kört rajzolni"
+PythonTurtleColor = "Toll szinét beállitani"
+PythonTurtleColorMode = "Szin módot 1.0-ra vagy 255-ra állitani"
+PythonTurtleForward = "x pixelt elölre"
+PythonTurtleFunction = "turtle modul funkció elötag"
+PythonTurtleGoto = "Menjen a (x,y) koordinátákra"
+PythonTurtleHeading = "Visszaadja az aktuális irányt"
 PythonTurtleHideturtle = "A teknös elrejtése"
-PythonTurtleIsdown = "Visszatérés igazhoz, ha az toll lefelé"
-PythonTurtleLeft = "Forduljon fokkal balra"
+PythonTurtleIsdown = "True-t válaszol ha a toll irás pozícióban van"
+PythonTurtleLeft = "a fokkot forduljon balra"
 PythonTurtlePendown = "Húzza le a tollat"
 PythonTurtlePensize = "Állítsa a vonalvastagságot x pixelre"
 PythonTurtlePenup = "Húzza fel a tollat"
-PythonTurtlePosition = "Az aktuális (x, y) hely visszaadása"
-PythonTurtleReset = "A rajz visszaállítása"
-PythonTurtleRight = "Forduljon fokkal jobbra"
-PythonTurtleSetheading = "Állítsa be a tájolást fokokra"
-PythonTurtleSetposition = "A helymeghatározás"
-PythonTurtleShowturtle = "Mutasd a teknösöt"
+PythonTurtlePosition = "Az aktuális (x,y) pozíciót visszaadása"
+PythonTurtleReset = "Visszaállitani a rajzot (torléssel)"
+PythonTurtleRight = "a fokkot forduljon jobbra"
+PythonTurtleSetheading = "a fokokra állítja be az irányt"
+PythonTurtleSetposition = "A teknös pozicioját allitja"
+PythonTurtleShowturtle = "A teknöst meg mutatni"
 PythonTurtleSpeed = "Rajzolási sebesség 0 és 10 között"
-PythonTurtleWrite = "Display a text"
-PythonUniform = "Lebegöpontos szám [a, b] -ben"
-PythonImportTime = "Idömodul importálása"
-PythonTimePrefix = "idömodul funkció elötag"
-PythonTimeSleep = "Várj n másodpercet"
-PythonMonotonic = "Vissza a monoton idö"
+PythonTurtleWrite = "Szöveg irás"
+PythonUniform = "Lebegöpontos szám [a,b] -ban"
+PythonImportTime = "time modul importálása"
+PythonTimePrefix = "time funkció elötag"
+PythonTimeSleep = "n másodpercet várni"
+PythonMonotonic = "Meg fordítani a monoton idö"
 PythonFileOpen = "Fájl megnyitása"
-PythonFileSeekable = "A fájl kereshető?"
-PythonFileSeek = "A fájl kurzorának áthelyezése"
-PythonFileTell = "A fájl kurzorának helye"
-PythonFileClose = "Bezár egy fájlt"
-PythonFileClosed = "Igaz, ha a fájl bezárt"
-PythonFileRead = "Olvasson méretbájtig"
-PythonFileWrite = "B beírása fájlba"
-PythonFileReadline = "Olvas egy sort"
-PythonFileReadlines = "Olvassa a sorok listáját"
-PythonFileTruncate = "A fájl átméretezése méretre"
-PythonFileWritelines = "Sorok listáját írja"
-PythonFileName = "a fájl neve"
-PythonFileMode = "a fájl nyitott módja"
-PythonFileReadable = "A fájl olvasható?"
-PythonFileWritable = "A fájl írható?"
+PythonFileSeekable = "Seek-et lehete használni"
+PythonFileSeek = "A kurzort áthelyezni"
+PythonFileTell = "Visszaadja a kurzor helye"
+PythonFileClose = "Bezárni egy fájlt"
+PythonFileClosed = "True ha a fájl bezárva"
+PythonFileRead = "Olvas 16 bájtig"
+PythonFileWrite = "b-t irjon a fájlba"
+PythonFileReadline = "Olvas egy sort vagy 16 bájtig"
+PythonFileReadlines = "Olvas több sort"
+PythonFileTruncate = "A fájl átméretezése"
+PythonFileWritelines = "Irjon több sort"
+PythonFileName = "A fájl neve"
+PythonFileMode = "A fájl nyitott módja"
+PythonFileReadable = "read-et lehete használni"
+PythonFileWritable = "write-ot lehete használni"
+PythonImportOs = "os modul importálása"
+PythonOsUname = "Rendszer informaciók"
+PythonOsRemove = "Fájl törlése"
+PythonOsRename = "Fájl átnevezése"
+PythonOsListdir = "Fájlok listája"

apps/code/catalog.it.i18n

@@ -30,8 +30,8 @@ PythonColor = "Definisci un colore rvb"
 PythonColorBlack = "Colore nero"
 PythonColorBlue = "Colore blu"
 PythonColorBrown = "Colore marrone"
+PythonColorGray = "Colore grigio"
 PythonColorGreen = "Colore verde"
-PythonColorGrey = "Colore grigio"
 PythonColorOrange = "Colore arancione"
 PythonColorPink = "Colore rosa"
 PythonColorPurple = "Colore viola"
@@ -45,6 +45,7 @@ PythonCosh = "Coseno iperbolico"
 PythonCount = "Conta le ricorrenze di x"
 PythonDegrees = "Conversione di radianti in gradi"
 PythonDivMod = "Quoziente e resto"
+PythonDrawLine = "Disegna una linea"
 PythonDrawString = "Visualizza il testo dal pixel x,y"
 PythonErf = "Funzione d'errore"
 PythonErfc = "Funzione d'errore complementare"
@@ -71,6 +72,11 @@ PythonImportMath = "Importa modulo math"
 PythonImportMatplotlibPyplot = "Importa modulo matplotlib.pyplot"
 PythonImportTurtle = "Importa del modulo turtle"
 PythonImportTime = "Importa del modulo time"
+PythonImportOs = "Importa modulo os"
+PythonOsUname = "Ottieni informazioni sul sistema"
+PythonOsRemove = "Rimuovere un file"
+PythonOsRename = "Rinomina file"
+PythonOsListdir = "Elenca file"
 PythonIndex = "Indice prima occorrenza di x"
 PythonInput = "Inserire un valore"
 PythonInsert = "Inserire x in posizione i-esima"
@@ -81,52 +87,6 @@ PythonIsInfinite = "Testa se x est infinito"
 PythonIsKeyDown = "Restituisce True premendo tasto k"
 PythonIsNaN = "Testa se x è NaN"
 PythonKandinskyFunction = "Prefisso funzione modulo kandinsky"
-PythonKeyLeft = "Tasto FRECCIA SINISTRA"
-PythonKeyUp = "Tasto FRECCIA ALTO"
-PythonKeyDown = "Tasto FRECCIA BASSO"
-PythonKeyRight = "Tasto FRECCIA DESTRA"
-PythonKeyOk = "Tasto OK"
-PythonKeyBack = "Tasto INDIETRO"
-PythonKeyHome = "Tasto CASA"
-PythonKeyOnOff = "Tasto ON/OFF"
-PythonKeyShift = "Tasto SHIFT"
-PythonKeyAlpha = "Tasto ALPHA"
-PythonKeyXnt = "Tasto X,N,T"
-PythonKeyVar = "Tasto VAR"
-PythonKeyToolbox = "Tasto TOOLBOX"
-PythonKeyBackspace = "Tasto CANCELLA"
-PythonKeyExp = "Tasto ESPONENZIALE"
-PythonKeyLn = "Tasto LOGARITMO NEPERIANO"
-PythonKeyLog = "Tasto LOGARITMO DECIMALE"
-PythonKeyImaginary = "Tasto I IMMAGINE"
-PythonKeyComma = "Tasto VIRGOLA"
-PythonKeyPower = "Tasto POTENZA"
-PythonKeySine = "Tasto SENO"
-PythonKeyCosine = "Tasto COSENO"
-PythonKeyTangent = "Tasto TANGENTE"
-PythonKeyPi = "Tasto PI"
-PythonKeySqrt = "Tasto RADICE QUADRATA"
-PythonKeySquare = "Tasto QUADRATO"
-PythonKeySeven = "Tasto 7"
-PythonKeyEight = "Tasto 8"
-PythonKeyNine = "Tasto 9"
-PythonKeyLeftParenthesis = "Tasto PARENTESI SINISTRA"
-PythonKeyRightParenthesis = "Tasto PARENTESI DESTRA"
-PythonKeyFour = "Tasto 4"
-PythonKeyFive = "Tasto 5"
-PythonKeySix = "Tasto 6"
-PythonKeyMultiplication = "Tasto MOLTIPLICAZIONE"
-PythonKeyDivision = "Tasto DIVISIONE"
-PythonKeyOne = "Tasto 1"
-PythonKeyTwo = "Tasto 2"
-PythonKeyThree = "Tasto 3"
-PythonKeyPlus = "Tasto PIÙ"
-PythonKeyMinus = "Tasto MENO"
-PythonKeyZero = "Tasto 0"
-PythonKeyDot = "Tasto PUNTO"
-PythonKeyEe = "Tasto 10 POTENZA X"
-PythonKeyAns = "Tasto ANS"
-PythonKeyExe = "Tasto EXE"
 PythonLdexp = "Inversa di frexp : x*(2**i)"
 PythonLength = "Longhezza di un oggetto"
 PythonLgamma = "Logaritmo della funzione gamma"

apps/code/catalog.nl.i18n

@@ -13,14 +13,14 @@ PythonAbs = "Absolute waarde"
 PythonAcos = "Arccosinus"
 PythonAcosh = "Arccosinus hyperbolicus"
 PythonAppend = "Voeg x toe aan het eind van je lijst"
-PythonArrow = "Arrow from (x,y) to (x+dx,y+dy)"
+PythonArrow = "Pijl van (x,y) naar (x+dx,y+dy)"
 PythonAsin = "Arcsinus"
 PythonAsinh = "Arcsinus hyperbolicus"
 PythonAtan = "Arctangens"
 PythonAtan2 = "Geeft atan(y/x)"
 PythonAtanh = "Arctangens hyperbolicus"
-PythonAxis = "Set the axes to (xmin,xmax,ymin,ymax)"
-PythonBar = "Draw a bar plot with x values"
+PythonAxis = "Stel de assen in (xmin,xmax,ymin,ymax)"
+PythonBar = "Teken staafdiagram met x-waarden"
 PythonBin = "Zet integer om in een binair getal"
 PythonCeil = "Plafond"
 PythonChoice = "Geeft willek. getal van de lijst"
@@ -30,8 +30,8 @@ PythonColor = "Definieer een rgb kleur"
 PythonColorBlack = "Zwarte kleur"
 PythonColorBlue = "Blauwe kleur"
 PythonColorBrown = "Bruine kleur"
+PythonColorGray = "Grijze kleur"
 PythonColorGreen = "Groene kleur"
-PythonColorGrey = "Grijze kleur"
 PythonColorOrange = "Oranje kleur"
 PythonColorPink = "Roze kleur"
 PythonColorPurple = "Paarse kleur"
@@ -45,6 +45,7 @@ PythonCosh = "Cosinus hyperbolicus"
 PythonCount = "Tel voorkomen van x"
 PythonDegrees = "Zet x om van radialen naar graden"
 PythonDivMod = "Quotiënt en rest"
+PythonDrawLine = "Teken een lijn"
 PythonDrawString = "Geef een tekst weer van pixel (x,y)"
 PythonErf = "Error functie"
 PythonErfc = "Complementaire error functie"
@@ -60,16 +61,21 @@ PythonFrExp = "Mantisse en exponent van x: (m,e)"
 PythonGamma = "Gammafunctie"
 PythonGetPixel = "Geef pixel (x,y) kleur (rgb)"
 PythonGetrandbits = "Integer met k willekeurige bits"
-PythonGrid = "Toggle the visibility of the grid"
+PythonGrid = "Verander zichtbaarheid raster"
 PythonHex = "Zet integer om in hexadecimaal"
-PythonHist = "Draw the histogram of x"
+PythonHist = "Teken het histogram van x"
 PythonImportCmath = "Importeer cmath module"
 PythonImportIon = "Importeer ion module"
 PythonImportKandinsky = "Importeer kandinsky module"
 PythonImportRandom = "Importeer random module"
 PythonImportMath = "Importeer math module"
-PythonImportMatplotlibPyplot = "Import matplotlib.pyplot module"
+PythonImportMatplotlibPyplot = "Importeer matplotlib.pyplot module"
 PythonImportTime = "Importeer time module"
+PythonImportOs = "Importeer os module"
+PythonOsUname = " Krijg systeeminfo"
+PythonOsRemove = "Een bestand verwijderen"
+PythonOsRename = "Hernoem bestand"
+PythonOsListdir = "Lijstbestanden"
 PythonImportTurtle = "Importeer turtle module"
 PythonIndex = "Index van de eerste x aanwezigheden"
 PythonInput = "Wijs een waarde toe"
@@ -79,54 +85,8 @@ PythonIonFunction = "ion module voorvoegsel"
 PythonIsFinite = "Controleer of x eindig is"
 PythonIsInfinite = "Controleer of x oneindig is"
 PythonIsKeyDown = "Geef True als k toets omlaag is"
-PythonIsNaN = "Controleer of x geen nummer is"
+PythonIsNaN = "Controleer of x geen getal is"
 PythonKandinskyFunction = "kandinsky module voorvoegsel"
-PythonKeyLeft = "PIJL NAAR LINKS toets"
-PythonKeyUp = "PIJL OMHOOG toets"
-PythonKeyDown = "PIJL OMLAAG toets"
-PythonKeyRight = "PIJL NAAR RECHTS toets"
-PythonKeyOk = "OK toets"
-PythonKeyBack = "TERUG toets"
-PythonKeyHome = "HOME toets"
-PythonKeyOnOff = "AAN/UIT toets"
-PythonKeyShift = "SHIFT toets"
-PythonKeyAlpha = "ALPHA toets"
-PythonKeyXnt = "X,N,T toets"
-PythonKeyVar = "VAR toets"
-PythonKeyToolbox = "TOOLBOX toets"
-PythonKeyBackspace = "BACKSPACE toets"
-PythonKeyExp = "EXPONENTIEEL toets"
-PythonKeyLn = "NATUURLIJKE LOGARITME toets"
-PythonKeyLog = "BRIGGSE LOGARITME toets"
-PythonKeyImaginary = "IMAGINAIRE I toets"
-PythonKeyComma = "KOMMA toets"
-PythonKeyPower = "MACHT toets"
-PythonKeySine = "SINUS toets"
-PythonKeyCosine = "COSINUS toets"
-PythonKeyTangent = "TANGENS toets"
-PythonKeyPi = "PI toets"
-PythonKeySqrt = "VIERKANTSWORTEL toets"
-PythonKeySquare = "KWADRAAT toets"
-PythonKeySeven = "7 toets"
-PythonKeyEight = "8 toets"
-PythonKeyNine = "9 toets"
-PythonKeyLeftParenthesis = "HAAKJE OPENEN toets"
-PythonKeyRightParenthesis = "HAAKJE SLUITEN toets"
-PythonKeyFour = "4 toets"
-PythonKeyFive = "5 toets"
-PythonKeySix = "6 toets"
-PythonKeyMultiplication = "VERMENIGVULDIGEN toets"
-PythonKeyDivision = "DELEN toets"
-PythonKeyOne = "1 toets"
-PythonKeyTwo = "2 toets"
-PythonKeyThree = "3 toets"
-PythonKeyPlus = "PLUS toets"
-PythonKeyMinus = "MIN toets"
-PythonKeyZero = "0 toets"
-PythonKeyDot = "PUNT toets"
-PythonKeyEe = "10 TOT DE MACHT X toets"
-PythonKeyAns = "ANS toets"
-PythonKeyExe = "EXE toets"
 PythonLdexp = "Geeft x*(2**i), inversie van frexp"
 PythonLength = "Lengte van een object"
 PythonLgamma = "Log-gammafunctie"
@@ -141,14 +101,14 @@ PythonModf = "Fractionele en gehele delen van x"
 PythonMonotonic = "Waarde van een monotone klok"
 PythonOct = "Integer omzetten naar octaal"
 PythonPhase = "Fase van z in radialen"
-PythonPlot = "Plot y versus x as lines"
+PythonPlot = "Plot y versus x als lijnen"
 PythonPolar = "z in poolcoördinaten"
 PythonPop = "Verwijder en breng het laatste item terug"
 PythonPower = "x tot de macht y"
 PythonPrint = "Print object"
 PythonRadians = "Zet x om van graden naar radialen"
 PythonRandint = "Geeft willek. integer in [a,b]"
-PythonRandom = "Een willekeurig getal in [0,1["
+PythonRandom = "Een willekeurig getal in [0,1)"
 PythonRandomFunction = "random module voorvoegsel"
 PythonRandrange = "Willek. getal in range(start, stop)"
 PythonRangeStartStop = "Lijst van start tot stop-1"
@@ -157,10 +117,10 @@ PythonRect = "z in cartesiaanse coördinaten"
 PythonRemove = "Verwijder het eerste voorkomen van x"
 PythonReverse = "Keer de elementen van de lijst om"
 PythonRound = "Rond af op n cijfers"
-PythonScatter = "Draw a scatter plot of y versus x"
+PythonScatter = "Teken scatterplot van y versus x"
 PythonSeed = "Start willek. getallengenerator"
 PythonSetPixel = "Kleur pixel (x,y)"
-PythonShow = "Display the figure"
+PythonShow = "Figuur weergeven"
 PythonSin= "Sinus"
 PythonSinh = "Sinus hyperbolicus"
 PythonSleep = "Stel executie voor t seconden uit"
@@ -169,7 +129,7 @@ PythonSqrt = "Vierkantswortel"
 PythonSum = "Sommeer de items van een lijst"
 PythonTan = "Tangens"
 PythonTanh = "Tangens hyperbolicus"
-PythonText = "Display a text at (x,y) coordinates"
+PythonText = "Geef tekst weer op coördinaten (x,y)"
 PythonTimeFunction = "time module voorvoegsel"
 PythonTrunc = "x afgeknot tot een integer"
 PythonTurtleBackward = "Ga achterwaarts met x pixels"
@@ -194,7 +154,7 @@ PythonTurtleSetposition = "Plaats de schildpad"
 PythonTurtleShowturtle = "Laat de schildpad zien"
 PythonTurtleSpeed = "Tekensnelheid tussen 0 and 10"
 PythonTurtleWrite = "Display a text"
-PythonUniform = "Zwevendekommagetal in [a,b]"
+PythonUniform = "Decimaal getal in [a,b]"
 PythonImportTime = "Import time module"
 PythonTimePrefix = "time module function prefix"
 PythonTimeSleep = "Wait for n second"

apps/code/catalog.pt.i18n

@@ -30,8 +30,8 @@ PythonColor = "Define uma cor rgb"
 PythonColorBlack = "Cor preta"
 PythonColorBlue = "Cor azul"
 PythonColorBrown = "Cor castanha"
+PythonColorGray = "Cor cinzenta"
 PythonColorGreen = "Cor verde"
-PythonColorGrey = "Cor cinzenta"
 PythonColorOrange = "Cor laranja"
 PythonColorPink = "Cor rosa"
 PythonColorPurple = "Cor roxa"
@@ -45,6 +45,7 @@ PythonCosh = "Cosseno hiperbólico"
 PythonCount = "Contar as ocorrências de x"
 PythonDegrees = "Converter x de radianos para graus"
 PythonDivMod = "Quociente e resto"
+PythonDrawLine = "Desenhe uma linha"
 PythonDrawString = "Mostrar o texto do pixel (x,y)"
 PythonErf = "Função erro"
 PythonErfc = "Função erro complementar"
@@ -81,52 +82,6 @@ PythonIsInfinite = "Verificar se x é infinito"
 PythonIsKeyDown = "Devolve True se tecla k pressionada"
 PythonIsNaN = "Verificar se x é um NaN"
 PythonKandinskyFunction = "Prefixo da função do módulo kandinsky"
-PythonKeyLeft = "tecla SETA ESQUERDA"
-PythonKeyUp = "tecla SETA CIMA "
-PythonKeyDown = "tecla SETA BAIXO"
-PythonKeyRight = "tecla SETA DIREITA"
-PythonKeyOk = "tecla OK"
-PythonKeyBack = "tecla VOLTAR"
-PythonKeyHome = "tecla HOME"
-PythonKeyOnOff = "tecla ON/OFF"
-PythonKeyShift = "tecla SHIFT"
-PythonKeyAlpha = "tecla ALPHA"
-PythonKeyXnt = "tecla X,N,T"
-PythonKeyVar = "tecla VAR"
-PythonKeyToolbox = "tecla CAIXA DE FERRAMENTAS"
-PythonKeyBackspace = "tecla APAGAR"
-PythonKeyExp = "tecla EXPONENCIAL"
-PythonKeyLn = "tecla LOGARITMO NATURAL"
-PythonKeyLog = "tecla LOGARITMO DECIMAL"
-PythonKeyImaginary = "tecla I IMAGINÁRIO"
-PythonKeyComma = "tecla VÍRGULA"
-PythonKeyPower = "tecla EXPOENTE"
-PythonKeySine = "tecla SENO"
-PythonKeyCosine = "tecla COSSENO"
-PythonKeyTangent = "tecla TANGENTE"
-PythonKeyPi = "tecla PI"
-PythonKeySqrt = "tecla RAIZ QUADRADA"
-PythonKeySquare = "tecla AO QUADRADO"
-PythonKeySeven = "tecla 7"
-PythonKeyEight = "tecla 8"
-PythonKeyNine = "tecla 9"
-PythonKeyLeftParenthesis = "tecla PARÊNTESE ESQUERDO"
-PythonKeyRightParenthesis = "tecla PARÊNTESE DIREITO"
-PythonKeyFour = "tecla 4"
-PythonKeyFive = "tecla 5"
-PythonKeySix = "tecla 6"
-PythonKeyMultiplication = "tecla MULTIPLICAÇÃO"
-PythonKeyDivision = "tecla DIVISÃO"
-PythonKeyOne = "tecla 1"
-PythonKeyTwo = "tecla 2"
-PythonKeyThree = "tecla 3"
-PythonKeyPlus = "tecla MAIS"
-PythonKeyMinus = "tecla MENOS"
-PythonKeyZero = "tecla 0"
-PythonKeyDot = "tecla PONTO"
-PythonKeyEe = "tecla 10 expoente X"
-PythonKeyAns = "tecla ANS"
-PythonKeyExe = "tecla EXE"
 PythonLdexp = "Devolve x*(2**i), inverso de frexp"
 PythonLength = "Comprimento de um objeto"
 PythonLgamma = "Logaritmo da função gama"
@@ -196,6 +151,11 @@ PythonTurtleSpeed = "Velocidade do desenho entre 0 e 10"
 PythonTurtleWrite = "Mostrar um texto"
 PythonUniform = "Número decimal em [a,b]"
 PythonImportTime = "Import time module"
+PythonImportOs = "Import os module"
+PythonOsUname = " Obter informações do sistema"
+PythonOsRemove = "Remover um ficheiro"
+PythonOsRename = "Renomear ficheiro"
+PythonOsListdir = "Listar ficheiros"
 PythonTimePrefix = "time module function prefix"
 PythonTimeSleep = "Wait for n second"
 PythonMonotonic = "Return monotonic time"

apps/code/catalog.universal.i18n

@@ -32,8 +32,8 @@ PythonCommandColor = "color(r,g,b)"
 PythonCommandColorBlack = "'black'"
 PythonCommandColorBlue = "'blue'"
 PythonCommandColorBrown = "'brown'"
+PythonCommandColorGray = "'gray'"
 PythonCommandColorGreen = "'green'"
-PythonCommandColorGrey = "'grey'"
 PythonCommandColorOrange = "'orange'"
 PythonCommandColorPink = "'pink'"
 PythonCommandColorPurple = "'purple'"
@@ -50,6 +50,7 @@ PythonCommandCount = "list.count(x)"
 PythonCommandCountWithoutArg = ".count(\x11)"
 PythonCommandDegrees = "degrees(x)"
 PythonCommandDivMod = "divmod(a,b)"
+PythonCommandDrawLine = "draw_line(x1,y1,x2,y2,color)"
 PythonCommandDrawString = "draw_string(\"text\",x,y)"
 PythonCommandConstantE = "e"
 PythonCommandErf = "erf(x)"
@@ -86,6 +87,8 @@ PythonCommandImportKandinsky = "import kandinsky"
 PythonCommandImportMath = "import math"
 PythonCommandImportMatplotlibPyplot = "import matplotlib.pyplot"
 PythonCommandImportRandom = "import random"
+PythonCommandImportOs = "import os"
+PythonCommandImportFromOs = "from os import *"
 PythonCommandImportTime = "import time"
 PythonCommandImportTurtle = "import turtle"
 PythonCommandIndex = "list.index(x)"
@@ -212,6 +215,12 @@ PythonCommandTurtleFunctionWithoutArg = "turtle.\x11"
 PythonCommandUniform = "uniform(a,b)"
 PythonConstantE = "2.718281828459045"
 PythonConstantPi = "3.141592653589793"
+PythonOsCommandUname = "uname()"
+PythonOsCommandRemove = "remove(filename)"
+PythonOsCommandRename = "rename(oldname, newname)"
+PythonOsCommandRemoveWithoutArg = "remove(\x11)"
+PythonOsCommandRenameWithoutArg = "rename(\x11,)"
+PythonOsCommandListdir = "listdir()"
 PythonTurtleCommandBackward = "backward(x)"
 PythonTurtleCommandCircle = "circle(r)"
 PythonTurtleCommandColor = "color('c')"

apps/code/console_controller.cpp

@@ -451,30 +451,6 @@ void ConsoleController::printText(const char * text, size_t length) {
     flushOutputAccumulationBufferToStore();
     micropython_port_vm_hook_refresh_print();
   }
-// #if __EMSCRIPTEN__
-  /* If we called micropython_port_interrupt_if_needed here, we would need to
-   * put in the WHITELIST all the methods that call
-   * ConsoleController::printText, which means all the MicroPython methods that
-   * call print... This is a lot of work + might reduce the performance as
-   * emterpreted code is slower.
-   *
-   * We thus do not allow print interruption on the web simulator. It would be
-   * better to allow it, but the biggest problem was on the device anyways
-   * -> It is much quicker to interrupt Python on the web simulator than on the
-   * device.
-   *
-   * TODO: Allow print interrpution on emscripten -> maybe by using WASM=1 ? */
-
-  /*
-   * This can be run in Omega, since it uses WebASM.
-   */
-// #else
-  /* micropython_port_vm_hook_loop is not enough to detect user interruptions,
-   * because it calls micropython_port_interrupt_if_needed every 20000
-   * operations, and a print operation is quite long. We thus explicitely call
-   * micropython_port_interrupt_if_needed here. */
-  micropython_port_interrupt_if_needed();
-// #endif
 }
 
 void ConsoleController::autoImportScript(Script script, bool force) {

apps/code/editor_controller.cpp

@@ -23,7 +23,7 @@ void EditorController::setScript(Script script, int scriptIndex) {
   m_script = script;
   m_scriptIndex = scriptIndex;
 
-  /* We edit the script direclty in the storage buffer. We thus put all the
+  /* We edit the script directly in the storage buffer. We thus put all the
    * storage available space at the end of the current edited script and we set
    * its size.
    *
@@ -36,8 +36,8 @@ void EditorController::setScript(Script script, int scriptIndex) {
    *
    * */
 
-  size_t newScriptSize = Ion::Storage::sharedStorage()->putAvailableSpaceAtEndOfRecord(m_script);
-  m_editorView.setText(const_cast<char *>(m_script.content()), newScriptSize - Script::StatusSize());
+  Ion::Storage::sharedStorage()->putAvailableSpaceAtEndOfRecord(m_script);
+  m_editorView.setText(const_cast<char *>(m_script.content()), m_script.contentSize());
 }
 
 void EditorController::willExitApp() {

apps/code/editor_view.cpp

@@ -67,11 +67,19 @@ void EditorView::GutterView::drawRect(KDContext * ctx, KDRect rect) const {
   KDCoordinate firstLine = m_offset / glyphSize.height();
   KDCoordinate firstLinePixelOffset = m_offset - firstLine * glyphSize.height();
 
-  char lineNumber[4];
+  char lineNumber[k_lineNumberCharLength];
   int numberOfLines = bounds().height() / glyphSize.height() + 1;
   for (int i=0; i<numberOfLines; i++) {
-    Poincare::Integer line(i + firstLine + 1);
-    line.serialize(lineNumber, 4);
+    // Only the first two digits are displayed
+    int lineNumberValue = (i + firstLine + 1) % 100;
+    Poincare::Integer line(lineNumberValue);
+    if (firstLine < 10 || lineNumberValue >= 10) {
+      line.serialize(lineNumber, k_lineNumberCharLength);
+    } else {
+      // Add a leading "0"
+      lineNumber[0] = '0';
+      line.serialize(lineNumber + 1, k_lineNumberCharLength - 1);
+    }
     KDCoordinate leftPadding = (2 - strlen(lineNumber)) * glyphSize.width();
     ctx->drawString(
       lineNumber,

apps/code/editor_view.h

@@ -42,6 +42,7 @@ private:
     KDSize minimalSizeForOptimalDisplay() const override;
   private:
     static constexpr KDCoordinate k_margin = 2;
+    static constexpr int k_lineNumberCharLength = 3;
     const KDFont * m_font;
     KDCoordinate m_offset;
   };

apps/code/helpers.cpp

@@ -1,44 +1,20 @@
 #include "helpers.h"
-#include <string.h>
-#include <ion/unicode/code_point.h>
-#include <ion.h>
+#include <escher/clipboard.h>
 
 namespace Code {
 namespace Helpers {
 
-class EventTextPair {
-public:
-  constexpr EventTextPair(Ion::Events::Event event, const char * text) : m_event(event), m_text(text) {}
-  Ion::Events::Event event() const { return m_event; }
-  const char * text() const { return m_text; }
-private:
-  const Ion::Events::Event m_event;
-  const char * m_text;
-};
-
-static_assert('\x11' == UCodePointEmpty, "Unicode error");
-static constexpr EventTextPair sEventTextMap[] = {
-  EventTextPair(Ion::Events::XNT, "x"),
-  EventTextPair(Ion::Events::Exp, "exp(\x11)"),
-  EventTextPair(Ion::Events::Ln, "log(\x11)"),
-  EventTextPair(Ion::Events::Log, "log10(\x11)"),
-  EventTextPair(Ion::Events::Imaginary, "1j"),
-  EventTextPair(Ion::Events::Power, "**"),
-  EventTextPair(Ion::Events::Pi, "pi"),
-  EventTextPair(Ion::Events::Sqrt, "sqrt(\x11)"),
-  EventTextPair(Ion::Events::Square, "**2"),
-  EventTextPair(Ion::Events::Multiplication, "*"),
-  EventTextPair(Ion::Events::EE, "e"),
-};
-
 const char * PythonTextForEvent(Ion::Events::Event event) {
-  for (size_t i=0; i<sizeof(sEventTextMap)/sizeof(sEventTextMap[0]); i++) {
-    if (event == sEventTextMap[i].event()) {
-      return sEventTextMap[i].text();
+  for (size_t i=0; i<NumberOfPythonTextPairs; i++) {
+    UTF8Helper::TextPair pair = PythonTextPairs[i];
+    if (event.text() == pair.firstString()) {
+      return pair.secondString();
+    }
+    if (event == Ion::Events::XNT) {
+      return "x";
     }
   }
   return nullptr;
 }
-
 }
 }

apps/code/python_text_area.cpp

@@ -440,9 +440,7 @@ void PythonTextArea::addAutocompletion() {
   const int scriptIndex = m_contentView.pythonDelegate()->menuController()->editedScriptIndex();
   m_contentView.pythonDelegate()->variableBoxController()->loadFunctionsAndVariables(scriptIndex, autocompletionTokenBeginning, autocompletionLocation - autocompletionTokenBeginning);
 
-  if (addAutocompletionTextAtIndex(0)) {
-    m_contentView.setAutocompleting(true);
-  }
+  addAutocompletionTextAtIndex(0);
 }
 
 bool PythonTextArea::addAutocompletionTextAtIndex(int nextIndex, int * currentIndexToUpdate) {
@@ -467,6 +465,7 @@ bool PythonTextArea::addAutocompletionTextAtIndex(int nextIndex, int * currentIn
       return false;
     }
     autocompletionLocation += textToInsertLength;
+    m_contentView.setAutocompleting(true);
     m_contentView.setAutocompletionEnd(autocompletionLocation);
   }
 
@@ -479,8 +478,9 @@ bool PythonTextArea::addAutocompletionTextAtIndex(int nextIndex, int * currentIn
   if (addParentheses && m_contentView.insertTextAtLocation(parentheses, const_cast<char *>(autocompletionLocation), parenthesesLength)) {
     m_contentView.setAutocompleting(true);
     m_contentView.setAutocompletionEnd(autocompletionLocation + parenthesesLength);
+    return true;
   }
-  return true;
+  return (textToInsertLength > 0);
 }
 
 void PythonTextArea::cycleAutocompletion(bool downwards) {

apps/code/python_toolbox.cpp

@@ -5,6 +5,7 @@ extern "C" {
 #include <string.h>
 #include <ctype.h>
 }
+#include "app.h"
 
 namespace Code {
 
@@ -131,7 +132,7 @@ const ToolboxMessageTree MatplotlibPyplotModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorPink, I18n::Message::PythonColorPink, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorOrange, I18n::Message::PythonColorOrange, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorPurple, I18n::Message::PythonColorPurple, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGrey, I18n::Message::PythonColorGrey, false)
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGray, I18n::Message::PythonColorGray, false)
 };
 
 const ToolboxMessageTree TurtleModuleChildren[] = {
@@ -168,7 +169,7 @@ const ToolboxMessageTree TurtleModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorPink, I18n::Message::PythonColorPink, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorOrange, I18n::Message::PythonColorOrange, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorPurple, I18n::Message::PythonColorPurple, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGrey, I18n::Message::PythonColorGrey, false)
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGray, I18n::Message::PythonColorGray, false)
 };
 
 const ToolboxMessageTree RandomModuleChildren[] = {
@@ -192,6 +193,7 @@ const ToolboxMessageTree KandinskyModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSetPixel, I18n::Message::PythonSetPixel),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColor, I18n::Message::PythonColor),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawLine, I18n::Message::PythonDrawLine),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandFillRect, I18n::Message::PythonFillRect)
 };
 
@@ -200,52 +202,7 @@ const ToolboxMessageTree IonModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromIon, I18n::Message::PythonImportIon, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIonFunction, I18n::Message::PythonIonFunction, false, I18n::Message::PythonCommandIonFunctionWithoutArg),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandIsKeyDown, I18n::Message::PythonIsKeyDown),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLeft, I18n::Message::PythonKeyLeft, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyUp, I18n::Message::PythonKeyUp, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDown, I18n::Message::PythonKeyDown, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyRight, I18n::Message::PythonKeyRight, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOk, I18n::Message::PythonKeyOk, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyBack, I18n::Message::PythonKeyBack, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyHome, I18n::Message::PythonKeyHome, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOnOff, I18n::Message::PythonKeyOnOff, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyShift, I18n::Message::PythonKeyShift, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyAlpha, I18n::Message::PythonKeyAlpha, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyXnt, I18n::Message::PythonKeyXnt, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyVar, I18n::Message::PythonKeyVar, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyToolbox, I18n::Message::PythonKeyToolbox, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyBackspace, I18n::Message::PythonKeyBackspace, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyExp, I18n::Message::PythonKeyExp, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLn, I18n::Message::PythonKeyLn, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLog, I18n::Message::PythonKeyLog, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyImaginary, I18n::Message::PythonKeyImaginary, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyComma, I18n::Message::PythonKeyComma, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPower, I18n::Message::PythonKeyPower, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySine, I18n::Message::PythonKeySine, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyCosine, I18n::Message::PythonKeyCosine, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyTangent, I18n::Message::PythonKeyTangent, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPi, I18n::Message::PythonKeyPi, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySqrt, I18n::Message::PythonKeySqrt, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySquare, I18n::Message::PythonKeySquare, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySeven, I18n::Message::PythonKeySeven, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyEight, I18n::Message::PythonKeyEight, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyNine, I18n::Message::PythonKeyNine, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyLeftParenthesis, I18n::Message::PythonKeyLeftParenthesis, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyRightParenthesis, I18n::Message::PythonKeyRightParenthesis, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyFour, I18n::Message::PythonKeyFour, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyFive, I18n::Message::PythonKeyFive, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeySix, I18n::Message::PythonKeySix, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyMultiplication, I18n::Message::PythonKeyMultiplication, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDivision, I18n::Message::PythonKeyDivision, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyOne, I18n::Message::PythonKeyOne, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyTwo, I18n::Message::PythonKeyTwo, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyThree, I18n::Message::PythonKeyThree, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyPlus, I18n::Message::PythonKeyPlus, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyMinus, I18n::Message::PythonKeyMinus, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyZero, I18n::Message::PythonKeyZero, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyDot, I18n::Message::PythonKeyDot, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyEe, I18n::Message::PythonKeyEe, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyAns, I18n::Message::PythonKeyAns, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandKeyExe, I18n::Message::PythonKeyExe, false)
+  ToolboxMessageTree::Leaf(I18n::Message::IonSelector, I18n::Message::IonSelector)
 };
 
 const ToolboxMessageTree TimeModuleChildren[] = {
@@ -256,6 +213,15 @@ const ToolboxMessageTree TimeModuleChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandSleep, I18n::Message::PythonSleep)
 };
 
+const ToolboxMessageTree OsModuleChildren[] = {
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportOs, I18n::Message::PythonImportOs, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandImportFromOs, I18n::Message::PythonImportOs, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandUname, I18n::Message::PythonOsUname, false),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandRemove, I18n::Message::PythonOsRemove, false, I18n::Message::PythonOsCommandRemoveWithoutArg),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandRename, I18n::Message::PythonOsRename, false, I18n::Message::PythonOsCommandRenameWithoutArg),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonOsCommandListdir, I18n::Message::PythonOsListdir, false)
+};
+
 const ToolboxMessageTree modulesChildren[] = {
   ToolboxMessageTree::Node(I18n::Message::MathModule, MathModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::CmathModule, CMathModuleChildren),
@@ -264,6 +230,7 @@ const ToolboxMessageTree modulesChildren[] = {
   ToolboxMessageTree::Node(I18n::Message::RandomModule, RandomModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::KandinskyModule, KandinskyModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::IonModule, IonModuleChildren),
+  ToolboxMessageTree::Node(I18n::Message::OsModule, OsModuleChildren),
   ToolboxMessageTree::Node(I18n::Message::TimeModule, TimeModuleChildren)
 };
 
@@ -305,6 +272,7 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandCosh, I18n::Message::PythonCosh),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDegrees, I18n::Message::PythonDegrees),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDivMod, I18n::Message::PythonDivMod),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawLine, I18n::Message::PythonDrawLine),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDrawString, I18n::Message::PythonDrawString),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandConstantE, I18n::Message::PythonConstantE, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandErf, I18n::Message::PythonErf),
@@ -331,8 +299,8 @@ const ToolboxMessageTree catalogChildren[] = {
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetPixel, I18n::Message::PythonGetPixel),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGetrandbits, I18n::Message::PythonGetrandbits),
   ToolboxMessageTree::Leaf(I18n::Message::PythonTurtleCommandGoto, I18n::Message::PythonTurtleGoto),
+  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGray, I18n::Message::PythonColorGray, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGreen, I18n::Message::PythonColorGreen, false),
-  ToolboxMessageTree::Leaf(I18n::Message::PythonCommandColorGrey, I18n::Message::PythonColorGrey, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandGrid, I18n::Message::PythonGrid),
   ToolboxMessageTree::Leaf(I18n::Message::PythonTurtleCommandHeading, I18n::Message::PythonTurtleHeading, false),
   ToolboxMessageTree::Leaf(I18n::Message::PythonCommandHex, I18n::Message::PythonHex),
@@ -526,6 +494,11 @@ KDCoordinate PythonToolbox::rowHeight(int j) {
 bool PythonToolbox::selectLeaf(int selectedRow) {
   m_selectableTableView.deselectTable();
   ToolboxMessageTree * node = (ToolboxMessageTree *)m_messageTreeModel->childAtIndex(selectedRow);
+  if(node->insertedText() == I18n::Message::IonSelector){
+    App::app()->toolboxIonKeys()->setSender(sender());
+    Container::activeApp()->displayModalViewController(static_cast<ViewController*>(App::app()->toolboxIonKeys()), 0.f, 0.f, Metric::PopUpTopMargin, Metric::PopUpLeftMargin, 0, Metric::PopUpRightMargin);
+    return true;
+  }
   const char * editedText = I18n::translate(node->insertedText());
   // strippedEditedText array needs to be in the same scope as editedText
   char strippedEditedText[k_maxMessageSize];

apps/code/script.h

@@ -49,6 +49,7 @@ public:
   bool autoImportationStatus() const;
   void toggleAutoimportationStatus();
   const char * content() const;
+  size_t contentSize() { return value().size - k_statusSize; }
 
   /* Fetched status */
   bool fetchedFromConsole() const;

apps/code/script_node_cell.cpp

@@ -13,7 +13,7 @@ void ScriptNodeCell::ScriptNodeView::drawRect(KDContext * ctx, KDRect rect) cons
   // If it exists, draw the description name.
   const char * descriptionName = m_scriptNode->description();
   if (descriptionName != nullptr) {
-    ctx->drawString(descriptionName, KDPoint(0, m_frame.height() - k_bottomMargin - k_font->glyphSize().height()), k_font, Palette::GreyDark, backgroundColor);
+    ctx->drawString(descriptionName, KDPoint(0, m_frame.height() - k_bottomMargin - k_font->glyphSize().height()), k_font, Palette::GrayDark, backgroundColor);
   }
 
   // Draw the node name

apps/code/script_template.cpp

@@ -36,7 +36,7 @@ def mandelbrot(N_iteration):
         z = z*z+c
 # Choose the color of the dot from the Mandelbrot sequence
       rgb = int(255*i/N_iteration)
-      col = kandinsky.color(int(rgb),int(rgb*0.75),int(rgb*0.25))
+      col = kandinsky.color(int(rgb*0.82),int(rgb*0.13),int(rgb*0.18))
 # Draw a pixel colored in 'col' at position (x,y)
       kandinsky.set_pixel(x,y,col))");
 

apps/code/toolbox.it.i18n

@@ -1,6 +1,6 @@
 Functions = "Funzioni"
 Catalog = "Catalogo"
 Modules = "Moduli"
-LoopsAndTests = "Loops e test"
+LoopsAndTests = "Cicli e test"
 Files = "Files"
 Exceptions = "Exceptions"

apps/code/toolbox.nl.i18n

@@ -1,6 +1,6 @@
 Functions = "Functies"
 Catalog = "Catalogus"
 Modules = "Modules"
-LoopsAndTests = "Loops and tests"
+LoopsAndTests = "Herhalingen en testen"
 Files = "Files"
 Exceptions = "Exceptions"

apps/code/toolbox.universal.i18n

@@ -3,6 +3,7 @@ IonModule = "ion"
 KandinskyModule = "kandinsky"
 MathModule = "math"
 MatplotlibPyplotModule = "matplotlib.pyplot"
+OsModule = "os"
 TimeModule = "time"
 TurtleModule = "turtle"
 ForLoopMenu = "For"
@@ -56,3 +57,5 @@ PythonCommandDef = "def \x11():\n  "
 PythonCommandDefWithArg = "def function(x):"
 PythonCommandReturn = "return "
 RandomModule = "random"
+IonSelector = "Key selector"
+PressAKey = "Press a key"

apps/code/toolbox_ion_keys.cpp

@@ -0,0 +1,50 @@
+#include "toolbox_ion_keys.h"
+#include <apps/apps_container.h>
+#include <assert.h>
+#include <ion.h>
+extern "C" {
+#include <py/obj.h>
+#include <py/objfun.h>
+}
+extern const mp_rom_map_elem_t modion_module_globals_table[48];
+
+namespace Code {
+  toolboxIonKeys::toolboxIonKeys() :
+  ViewController(nullptr),
+  m_view()
+  {
+  }
+
+  bool toolboxIonKeys::handleEvent(Ion::Events::Event e) {
+    Ion::Keyboard::State state = Ion::Keyboard::scan();
+    for(uint16_t i = 0; i < sizeof(modion_module_globals_table)/sizeof(_mp_rom_map_elem_t); i++){
+      _mp_rom_map_elem_t element = modion_module_globals_table[i];
+      if(mp_obj_is_small_int(element.value)){
+        int key = mp_obj_get_int(element.value);
+        if(state.keyDown(static_cast<Ion::Keyboard::Key>(key))){
+          m_sender->handleEventWithText(qstr_str(MP_OBJ_QSTR_VALUE(element.key)), true);
+        }
+      }
+    }
+    Container::activeApp()->dismissModalViewController();
+    AppsContainer::sharedAppsContainer()->redrawWindow();
+    return true;
+  }
+
+  toolboxIonKeys::toolboxIonView::toolboxIonView():
+    View()
+    {
+    }
+
+  void toolboxIonKeys::toolboxIonView::drawRect(KDContext * ctx, KDRect rect) const {
+    ctx->fillRect(rect, Palette::GrayBright);
+    ctx->strokeRect(rect, Palette::GrayDark);
+    ctx->drawString(I18n::translate(I18n::Message::PressAKey),KDPoint(rect.left()+80, rect.top()+20));
+
+  }
+
+  View * toolboxIonKeys::view(){
+    return &m_view;
+  }
+
+}

apps/code/toolbox_ion_keys.h

@@ -0,0 +1,21 @@
+#include <escher.h>
+
+namespace Code {
+
+  class toolboxIonKeys : public ViewController {
+    public :
+      toolboxIonKeys();
+      View * view() override;
+      bool handleEvent(Ion::Events::Event e) override;
+      void setSender(InputEventHandler * sender) { m_sender = sender; }
+    private :
+      class toolboxIonView : public View {
+        public :
+          toolboxIonView();
+          void drawRect(KDContext * ctx, KDRect rect) const override;
+      };
+      toolboxIonView m_view;
+      InputEventHandler * m_sender;
+  };
+
+}

apps/code/variable_box_controller.cpp

@@ -45,7 +45,7 @@ VariableBoxController::VariableBoxController(ScriptStore * scriptStore) :
 {
   for (int i = 0; i < k_scriptOriginsCount; i++) {
     m_subtitleCells[i].setBackgroundColor(Palette::WallScreen);
-    m_subtitleCells[i].setTextColor(Palette::BlueishGrey);
+    m_subtitleCells[i].setTextColor(Palette::SecondaryText);
   }
 }
 

apps/country_preferences.csv

@@ -0,0 +1,11 @@
+CountryCode,CountryPreferences::AvailableExamModes,CountryPreferences::MethodForQuartiles,Poincare::Preferences::UnitFormat,CountryPreferences::HomeAppsLayout
+WW,StandardOnly,MedianOfSublist,Metric,Default
+CA,StandardOnly,MedianOfSublist,Metric,Default
+DE,StandardOnly,MedianOfSublist,Metric,Default
+ES,StandardOnly,MedianOfSublist,Metric,Default
+FR,StandardOnly,CumulatedFrequency,Metric,Default
+GB,StandardOnly,MedianOfSublist,Metric,Default
+IT,StandardOnly,CumulatedFrequency,Metric,Default
+NL,All,MedianOfSublist,Metric,Default
+PT,StandardOnly,MedianOfSublist,Metric,Default
+US,StandardOnly,MedianOfSublist,Imperial,HidePython

apps/country_preferences.h

@@ -0,0 +1,42 @@
+#ifndef COUNTRY_PREFERENCES_H
+#define COUNTRY_PREFERENCES_H
+
+#include <poincare/preferences.h>
+
+class CountryPreferences {
+public:
+  enum class AvailableExamModes : uint8_t {
+    StandardOnly,
+    All
+  };
+
+  enum class MethodForQuartiles : uint8_t {
+    MedianOfSublist,
+    CumulatedFrequency
+  };
+
+  enum class HomeAppsLayout : uint8_t {
+    Default,
+    HidePython,
+  };
+
+  constexpr CountryPreferences(AvailableExamModes availableExamModes, MethodForQuartiles methodForQuartiles, Poincare::Preferences::UnitFormat unitFormat, HomeAppsLayout homeAppsLayout) :
+    m_availableExamModes(availableExamModes),
+    m_methodForQuartiles(methodForQuartiles),
+    m_unitFormat(unitFormat),
+    m_homeAppsLayout(homeAppsLayout)
+  {}
+
+  constexpr AvailableExamModes availableExamModes() const { return m_availableExamModes; }
+  constexpr MethodForQuartiles methodForQuartiles() const { return m_methodForQuartiles; }
+  constexpr Poincare::Preferences::UnitFormat unitFormat() const { return m_unitFormat; }
+  constexpr HomeAppsLayout homeAppsLayout() const { return m_homeAppsLayout; }
+
+private:
+  const AvailableExamModes m_availableExamModes;
+  const MethodForQuartiles m_methodForQuartiles;
+  const Poincare::Preferences::UnitFormat m_unitFormat;
+  const HomeAppsLayout m_homeAppsLayout;
+};
+
+#endif

apps/exam_mode_configuration.h

@@ -8,11 +8,7 @@
 namespace ExamModeConfiguration {
 
 // Settings menu
-#if LEDS_CHOICE
-extern const Shared::SettingsMessageTree s_modelExamChildren[3];
-#else
 extern const Shared::SettingsMessageTree s_modelExamChildren[2];
-#endif
 int numberOfAvailableExamMode();
 GlobalPreferences::ExamMode examModeAtIndex(int index);
 I18n::Message examModeActivationMessage(int index);

apps/exam_mode_configuration_non_official.cpp

@@ -3,19 +3,10 @@
 using namespace Poincare;
 
 constexpr Shared::SettingsMessageTree s_examModeMode[] = {Shared::SettingsMessageTree(I18n::Message::ExamModeModeStandard), Shared::SettingsMessageTree(I18n::Message::ExamModeModeNoSym), Shared::SettingsMessageTree(I18n::Message::ExamModeModeNoSymNoText)};
-#if LEDS_CHOICE
-constexpr Shared::SettingsMessageTree s_ledColorChildren[] = {Shared::SettingsMessageTree(I18n::Message::ColorRed), Shared::SettingsMessageTree(I18n::Message::ColorWhite), Shared::SettingsMessageTree(I18n::Message::ColorGreen), Shared::SettingsMessageTree(I18n::Message::ColorBlue), Shared::SettingsMessageTree(I18n::Message::ColorYellow), Shared::SettingsMessageTree(I18n::Message::ColorPurple), Shared::SettingsMessageTree(I18n::Message::ColorOrange)};
-constexpr Shared::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[] = {Shared::SettingsMessageTree(I18n::Message::LEDColor, s_ledColorChildren), Shared::SettingsMessageTree(I18n::Message::ExamModeMode, s_examModeMode), Shared::SettingsMessageTree(I18n::Message::ActivateExamMode)};
-#else
 constexpr Shared::SettingsMessageTree ExamModeConfiguration::s_modelExamChildren[] = {Shared::SettingsMessageTree(I18n::Message::ExamModeMode, s_examModeMode), Shared::SettingsMessageTree(I18n::Message::ActivateExamMode)};
-#endif
 
 int ExamModeConfiguration::numberOfAvailableExamMode() {
-#if LEDS_CHOICE
-  return 3;
-#else
   return 2;
-#endif
 }
 
 GlobalPreferences::ExamMode ExamModeConfiguration::examModeAtIndex(int index) {
@@ -38,24 +29,7 @@ I18n::Message ExamModeConfiguration::examModeActivationWarningMessage(GlobalPref
 
 KDColor ExamModeConfiguration::examModeColor(GlobalPreferences::ExamMode mode) {
   assert(mode == GlobalPreferences::ExamMode::Standard || mode == GlobalPreferences::ExamMode::NoSym || mode == GlobalPreferences::ExamMode::NoSymNoText);
-  Preferences * preferences = Preferences::sharedPreferences();
-
-  switch((int) preferences->colorOfLED()) {
-    case 1:
-      return KDColorWhite;
-    case 2:
-      return KDColorGreen;
-    case 3:
-      return KDColorBlue;
-    case 4:
-      return KDColorYellow;
-    case 5:
-      return KDColorPurple;
-    case 6:
-      return KDColorOrange;
-    default:
-      return KDColorRed;
-  }
+  return KDColorRed;
 }
 
 bool ExamModeConfiguration::appIsForbiddenInExamMode(App::Descriptor::ExaminationLevel appExaminationLevel, GlobalPreferences::ExamMode mode) {
@@ -67,4 +41,4 @@ bool ExamModeConfiguration::appIsForbiddenInExamMode(App::Descriptor::Examinatio
 
 bool ExamModeConfiguration::exactExpressionsAreForbidden(GlobalPreferences::ExamMode mode) {
   return mode == GlobalPreferences::ExamMode::NoSymNoText ? true : false;
-}
+}

apps/exam_pop_up_controller.cpp

@@ -1,16 +1,32 @@
 #include "exam_pop_up_controller.h"
 #include "apps_container.h"
 #include "exam_mode_configuration.h"
-#include <apps/i18n.h>
-#include "global_preferences.h"
 #include <assert.h>
 #include <poincare/preferences.h>
 
 using namespace Poincare;
 
 ExamPopUpController::ExamPopUpController(ExamPopUpControllerDelegate * delegate) :
-  ViewController(nullptr),
-  m_contentView(this),
+  PopUpController(
+    k_numberOfLines,
+    Invocation(
+      [](void * context, void * sender) {
+        ExamPopUpController * controller = (ExamPopUpController *)context;
+        GlobalPreferences::ExamMode mode = controller->targetExamMode();
+        assert(mode != GlobalPreferences::ExamMode::Unknown);
+        GlobalPreferences::sharedGlobalPreferences()->setExamMode(mode);
+        AppsContainer * container = AppsContainer::sharedAppsContainer();
+        if (mode == GlobalPreferences::ExamMode::Off) {
+          Ion::LED::setColor(KDColorBlack);
+          Ion::LED::updateColorWithPlugAndCharge();
+        } else {
+          container->activateExamMode(mode);
+        }
+        container->refreshPreferences();
+        Container::activeApp()->dismissModalViewController();
+        return true;
+      }, this)
+  ),
   m_targetExamMode(GlobalPreferences::ExamMode::Unknown),
   m_delegate(delegate)
 {
@@ -18,11 +34,9 @@ ExamPopUpController::ExamPopUpController(ExamPopUpControllerDelegate * delegate)
 
 void ExamPopUpController::setTargetExamMode(GlobalPreferences::ExamMode mode) {
   m_targetExamMode = mode;
-  m_contentView.setMessagesForExamMode(mode);
-}
-
-View * ExamPopUpController::view() {
-  return &m_contentView;
+  for (int i = 0; i < k_numberOfLines; i++) {
+    m_contentView.setMessage(i, ExamModeConfiguration::examModeActivationWarningMessage(mode, i));
+  }
 }
 
 void ExamPopUpController::viewDidDisappear() {
@@ -30,103 +44,3 @@ void ExamPopUpController::viewDidDisappear() {
     m_delegate->examDeactivatingPopUpIsDismissed();
   }
 }
-
-void ExamPopUpController::didBecomeFirstResponder() {
-  m_contentView.setSelectedButton(0);
-}
-
-bool ExamPopUpController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::Left && m_contentView.selectedButton() == 1) {
-    m_contentView.setSelectedButton(0);
-    return true;
-  }
-  if (event == Ion::Events::Right && m_contentView.selectedButton() == 0) {
-    m_contentView.setSelectedButton(1);
-    return true;
-  }
-  return false;
-}
-
-ExamPopUpController::ContentView::ContentView(Responder * parentResponder) :
-  m_cancelButton(parentResponder, I18n::Message::Cancel, Invocation([](void * context, void * sender) {
-    Container::activeApp()->dismissModalViewController();
-    return true;
-  }, parentResponder), KDFont::SmallFont),
-  m_okButton(parentResponder, I18n::Message::Ok, Invocation([](void * context, void * sender) {
-    ExamPopUpController * controller = (ExamPopUpController *)context;
-    GlobalPreferences::ExamMode mode = controller->targetExamMode();
-    assert(mode != GlobalPreferences::ExamMode::Unknown);
-    GlobalPreferences::sharedGlobalPreferences()->setExamMode(mode);
-    AppsContainer * container = AppsContainer::sharedAppsContainer();
-    if (mode == GlobalPreferences::ExamMode::Off) {
-      Ion::LED::setColor(KDColorBlack);
-      Ion::LED::updateColorWithPlugAndCharge();
-    } else {
-      container->activateExamMode(mode);
-    }
-    container->refreshPreferences();
-    Container::activeApp()->dismissModalViewController();
-    return true;
-  }, parentResponder), KDFont::SmallFont),
-  m_warningTextView(KDFont::SmallFont, I18n::Message::Warning, 0.5, 0.5, KDColorWhite, KDColorBlack),
-  m_messageTextViews{}
-{
-  for (int i = 0; i < k_maxNumberOfLines; i++) {
-    m_messageTextViews[i].setFont(KDFont::SmallFont);
-    m_messageTextViews[i].setAlignment(0.5f, 0.5f);
-    m_messageTextViews[i].setBackgroundColor(KDColorBlack);
-    m_messageTextViews[i].setTextColor(KDColorWhite);
-  }
-}
-
-void ExamPopUpController::ContentView::drawRect(KDContext * ctx, KDRect rect) const {
-  ctx->fillRect(bounds(), KDColorBlack);
-}
-
-void ExamPopUpController::ContentView::setSelectedButton(int selectedButton) {
-  m_cancelButton.setHighlighted(selectedButton == 0);
-  m_okButton.setHighlighted(selectedButton == 1);
-  Container::activeApp()->setFirstResponder(selectedButton == 0 ? &m_cancelButton : &m_okButton);
-}
-
-int ExamPopUpController::ContentView::selectedButton() {
-  if (m_cancelButton.isHighlighted()) {
-    return 0;
-  }
-  return 1;
-}
-
-void ExamPopUpController::ContentView::setMessagesForExamMode(GlobalPreferences::ExamMode mode) {
-  for (int i = 0; i < k_maxNumberOfLines; i++) {
-    m_messageTextViews[i].setMessage(ExamModeConfiguration::examModeActivationWarningMessage(mode, i));
-  }
-}
-
-int ExamPopUpController::ContentView::numberOfSubviews() const {
-  return 6;
-}
-
-View * ExamPopUpController::ContentView::subviewAtIndex(int index) {
-  switch (index) {
-    case 0:
-      return &m_warningTextView;
-    case 4:
-      return &m_cancelButton;
-    case 5:
-      return &m_okButton;
-    default:
-      return &m_messageTextViews[index-1];
-  }
-}
-
-void ExamPopUpController::ContentView::layoutSubviews(bool force) {
-  KDCoordinate height = bounds().height();
-  KDCoordinate width = bounds().width();
-  KDCoordinate textHeight = KDFont::SmallFont->glyphSize().height();
-  m_warningTextView.setFrame(KDRect(0, k_topMargin, width, textHeight), force);
-  for (int i = 0; i < k_maxNumberOfLines; i++) {
-    m_messageTextViews[i].setFrame(KDRect(0, k_topMargin+k_paragraphHeight+(i+1)*textHeight, width, textHeight), force);
-  }
-  m_cancelButton.setFrame(KDRect(k_buttonMargin, height-k_buttonMargin-k_buttonHeight, (width-3*k_buttonMargin)/2, k_buttonHeight), force);
-  m_okButton.setFrame(KDRect(2*k_buttonMargin+(width-3*k_buttonMargin)/2, height-k_buttonMargin-k_buttonHeight, (width-3*k_buttonMargin)/2, k_buttonHeight), force);
-}

apps/exam_pop_up_controller.h

@@ -1,53 +1,20 @@
 #ifndef APPS_EXAM_POP_UP_CONTROLLER_H
 #define APPS_EXAM_POP_UP_CONTROLLER_H
 
-#include <escher.h>
+#include <escher/pop_up_controller.h>
 #include "exam_pop_up_controller_delegate.h"
 #include "global_preferences.h"
 
-class HighContrastButton : public Button {
-public:
-  using Button::Button;
-  KDColor highlightedBackgroundColor() const override { return Palette::ButtonBackgroundSelectedHighContrast; }
-};
-
-class ExamPopUpController : public ViewController {
+class ExamPopUpController : public PopUpController {
 public:
   ExamPopUpController(ExamPopUpControllerDelegate * delegate);
   void setTargetExamMode(GlobalPreferences::ExamMode mode);
   GlobalPreferences::ExamMode targetExamMode() const { return m_targetExamMode; }
-  // View Controller
-  View * view() override;
   void viewDidDisappear() override;
-  // Responder
-  void didBecomeFirstResponder() override;
-  bool handleEvent(Ion::Events::Event event) override;
 private:
-  class ContentView : public View {
-  public:
-    ContentView(Responder * parentResponder);
-    void drawRect(KDContext * ctx, KDRect rect) const override;
-    void setSelectedButton(int selectedButton);
-    int selectedButton();
-    void setMessagesForExamMode(GlobalPreferences::ExamMode mode);
-  private:
-    constexpr static KDCoordinate k_buttonMargin = 10;
-    constexpr static KDCoordinate k_buttonHeight = 20;
-    constexpr static KDCoordinate k_topMargin = 12;
-    constexpr static KDCoordinate k_paragraphHeight = 20;
-    int numberOfSubviews() const override;
-    View * subviewAtIndex(int index) override;
-    void layoutSubviews(bool force = false) override;
-    HighContrastButton m_cancelButton;
-    HighContrastButton m_okButton;
-    MessageTextView m_warningTextView;
-    constexpr static int k_maxNumberOfLines = 3;
-    MessageTextView m_messageTextViews[k_maxNumberOfLines];
-  };
-  ContentView m_contentView;
+  constexpr static int k_numberOfLines = 3;
   GlobalPreferences::ExamMode m_targetExamMode;
   ExamPopUpControllerDelegate * m_delegate;
 };
 
 #endif
-