Skip to content

Ru - Fixing conflicts PR #798 - #799

Merged
NSoiffer merged 151 commits into
daisy:rufrom
Kostenkov-2021:ru
Sep 24, 2026
Merged

NSoiffer merged 151 commits into
daisy:rufrom
Kostenkov-2021:ru

Conversation

@Kostenkov-2021

Copy link
Copy Markdown
Contributor

This PR adds fixing of conflicts with the Nain branch.
Resolves #798

NSoiffer and others added 30 commits September 27, 2024 15:28
24 test passes, 3 test failures
… atomic numbers in prescripts to bump up their liklihood number. This allows single character elements with pre subscripts that match their atomic number to be considered chemistry.
Add French to the braille testing file.
New French braille tests.
Updated French test files and added the chemistry file to the tests
Incorporate the braille.rs trait-based refactor from main. The French
braille code is now wired through the BrailleCode trait/registry:
- register "French" in get_braille_code()
- French struct impls cleanup (french_cleanup), get_braille_chars
  (get_braille_ueb_chars), and needs_grouping (needs_grouping_for_french)
- keep French-specific helpers (FRENCH_INDICATOR_REPLACEMENTS,
  french_cleanup, needs_grouping_for_french)

French now uses SPEECH_DEFINITIONS (like the other codes) instead of
BRAILLE_DEFINITIONS: braille.rs is taken from main wholesale and only the
French-specific items are re-added, with needs_grouping_for_french
converted to SPEECH_DEFINITIONS.

No new test failures: tests/braille results are identical to the
pre-merge French baseline (1394 passed, 57 failed).

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…was overly broad, so I removed scripted letters and numbers. That rule made its way into other braille codes, so I removed them everywhere. All tests pass.
…(for accented letters) so that the pattern for them looks like:

```
 - "Ñ": [t: "CA⠘⠻L⠝"]             # 0x00D1
```

Added a few tests.
…or!() message. May want to change the promoted name...
…bers don't conflict with letters.

Add code to handle `;` special case if there are "blocks" in the expr
Now at 185 passed; 4 failed
Added several more chem arrows.
…ween different arrows that go in the same direction. That seems wrong, but the spec is silent on the alternatives
…or a more restricted version for nested munder/mover. They add a "," between lines.

This was done for limit_x_tends_1_14_2_01_corrected and limit_x_tends_1_14_2_02_corrected
moritz-gross and others added 25 commits September 22, 2026 01:41
Add German ClearSpeak rule and tests for pause intent
…German

Add German localization for currency symbol placement (with test)
…g-for-German

Add support for principal logarithm in German
…bersOrdinalFractionalPluralOnes

improve German fractions
…-subset

German ClearSpeak: subset & superset
…ical-states

de: fix chemical state names
* replace lamda with lambda

* fix line endings
* remove pointless cloning

* simplify logic flow of is_user_pref

* simplify path joins

* Add comment to clarify update condition

Added a comment to prevent unnecessary updates if the value hasn't changed.

---------

Co-authored-by: NSoiffer <NSoiffer@users.noreply.github.com>
@NSoiffer
NSoiffer merged commit 2b530d1 into daisy:ru Sep 24, 2026
10 checks passed
@github-project-automation github-project-automation Bot moved this from Triage to Done in MathCAT Project Board Sep 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.