Skip to content

Merge master into try-chineseWordSegmentation-staging#19747

Merged
seanbudd merged 282 commits into
nvaccess:try-chineseWordSegmentation-stagingfrom
CrazySteve0605:merge-master-into-chineseWordSegmentation
Apr 20, 2026
Merged

Merge master into try-chineseWordSegmentation-staging#19747
seanbudd merged 282 commits into
nvaccess:try-chineseWordSegmentation-stagingfrom
CrazySteve0605:merge-master-into-chineseWordSegmentation

Conversation

@CrazySteve0605

Copy link
Copy Markdown
Contributor

Link to issue number:

Summary of the issue:

Description of user facing changes:

Description of developer facing changes:

Description of development approach:

Testing strategy:

Known issues with pull request:

Code Review Checklist:

  • Documentation:
    • Change log entry
    • User Documentation
    • Developer / Technical Documentation
    • Context sensitive help for GUI changes
  • Testing:
    • Unit tests
    • System (end to end) tests
    • Manual testing
  • UX of all users considered:
    • Speech
    • Braille
    • Low Vision
    • Different web browsers
    • Localization in other languages / culture than English
  • API is compatible with existing add-ons.
  • Security precautions taken.

LeonarddeR and others added 30 commits November 17, 2025 06:54
Fixes nvaccess#19152
Fixup for nvaccess#18348,
Supersedes nvaccess#19203, nvaccess#19171
Summary of the issue:

In LibreOffice, it is not possible to use braille panning since nvaccess#18348.
Description of user facing changes:

Panning works again in LibreOffice
Description of developer facing changes:

removed OffsetsTextInfo.allowMoveToOffsetPastEnd.
Description of development approach:

Rather than having one allowMoveToOffsetPastEnd class attribute, introduce a allowMoveToUnitOffsetPastEnd method that takes a unit.
…tup-python@v6 (nvaccess#19229)

Follow up
nvaccess#19219

nvaccess#19224
Summary of the issue:

Updated actions/setup-python@v5 to actions/setup-python@v6
Description of user facing changes:

none ci-cd Update
Description of developer facing changes:

Updated the version of actions/setup-python in testAndPublish.yml to 6.x
Description of development approach:

Updated the version of actions/setup-python in testAndPublish.yml to 6.x
Summary of the issue:

SCons was updated recently. This is a necessary step to build NVDA with Visual Studio 2026, which is fully supported.
Description of user facing changes:

None
Description of developer facing changes:

Support for building with VS2026 is now there, however note that VS2022 is still the standard.
Description of development approach:

Updated SCons
…s#19224)

Summary of the issue:

Updated actions/upload-artifact from v4 to v5.

Updated actions/download-artifact from 4 to 6
Description of user facing changes:

none
Description of developer facing changes:

Updated the stable versions of actions/download-artifact and actions/upload-artifact in the testAndPublish.yml file.
Description of development approach:
Description of development approach:

Updated the stable versions of actions/download-artifact and actions/upload-artifact in the testAndPublish.yml file.
…vaccess#19213)

Link to issue number:

Fixes nvaccess#19214
Summary of the issue:

When gestures include numpad operators (numpad plus, numpad minus, numpad multiply and numpad divide) and are defined with numlock on, they do not appear correctly in input gesture dialog, e.g. "num lock" instead of "num lock+numpad plus")
Description of user facing changes:

Gestures including numpad operators with num lock on are now correctly displayed in the input gesture dialog.
Description of developer facing changes:

N/A
Description of development approach:

In kayboard gestures identifiers, numlock can be considered a modifier or a main key name, depending on the situation:

    considered a modifier when combined with numpad operators, i.e. when numlock is on (but not currently physically pressed) and a numpad operator is presseed
    considered a main key name in all other other cases, i.e. when physically pressed (alone or with other modifiers such as control or shift)

In KeyboardInputGesture.getDisplayTextForIdentifier sort key name with normal modifiers, then numlock and then main key name.
…ut defined speech styles (nvaccess#19231)

<!-- Please read and fill in the following template, for an explanation
of the sections see:

https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md
Please also note that the NVDA project has a Citizen and Contributor
Code of Conduct which can be found at
https://github.com/nvaccess/nvda/blob/master/CODE_OF_CONDUCT.md. NV
Access expects that all contributors and other community members read
and abide by the rules set out in this document while participating or
contributing to this project. This includes creating or commenting on
issues and pull requests.

Please initially open PRs as a draft.
When you would like a review, mark the PR as "ready for review".
See
https://github.com/nvaccess/nvda/blob/master/.github/CONTRIBUTING.md.
-->

### Link to issue number:
Split from nvaccess#19227.

### Summary of the issue:
On languages without defined speech styles, such as `nl`, the
mathematics settings panel does not load.

### Description of how this pull request fixes the issue:
Relocate ZIP file path calculation logic.

### Testing strategy:
Verified that the mathematics settings panel opens when the nVDA
language and voice are set to Dutch.

### Known issues with pull request:
None known

### Code Review Checklist:

<!--
This checklist is a reminder of things commonly forgotten in a new PR.
Authors, please do a self-review of this pull-request.
Check items to confirm you have thought about the relevance of the item.
Where items are missing (eg unit / system tests), please explain in the
PR.
To check an item `- [ ]` becomes `- [x]`, note spacing.
You can also check the checkboxes after the PR is created.
A detailed explanation of this checklist is available here:

https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md#code-review-checklist
-->

- [n/a] Documentation: (out-of-scope, see nvaccess#19227)
  - Change log entry
  - User Documentation
  - Developer / Technical Documentation
  - Context sensitive help for GUI changes
- [x] Testing:
  - Unit tests
  - System (end to end) tests
  - Manual testing
- [x] UX of all users considered:
  - Speech
  - Braille
  - Low Vision
  - Different web browsers
  - Localization in other languages / culture than English
- [x] API is compatible with existing add-ons.
- [x] Security precautions taken.
<!-- Please read and fill in the following template, for an explanation
of the sections see:

https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md
Please also note that the NVDA project has a Citizen and Contributor
Code of Conduct which can be found at
https://github.com/nvaccess/nvda/blob/master/CODE_OF_CONDUCT.md. NV
Access expects that all contributors and other community members read
and abide by the rules set out in this document while participating or
contributing to this project. This includes creating or commenting on
issues and pull requests.

Please initially open PRs as a draft.
When you would like a review, mark the PR as "ready for review".
See
https://github.com/nvaccess/nvda/blob/master/.github/CONTRIBUTING.md.
-->

### Link to issue number:
Split from nvaccess#19227.

### Summary of the issue:
MathCAT is loaded from `sys.prefix`, which does not reliably point to
the MathCAT directory on source copies.

### Description of how this pull request fixes the issue:
The MathCAT path is calculated relative to `globalVars.appDir`.

### Testing strategy:
Verified that MathCAT is usable on source copies.

### Known issues with pull request:
None known

### Code Review Checklist:

<!--
This checklist is a reminder of things commonly forgotten in a new PR.
Authors, please do a self-review of this pull-request.
Check items to confirm you have thought about the relevance of the item.
Where items are missing (eg unit / system tests), please explain in the
PR.
To check an item `- [ ]` becomes `- [x]`, note spacing.
You can also check the checkboxes after the PR is created.
A detailed explanation of this checklist is available here:

https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md#code-review-checklist
-->

- [n/a] Documentation: (out-of-scope, see nvaccess#19227)
  - Change log entry
  - User Documentation
  - Developer / Technical Documentation
  - Context sensitive help for GUI changes
- [x] Testing:
  - Unit tests
  - System (end to end) tests
  - Manual testing
- [x] UX of all users considered:
  - Speech
  - Braille
  - Low Vision
  - Different web browsers
  - Localization in other languages / culture than English
- [x] API is compatible with existing add-ons.
- [x] Security precautions taken.
### Link to issue number:
None

### Summary of the issue:
Edited the MathCAT section of the user guide, both the overview and
settings sections for clarity and organization.

### Description of user facing changes:
User guide content edits.

### Description of developer facing changes:
The following edits were made:

* Typical use is now a level 4 heading
* ETS acronym expanded (Educational Testing Service)

### Description of development approach:
Edited and proofread to make sure content is clearer.

### Testing strategy:
None (manual proofreading is recommended)

### Known issues with pull request:
None

### Code Review Checklist:

<!--
This checklist is a reminder of things commonly forgotten in a new PR.
Authors, please do a self-review of this pull-request.
Check items to confirm you have thought about the relevance of the item.
Where items are missing (eg unit / system tests), please explain in the
PR.
To check an item `- [ ]` becomes `- [x]`, note spacing.
You can also check the checkboxes after the PR is created.
A detailed explanation of this checklist is available here:

https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md#code-review-checklist
-->

- [x] Documentation:
  - Change log entry
  - User Documentation
  - Developer / Technical Documentation
  - Context sensitive help for GUI changes
- [x] Testing:
  - Unit tests
  - System (end to end) tests
  - Manual testing
- [x] UX of all users considered:
  - Speech
  - Braille
  - Low Vision
  - Different web browsers
  - Localization in other languages / culture than English
- [x] API is compatible with existing add-ons.
- [x] Security precautions taken.

---------

Co-authored-by: Sean Budd <seanbudd123@gmail.com>
…hen running in secure mode (nvaccess#19238)

Fixes nvaccess#19216
Follow-up nvaccess#19175 

### Summary of the issue:

NVDA was failing to start on secure screens, unless the serviceDebug
global parameter was set.

### Description of user facing changes:

NVDA works on secure desktops again.

### Description of developer facing changes:

None

### Description of development approach:

The issue was caused by `utils._crashHandler.CrashStats.crashStatsPath`
assuming that `globalVars.appArgs.logFileName` would always represent a
path. Notwithstanding this, it also wrote to disk, even when
`NVDAState.shouldWriteToDisk` returned `False` (i.e. in scure mode or
running from the launcher).

1. Added several defensive measures to the new `utils._crashHandler`
module.
2. Changed `watchdog.initialize` to no longer add
`utils._crashHandler.crashHandler` as an unhandled exception filter when
running in secure mode.

### Testing strategy:

Ran from source, and executed the following in the python console to
ensure automatic restarts on crash still work as expected:

```py
import ctypes;ctypes.windll.kernel32.DebugBreak()
```

Modified NVDA to allow the scratchpad in secure mode, built a
self-signed launcher, and installed it.

Hit `alt+control+delete`, and observed that NVDA worked as expected.

Added the following global plugin to the scratchpad of the user and
system config:

```py
from globalPluginHandler import GlobalPlugin
import ctypes
from tones import beep
from core import postNvdaStartup

class GlobalPlugin(GlobalPlugin):
	def __init__(self):
		super().__init__()
		postNvdaStartup.register(self.crash)

	def crash(self):
		beep(500,100)
		ctypes.windll.kernel32.DebugBreak()
```

Restarted NVDA, and observed that it started, a tone was heard, and it
crashed, and this only happened 4 times.

Hit `alt+control+delete`, and observed that NVDA started, a tone was
heard, NVDA crashed, and did not restart.

### Known issues with pull request:

When NVDA crashes on the secure desktop, no feedback is given to the
user. However, this is not new.
Fixes nvaccess#10476
Partially addresses nvaccess#16272

### Summary of the issue:

Currently, the Screen Curtain is configuration profile dependent. This
can lead to situations in which it is unexpectedly deactivated by a
config profile change.

### Description of user facing changes:

1. The Screen Curtain is no-longer config profile dependent.
2. Screen Curtain settings have been moved to anew "Privacy and
Security" settings category.

### Description of developer facing changes:

The `visionEnhancementProviders.screenCurtain` module has bee removed.

### Description of development approach:

* Added a new `screenCurtain` subpackage, and migrated the existing
`visionEnhancementProviders.screenCurtain` implementation.
* The global object pattern was used, as it is a common pattern
throughout the rest of NVDA's code.
* The core Screen Curtain code is in `screenCurtain._screenCurtain`. The
public API is accessible from `screenCurtan`, including the global
`screenCurtain.screenCurtain` object.
* Updated `core.main` and `core.resetConfiguration` to initializeand
terminate screen curtain.
* Updated the screen curtain toggle script to use the new
implementation.
* Updated the OCR script and screen curtain block action.
* Re-implemented the screen curtain settings as regular settings in a
new "Privacy and Security" panl in `gui.settingsDialogs`.
* I decided to call this category "Privacy and Security" rather than
"Security and Privacy" (as suggested in nvaccess#16272), as we already have a
"Speech" category, but no categories beginnin wit 'P'.
* Also added an unassigned command to jump directly to the privacy and
security settings.
* Completely removed the `visionEnhancementProviders.screenCurtain`
module, and updated the change log to reflect that previously deprecated
symbols that had redirects in this module have been removed.
* Bumped the config schema version, and added a profile upgrade step
that moves the settings out of `vision` and into the root section. As
the config keys are otherwise identical, this is all that is necessary.
* Updated changed strings to use `pgettext` (category "screenCurtain")

### Testing strategy:

Running from source:

* Enabled tempory screen curtain with the gesture, with and without the
warning enabled. Disabled.
* Enabled screen curtain with the gesture, with and without the dialog
enabled. Disabled.
* Checked and uncheckd the screen curtain option in Privacy and Security
settings, with and without the warning enabled. Also checked that
unchecking the option to show a warning was reflected in the settings
dialog when the warning dialog was shown from NVDA settings.
* Enabled and disabled Screen Curtain with sounds turned on and off.
* Created a configuration profile. Enabled screen curtain. Saved
settings. Activated the profile. Deactivated screen curtain. Saved
settings. Switched back to normal config.
* Reset to saved configuration after enabling and disabling screen
curtain, and reset configuration to factory defaults.
* Ran from source on master, and changed screen curtain settings. Ran
from source on this branch and ensured the old settings were reflected.
Saved the config to disk and ensured that the settings were correctly
persisted to `nvda.ini`.

### Known issues with pull request:

None
Closes nvaccess#19165

### Summary of the issue:

MathPlayer is no longer maintained and is not 64-bit compatible.

### Description of user facing changes:

MathPlayer is no longer supported by NVDA.

### Description of developer facing changes:

MathPlayer code has been removed.

### Description of development approach:

* Deleted the `mathPres.mathPlayer` module
* Removed `mathPlayer_sconscript` and its callers from the build
system
* Fixed a few comments and strings that mentioned MathPlayer
* Removed MathPlayer from miscDeps nvaccess/nvda-misc-deps#48

### Testing strategy:

Rebuilt NVDA and ensured that it still works and MathCAT continues to
function.

### Known issues with pull request:

None
…s panel (nvaccess#19243)

Resolves nvaccess#19097
Summary of the issue:

Users need to open settings panel to enable image description
Description of user facing changes:

If image description is not enabled in settings pannel, it will show a dialog to enable it in current session when press the keyboard shortcut
Fixes nvaccess#19242 
Summary of the issue:

NVDA was reporting multieselectable for every table cell in Libre Office Calc.
Description of user facing changes:

    No longer redundant multiselectable reporting
    Since the table in Libre Office has the multieselectable state, reword the option in settings to talk about object, not specifically lists.
<!--pre-commit.ci start-->
updates:
- [github.com/pre-commit/pre-commit-hooks: v5.0.0 →
v6.0.0](pre-commit/pre-commit-hooks@v5.0.0...v6.0.0)
- [github.com/asottile/add-trailing-comma: v3.2.0 →
v4.0.0](asottile/add-trailing-comma@v3.2.0...v4.0.0)
- [github.com/astral-sh/ruff-pre-commit: v0.12.7 →
v0.14.5](astral-sh/ruff-pre-commit@v0.12.7...v0.14.5)
- [github.com/RobertCraigie/pyright-python: v1.1.406 →
v1.1.407](RobertCraigie/pyright-python@v1.1.406...v1.1.407)
- [github.com/astral-sh/uv-pre-commit: 0.8.4 →
0.9.11](astral-sh/uv-pre-commit@0.8.4...0.9.11)
<!--pre-commit.ci end-->

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Sean Budd <sean@nvaccess.org>
Description of user facing changes:

Users will hear punctuation and symbols in the Luxembourgish language with the supported tts.
Description of developer facing changes:

Not applicable
Description of development approach:

Created the symbols file and character descriptions for lexembourgish
Update translations from beta
… (nvaccess#19248)

Resolves nvaccess#19114
Summary of the issue:

NVDA reads the Unicode hyphen (U+2010) differently from the standard ASCII hyphen-minus (U+002D). When U+2010 appears inside compound words like "open‑source", NVDA would read it explicitly as “open hyphen source” which is incorrect.
Description of user facing changes:

Compound words containing U+2010 are now read naturally without calling out “hyphen.”
Description of developer facing changes:

Added the following line to source/locale/en/symbols.dic under Standard punctuation/symbols:
hyphen  most  always
This ensures U+2010 is preserved inside words but not spoken explicitly.
Description of development approach:

U+2010 (Unicode hyphen) previously had level=0 and preserve=0, causing it to be read aloud as “hyphen” inside words. By adding an entry in source/locale/en/symbols.dic: This sets an appropriate level and preserve value so that U+2010 is preserved in compound words but not explicitly spoken.
Summary of the issue:

Updated to actions/checkout-v6
Description of user facing changes:

none
Description of developer facing changes:

Updated testAndPublish.yml files
Description of development approach:

Updated:
uses: actions/checkout@v6
…sh (nvaccess#19256)

Link to issue number:

Not applicable
Summary of the issue:

Updates the symbol files to align it with English latest changes
Description of user facing changes:

Adds hyphen with the corresponding fixes.
Description of developer facing changes:

Not applicable
Description of development approach:

Added the hyphen from the english file to be transferred to the speech synthesizer.
nvaccess#19003 follow up 

### Summary of the issue:

This pull request makes a minor update to the licensing information in
the project documentation. The change clarifies that NVDA is available
under a modified GNU General Public License version 2 or any later
version.

Updated the license statement in `readme.md` to specify "version 2 or
later" rather than just "version 2" for the GNU General Public License.
### Summary of the issue:

This pull request adds new documentation to help Crowdin administrators
manage translations for NVDA. The main focus is on providing clear
instructions for adding languages, translation files, and translators.
Added a new section in `projectDocs/translating/admin.md` with
step-by-step instructions for adding new languages via Crowdin settings
and integrating them into NVDA.
Summary of the issue:

Fetching translations from Crowdin is failing because pre-commit is failing to install on the github actions image.
This is because pyright is failing to install.
We rely on pre-commit to ensure translated files don't introduce regressions.
https://github.com/nvaccess/nvda/actions/runs/19559152241
Description of user facing changes:

none
Description of developer facing changes:

run pyright with uv directly when using pre-commit. This might result in slightly different output to the official hook.

This has the following benefits:

    we don't need to manually sync versions
    it matches closer to what we run in GitHub CI (ci/scripts/tests/typeCheck.ps1), as pre-commit CI doesn't support pyright anyway

Description of development approach:

See above
This pull request updates translations to languages being tracked from
Crowdin.

Co-authored-by: GitHub Actions <>
Update symbols.dic for bulgarian for NVDA 2026.1.
actions-user and others added 4 commits February 27, 2026 04:15
…ccess#19707)

Summary of the issue:

The string "%d percent" is currently translated with a single form (e.g. "%d процент" in Russian). In languages like Russian that have multiple plural forms, this results in incorrect grammar (e.g. “1 процент” is correct, but “2 процент” should be “2 процента”, “5 процент” should be “5 процентов”). The code uses _() (gettext) which always picks the singular form from the translation catalogue, so plural forms cannot be used even if they are defined in the .po file.
Description of user facing changes:

Russian‑speaking users will now hear correctly pluralised percentage announcements:

    1% → “1 процент”
    2% → “2 процента”
    5% → “5 процентов”
    (and similarly for other numbers following Russian plural rules).

The same improvement can be applied to any other language that defines plural forms for this string; translators only need to supply the plural forms in their .po file.
Description of developer facing changes:

Two occurrences of _("%d percent") (in NVDAObjects/behaviors.py and winAPI/_powerTracking.py) have been replaced with ngettext("%d percent", "%d percent", n) % n. This allows the translation system to select the correct plural form based on the numeric value n. The gettext.ngettext function is imported where needed.

The Russian translation file (nvda.po) has been updated to include the three plural forms required for Russian:
Link to issue number:

N/A
Summary of the issue:

scons checkPot is more a utility and not really part of the build. Having a separate runcheckpot.bat is consistent with other utilities like rununittests or runlint. This has been suggested in a comment on PR nvaccess#19606. Since that PR was already merged, this change is done in this new PR.
Description of user facing changes:

None
Description of developer facing changes:

The scons checkPot command has been replaced with runcheckpot.bat. This script generates the pot file via scons pot, then runs tests/checkPot.py directly on the output. Any arguments (e.g. --all-cores, -j 1) are forwarded to the scons pot invocation. Since we need an up-to-date pot file to run checks and generating that file is part of the SCons build, we still have the overhead of calling SCons when running runcheckpot.bat.
Description of development approach:

    Created runcheckpot.bat following the naming and structure conventions of existing bat files (rununittests.bat, runlicensecheck.bat, etc.).
    Removed the checkPot target, action, and alias from sconstruct (the pot target is unchanged).
    Updated the pre-commit hook from language: system (invoking cmd.exe /c "scons checkPot") to language: script (invoking ./runcheckpot.bat), matching how other bat-based hooks are configured.
    Updated ci/scripts/tests/translationCheck.ps1 to call runcheckpot.bat.
    Fixed tests/checkPot.py __main__ block to call sys.exit() with the error count. Previously it only printed the count, which meant standalone invocation always exited 0 regardless of errors. This was not a problem when SCons used the return
    value directly, but is critical now that the script is invoked via bat file.
    Updated developer documentationchangelog entry.
@CrazySteve0605 CrazySteve0605 marked this pull request as ready for review March 5, 2026 17:09
@CrazySteve0605 CrazySteve0605 requested review from a team as code owners March 5, 2026 17:09
@CrazySteve0605 CrazySteve0605 requested review from Qchristensen and seanbudd and removed request for a team March 5, 2026 17:09
@seanbudd

seanbudd commented Mar 5, 2026

Copy link
Copy Markdown
Member

All tests are failing, can you ensure tests pass?

@seanbudd seanbudd marked this pull request as draft March 5, 2026 22:52
@CrazySteve0605 CrazySteve0605 force-pushed the merge-master-into-chineseWordSegmentation branch from 4273a75 to 8fd319f Compare March 24, 2026 15:26
@CrazySteve0605 CrazySteve0605 force-pushed the merge-master-into-chineseWordSegmentation branch from 3ec2a4c to 006277b Compare March 24, 2026 15:44
@seanbudd

seanbudd commented Apr 1, 2026

Copy link
Copy Markdown
Member

@CrazySteve0605 - is this ready for review?

@cary-rowen

Copy link
Copy Markdown
Contributor

Hi @CrazySteve0605

Following up on our offline discussion, I noticed you’ve been running into some difficulties with the system tests that are blocking your progress.

I spent some time investigating the failing CI on this PR.

From what I found, the original failing system tests (chrome_annotations, chrome_roleDescription, chrome_misc, and symbols) do not seem to be failing because those tests are wrong. They all point back to the same regression in the word-expansion path, specifically OffsetsTextInfo.expand for UNIT_WORD.

The issue seems to be that the new end-of-story guard touches self.obj.flowsTo too early:

  • For ChromeVBuf, flowsTo is not present, so this raises AttributeError.
  • For some other objects, the default path can raise NotImplementedError.

That is why CI often reports Speech did not finish before timeout, while the real underlying problem is that NVDA has already thrown an exception during word navigation.

You may want to try tightening that guard so flowsTo is only checked when all of these are true:

  • unit == UNIT_WORD
  • The textInfo is collapsed
  • The caret is actually at the end of the story

It would also be good to handle unsupported flowsTo access defensively, e.g., treat AttributeError / NotImplementedError the same as “no flowsTo.”

I think it would be worth adding two regression tests here:

  1. Expanding by word before end-of-story should not require flowsTo.
  2. Expanding by word at end-of-story should safely do nothing when flowsTo is unavailable.

One small unit-test detail: if you add a testcase around BasicTextProvider("one two"), the expected expanded text is probably "one " rather than "one".

I also verified this direction on my fork: after applying that fix, the original failing jobs above all passed. The only remaining failure was vscode on windows-2025, which looks separate from this regression.

Hope this helps.

@cary-rowen

Copy link
Copy Markdown
Contributor

Hi @CrazySteve0605
It looks like the CI was cancelled for some reason. You might need to push a new commit to get it running again. Also, please don't forget to mark the PR as 'Ready for review' whenever you're ready.

@CrazySteve0605 CrazySteve0605 force-pushed the merge-master-into-chineseWordSegmentation branch from c177e45 to 4c9d616 Compare April 18, 2026 08:50
@CrazySteve0605 CrazySteve0605 marked this pull request as ready for review April 19, 2026 02:59
@CrazySteve0605

Copy link
Copy Markdown
Contributor Author

Hi @cary-rowen, thank you a lot.

@CrazySteve0605

Copy link
Copy Markdown
Contributor Author

Hi @seanbudd , now it's ready for review.

@seanbudd seanbudd merged commit 9edb45f into nvaccess:try-chineseWordSegmentation-staging Apr 20, 2026
36 of 39 checks passed
@github-actions github-actions Bot added this to the 2026.2 milestone Apr 20, 2026
cary-rowen pushed a commit to cary-rowen/nvda that referenced this pull request May 27, 2026
commit e25f593
Author: wencong <manchen_0528@outlook.com>
Date:   Wed May 20 11:45:38 2026 +0800

    Address review feedback for Chinese word segmentation (nvaccess#20178)

    This PR addresses selected review suggestions from Sean on PR nvaccess#19166 and
    syncs the branch with the latest master.

    Completed:
    - [x] Move the braille offset converter helper out of the nested
    function.
    - [x] Move the word segmentation braille converter import out of the
    local scope.
    - [x] Move the word segmentation initialization debug log into
    initialize().
    - [x] Remove unsupported RuntimeError-specific handling around
    wordSeg.initialize().
    - [x] Log word segmentation initializer resolution and execution
    failures.
    - [x] Add missing return type annotations for wordSegFlag properties.
    - [x] Remove redundant int annotations from IntFlag members.
    - [x] Move test helper objects out of nested scopes and add type hints.
    - [x] Move braille test configuration setup/cleanup into setUp and
    tearDown.
    - [x] Update the help ID casing for the word segmentation setting.
    - [x] Add a user guide section for the word segmentation setting.
    - [x] Move the Chinese word segmentation change log entries to 2026.3.
    - [x] Sync with the latest nvaccess/master.

    Remaining:
    - [ ] Confirm whether the new config option should be exposed in the UI.

    ---------

    Co-authored-by: Michael Curran <mick@nvaccess.org>
    Co-authored-by: Leonard de Ruijter <3049216+LeonarddeR@users.noreply.github.com>
    Co-authored-by: Sean Budd <sean@nvaccess.org>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

commit 887ad98
Merge: 9a6bc21 102a54e
Author: Sean Budd <sean@nvaccess.org>
Date:   Mon May 18 16:23:14 2026 +1000

    Merge branch 'master' into try-chineseWordSegmentation-staging

commit 9a6bc21
Author: Wang Chong <306289287@qq.com>
Date:   Mon May 18 14:22:13 2026 +0800

    Refactor Dicts Installation Logic in cppjieba's sconscript (nvaccess#20162)

commit edf3429
Author: wencong <manchen_0528@outlook.com>
Date:   Tue May 12 08:26:06 2026 +0800

    Remove reverted settings dialog debounce changes from Chinese word segmentation branch (nvaccess#20106)

    This removes settings dialog category-change debounce code that was
    accidentally reintroduced while resolving conflicts. That code was
    previously reverted by nvaccess#19846, so this branch should follow current
    master here and only keep the Document Navigation changes needed for
    Chinese word segmentation.

    This also removes an unrelated copyright-only change in browseMode.py.

commit fab3060
Author: Wang Chong <306289287@qq.com>
Date:   Mon May 11 12:21:12 2026 +0800

    Fixup merge master into Chinese Word Segmentation (nvaccess#20055)

    <!-- Please read and fill in the following template, for an explanation
    of the sections see:

    https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md
    Please also note that the NVDA project has a Citizen and Contributor
    Code of Conduct which can be found at
    https://github.com/nvaccess/nvda/blob/master/CODE_OF_CONDUCT.md. NV
    Access expects that all contributors and other community members read
    and abide by the rules set out in this document while participating or
    contributing to this project. This includes creating or commenting on
    issues and pull requests.

    Please initially open PRs as a draft.
    When you would like a review, mark the PR as "ready for review".
    See
    https://github.com/nvaccess/nvda/blob/master/.github/CONTRIBUTING.md.
    -->
    <!-- Use Closes/Fixes/Resolves #xxx to link this PR to the issue it is
    responding to. -->

    <!--
    This checklist is a reminder of things commonly forgotten in a new PR.
    Authors, please do a self-review of this pull-request.
    Check items to confirm you have thought about the relevance of the item.
    Where items are missing (eg unit / system tests), please explain in the
    PR.
    To check an item `- [ ]` becomes `- [x]`, note spacing.
    You can also check the checkboxes after the PR is created.
    A detailed explanation of this checklist is available here:

    https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md#code-review-checklist
    -->

    - [ ] Documentation:
      - Change log entry
      - User Documentation
      - Developer / Technical Documentation
      - Context sensitive help for GUI changes
    - [ ] Testing:
      - Unit tests
      - System (end to end) tests
      - Manual testing
    - [ ] UX of all users considered:
      - Speech
      - Braille
      - Low Vision
      - Different web browsers
      - Localization in other languages / culture than English
    - [ ] API is compatible with existing add-ons.
    - [ ] Security precautions taken.

    ---------

    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

commit 31c9585
Merge: 9edb45f d42d90c
Author: Sean Budd <sean@nvaccess.org>
Date:   Mon May 4 09:25:02 2026 +1000

    Merge master into chinese word segmentation (nvaccess#20041)

    <!-- Please read and fill in the following template, for an explanation
    of the sections see:

    https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md
    Please also note that the NVDA project has a Citizen and Contributor
    Code of Conduct which can be found at
    https://github.com/nvaccess/nvda/blob/master/CODE_OF_CONDUCT.md. NV
    Access expects that all contributors and other community members read
    and abide by the rules set out in this document while participating or
    contributing to this project. This includes creating or commenting on
    issues and pull requests.

    Please initially open PRs as a draft.
    When you would like a review, mark the PR as "ready for review".
    See
    https://github.com/nvaccess/nvda/blob/master/.github/CONTRIBUTING.md.
    -->
    <!-- Use Closes/Fixes/Resolves #xxx to link this PR to the issue it is
    responding to. -->

    <!--
    This checklist is a reminder of things commonly forgotten in a new PR.
    Authors, please do a self-review of this pull-request.
    Check items to confirm you have thought about the relevance of the item.
    Where items are missing (eg unit / system tests), please explain in the
    PR.
    To check an item `- [ ]` becomes `- [x]`, note spacing.
    You can also check the checkboxes after the PR is created.
    A detailed explanation of this checklist is available here:

    https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md#code-review-checklist
    -->

    - [ ] Documentation:
      - Change log entry
      - User Documentation
      - Developer / Technical Documentation
      - Context sensitive help for GUI changes
    - [ ] Testing:
      - Unit tests
      - System (end to end) tests
      - Manual testing
    - [ ] UX of all users considered:
      - Speech
      - Braille
      - Low Vision
      - Different web browsers
      - Localization in other languages / culture than English
    - [ ] API is compatible with existing add-ons.
    - [ ] Security precautions taken.

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: GitHub Actions <github-actions@github.com>
    Co-authored-by: Sascha Cowley <16543535+SaschaCowley@users.noreply.github.com>
    Co-authored-by: Peng-An Chen <andy72039@gmail.com>
    Co-authored-by: Sean Budd <sean@nvaccess.org>
    Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
    Co-authored-by: Michael Curran <mick@nvaccess.org>
    Co-authored-by: GitHub Actions <actions@github.com>
    Co-authored-by: Bill Dengler <codeofdusk@gmail.com>
    Co-authored-by: Cyrille Bougot <cyrille.bougot2@laposte.net>
    Co-authored-by: Boumtchack <147637328+Boumtchack@users.noreply.github.com>
    Co-authored-by: Kefas Lungu <84945041+kefaslungu@users.noreply.github.com>
    Co-authored-by: Jani Kinnunen <janikinnunen340@gmail.com>
    Co-authored-by: Akash Kakkar <6381747+akash07k@users.noreply.github.com>
    Co-authored-by: makhlwf <78276231+makhlwf@users.noreply.github.com>
    Co-authored-by: Quin Gillespie <trypsynth@gmail.com>
    Co-authored-by: Bram Duvigneau <bram@bramd.nl>
    Co-authored-by: Luke Davis <8139760+XLTechie@users.noreply.github.com>
    Co-authored-by: audioses <67341000+audioses@users.noreply.github.com>
    Co-authored-by: gexgd0419 <55008943+gexgd0419@users.noreply.github.com>
    Co-authored-by: Cyrille Bougot <cyrille.bougot@laposte.net>
    Co-authored-by: Joseph Lee <joseph.lee22590@gmail.com>
    Co-authored-by: Christopher Proß <cpross@mailbox.org>
    Co-authored-by: Ryan McCleary <remccleary@gmail.com>
    Co-authored-by: wencong <manchen_0528@outlook.com>
    Co-authored-by: Emil-18 <135248352+Emil-18@users.noreply.github.com>
    Co-authored-by: Danil <50794055+Danstiv@users.noreply.github.com>
    Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
    Co-authored-by: Noelia Ruiz Martínez <nrm1977@gmail.com>
    Co-authored-by: Sean Budd <seanbudd123@gmail.com>
    Co-authored-by: James Teh <jamie@jantrid.net>
    Co-authored-by: Thiago Seus <thiago.seus@yahoo.com.br>
    Co-authored-by: WangFeng Huang <1398969445@qq.com>
    Co-authored-by: ethanl-11 <124083447+ethanl-11@users.noreply.github.com>

commit d42d90c
Merge: 07d9b13 7f2d68f
Author: cary-rowen <manchen_0528@outlook.com>
Date:   Fri May 1 22:21:05 2026 +0800

    Merge latest master into chinese word segmentation branch

commit 07d9b13
Merge: 9edb45f f7dc081
Author: cary-rowen <manchen_0528@outlook.com>
Date:   Mon Apr 20 12:03:50 2026 +0800

    Merge latest master into try-chineseWordSegmentation-staging

commit 9edb45f
Merge: 096e985 4c9d616
Author: Sean Budd <sean@nvaccess.org>
Date:   Mon Apr 20 11:01:52 2026 +1000

    Merge master into try-chineseWordSegmentation-staging (nvaccess#19747)

commit 4c9d616
Author: cary-rowen <manchen_0528@outlook.com>
Date:   Thu Apr 9 22:19:56 2026 +0800

    Fix textInfo word expansion test expectation

commit 072b405
Author: cary-rowen <manchen_0528@outlook.com>
Date:   Thu Apr 9 22:00:30 2026 +0800

    Fix word expansion without flowsTo

commit 006277b
Merge: 096e985 d8bf309
Author: Wang Chong <306289287@qq.com>
Date:   Fri Mar 6 00:35:58 2026 +0800

    Merge branch 'master'

commit 096e985
Author: Wang Chong <306289287@qq.com>
Date:   Mon Mar 2 12:02:27 2026 +0800

    Fixup for Chinese Word Segmentation and Braille Output (nvaccess#19324)

    Summary of the issue:

    Some punctuations have extra separators (spaces) before or after them.
    Description of user facing changes:

    Braille output will be more accurate.

commit 29d9f5a
Merge: b50a0d5 9cafffb
Author: Michael Curran <mick@nvaccess.org>
Date:   Thu Oct 30 12:12:25 2025 +1100

    Merge pull request nvaccess#18865 from CrazySteve0605/brailleOutputForChinese
    blocked by nvaccess#18735, related nvaccess#1890 (comment), and [a part of OSPP 2025](https://summer-ospp.ac.cn/org/prodetail/25d3e0488?list=org&navpage=org) of NVDA.
    Braille output for Chinese become easier to read.
    The displayed braille and text are not aligned with each other in Braille Viewer, which shouldn't have an effect on reading from a braille displayer since only braille is transferred and the carets of raw text and output braille are aligned.

    <!--
    This checklist is a reminder of things commonly forgotten in a new PR.
    Authors, please do a self-review of this pull-request.
    Check items to confirm you have thought about the relevance of the item.
    Where items are missing (eg unit / system tests), please explain in the PR.
    To check an item `- [ ]` becomes `- [x]`, note spacing.
    You can also check the checkboxes after the PR is created.
    A detailed explanation of this checklist is available here:
    https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md#code-review-checklist
    -->

    - [ ] Documentation:
      - Change log entry
      - User Documentation
      - Developer / Technical Documentation
      - Context sensitive help for GUI changes
    - [ ] Testing:
      - Unit tests
      - System (end to end) tests
      - Manual testing
    - [ ] UX of all users considered:
      - Speech
      - Braille
      - Low Vision
      - Different web browsers
      - Localization in other languages / culture than English
    - [ ] API is compatible with existing add-ons.
    - [ ] Security precautions taken.

commit 9cafffb
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Tue Oct 28 22:26:13 2025 +0000

    Pre-commit auto-fix

commit 0d27c91
Merge: d2714a3 b50a0d5
Author: Michael Curran <mick@nvaccess.org>
Date:   Wed Oct 29 08:23:08 2025 +1000

    Merge branch 'try-chineseWordSegmentation-staging' into brailleOutputForChinese

commit b50a0d5
Merge: c86b760 db90fff
Author: Michael Curran <mick@nvaccess.org>
Date:   Wed Oct 29 09:20:19 2025 +1100

    Merge pull request nvaccess#18735 from CrazySteve0605/wordNavigationForChineseText
    blocked by nvaccess#18548, closes nvaccess#4075, related nvaccess#16237 and [a part of OSPP 2025](https://summer-ospp.ac.cn/org/prodetail/25d3e0488?list=org&navpage=org) of NVDA.
    Chinese text can be navigated by word via system caret or review cursor.
    - [ ] update `textUtils`
    	- [x] add `WordSegment` module
    		- [x] create `WordSegmentationStrategy' as an abstract base class to select segmentation strategy based on text content, following Strategy Pattern
    		- [x] implement `ChineseWordSegmentationStrategy` (for Chinese text)
    		- [x] implement `UniscribeWordSegmentationStrategy` (for other languages as default strategy)
    	- [x] update `textUtils/__init__.py`
    		- [x] add `WordSegmenter` class for word segmentation, integrating segmentation strategies
    - [x] update `textInfos/offsets.py`
    	- [x] replace `useUniscribe` with `useUniscribeForCharOffset` & `useWordSegmenterForWordOffset` for segmentation extensions
    	- [x] integrate `WordSegmenter` for calculating word offsets
    - [ ] update document
    Word segmentation functionality was integrated in `OffsetsTextInfo`.
    In `OffsetsTextInfo`, word segmentation is based on Uniscribe by default and Unicode as a fall-back.

    Subclasses of OffsetsTextInfo
    1. `NVDAObjectTextInfo`
    2. `InputCompositionTextInfo`:
    3. `JABTextInfo`
    4. `SimpleResultTextInfo`
    5. `VirtualBufferTextInfo`: use self-hosted function to calculate offset and invoke iits superclass' `_getWordOffsets`
    1. `DisplayModelTextInfo`: straightly disable
    2. `EditTextInfo`: straightly use Uniscribe
    3. `ScintillaTextInfo`: entirely use self-defined 'word', for Scintilla-based editors such Notepad++  source/NVDAObjects/window/scintilla.py
    4. `VsTextEditPaneTextInfo`: use a special COM automation API, for Microsoft Visual Studio and Microsoft SQL Server Management Studio source/appModules/devenv.py
    5. `TextFrameTextInfo`: use self-defined 'word', based on PowerPoint's COM object, for PowerPoint's text frame  source/appModules/powerpnt.py
    6. `LwrTextInfo`: based on pre-computed words during related progress, for structured text using 'LineWordResult' (e.g. Windows OCR) source/contentRecog/__init__.py
    Some architectures totally or priorly use native difination of a 'word', which softwares depend on may not be able to use the new functionallity.
    1.  `IA2TextTextInfo`: override and fall back  source/NVDAObjects/IAccessible/\_\_init\_\_.py

    <!--
    This checklist is a reminder of things commonly forgotten in a new PR.
    Authors, please do a self-review of this pull-request.
    Check items to confirm you have thought about the relevance of the item.
    Where items are missing (eg unit / system tests), please explain in the PR.
    To check an item `- [ ]` becomes `- [x]`, note spacing.
    You can also check the checkboxes after the PR is created.
    A detailed explanation of this checklist is available here:
    https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md#code-review-checklist
    -->

    - [ ] Documentation:
      - Change log entry
      - User Documentation
      - Developer / Technical Documentation
      - Context sensitive help for GUI changes
    - [ ] Testing:
      - Unit tests
      - System (end to end) tests
      - Manual testing
    - [ ] UX of all users considered:
      - Speech
      - Braille
      - Low Vision
      - Different web browsers
      - Localization in other languages / culture than English
    - [ ] API is compatible with existing add-ons.
    - [ ] Security precautions taken.

commit db90fff
Author: Wang Chong <306289287@qq.com>
Date:   Tue Oct 28 12:57:06 2025 +0800

    remove duplicate importing lines

commit d2714a3
Author: Wang Chong <306289287@qq.com>
Date:   Mon Oct 27 11:28:27 2025 +0800

    fixup

commit 042b778
Merge: b8ace76 c86b760
Author: Michael Curran <mick@nvaccess.org>
Date:   Mon Oct 27 11:47:18 2025 +1000

    Merge branch 'try-chineseWordSegmentation-staging' into wordNavigationForChineseText

commit c86b760
Merge: 4a4b1af 9e37e57
Author: Michael Curran <mick@nvaccess.org>
Date:   Mon Oct 27 11:45:35 2025 +1000

    Merge branch 'master' into try-chineseWordSegmentation-staging

commit b8ace76
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Sat Oct 25 01:09:03 2025 +0000

    Pre-commit auto-fix

commit d32549f
Author: Wang Chong <306289287@qq.com>
Date:   Sat Oct 25 09:03:22 2025 +0800

    make word segmentation module reinitialized after settings are saved

commit 2083095
Author: Wang Chong <306289287@qq.com>
Date:   Sat Oct 25 08:50:00 2025 +0800

    fixup

commit d55d077
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Thu Oct 9 21:19:50 2025 +0000

    Pre-commit auto-fix

commit 085ba2f
Merge: 80b0472 4a4b1af
Author: Michael Curran <mick@nvaccess.org>
Date:   Fri Oct 10 07:17:56 2025 +1000

    Merge branch 'try-chineseWordSegmentation-staging' into wordNavigationForChineseText

commit 4a4b1af
Merge: 093a825 42dfcfe
Author: Michael Curran <mick@nvaccess.org>
Date:   Fri Oct 10 07:13:22 2025 +1000

    Merge branch 'master' into try-chineseWordSegmentation-staging

commit 80b0472
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Tue Sep 30 05:12:16 2025 +0000

    Pre-commit auto-fix

commit f98b1b1
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Tue Sep 30 05:10:50 2025 +0000

    Pre-commit auto-fix

commit d1373b2
Author: Wang Chong <306289287@qq.com>
Date:   Tue Sep 30 13:06:54 2025 +0800

    fixup

commit 9ab3dba
Merge: 251811e 0940a73
Author: Wang Chong <306289287@qq.com>
Date:   Tue Sep 30 13:06:22 2025 +0800

    Merge branch 'wordNavigationForChineseText' into brailleOutputForChinese

commit 0940a73
Author: Wang Chong <306289287@qq.com>
Date:   Tue Sep 30 12:59:46 2025 +0800

    fixup

commit c3a8562
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Tue Sep 30 03:25:34 2025 +0000

    Pre-commit auto-fix

commit 5e0e3fd
Author: Wang Chong <306289287@qq.com>
Date:   Tue Sep 30 11:24:03 2025 +0800

    simplify the logic for 'Auto' option in Word Segmentation Standard settings

commit 552b42b
Author: Wang Chong <306289287@qq.com>
Date:   Tue Sep 30 10:33:24 2025 +0800

    fixup unittests

commit 653e808
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Mon Sep 29 22:58:20 2025 +0000

    Pre-commit auto-fix

commit b40d709
Author: Wang Chong <306289287@qq.com>
Date:   Tue Sep 30 06:56:48 2025 +0800

    revert `Initialize Word Segmenters for Unused Languages:` checkbox and fixup the initialization logic

commit face4bd
Merge: 6f586fd 093a825
Author: Michael Curran <mick@nvaccess.org>
Date:   Mon Sep 29 12:09:28 2025 +1000

    Merge branch 'try-chineseWordSegmentation-staging' into wordNavigationForChineseText

commit 093a825
Merge: 4bc116d b327e23
Author: Michael Curran <mick@nvaccess.org>
Date:   Mon Sep 29 12:07:17 2025 +1000

    Merge branch 'integrateCppJieba' into try-chineseWordSegmentation-staging

commit b327e23
Merge: 30e855f b236fe6
Author: Michael Curran <mick@nvaccess.org>
Date:   Mon Sep 29 08:38:17 2025 +1000

    Merge branch 'try-chineseWordSegmentation-staging' into integrateCPPJieba

commit 251811e
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 28 08:04:06 2025 +0800

    update changelog

commit 3b7bf5f
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 28 08:02:59 2025 +0800

    correct and simplify the offset calculations

commit 9304a39
Merge: 2d7c596 6f586fd
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 28 08:02:28 2025 +0800

    Merge branch 'wordNavigationForChineseText' into brailleOutputForChinese

commit 6f586fd
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 28 07:58:07 2025 +0800

    update changelog

commit b69d466
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 28 07:55:26 2025 +0800

    fix up

commit 9834b68
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 27 09:16:37 2025 +0800

    extract punctuation from `wordSegStrategy.py` to `wordSegUtils.py`

commit 9479029
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 27 09:15:51 2025 +0800

    fixup

commit f769457
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Sat Sep 27 00:46:03 2025 +0000

    Pre-commit auto-fix

commit 2eec029
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 27 08:40:57 2025 +0800

    add unittest cases for `WordSegmenter`

commit 43bfe03
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 27 08:39:14 2025 +0800

    make initialization of word segmenters conditional on language

commit 111a24d
Author: Wang Chong <306289287@qq.com>
Date:   Fri Sep 26 20:50:44 2025 +0800

    update `wordSegSegmenter.py` to handle offsets at the end of the string

commit 69617c4
Merge: 53b3870 fec70a9
Author: Wang Chong <306289287@qq.com>
Date:   Fri Sep 26 20:50:03 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit fec70a9
Merge: 30e855f b236fe6
Author: Wang Chong <306289287@qq.com>
Date:   Fri Sep 26 18:11:03 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit 53b3870
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 25 23:09:55 2025 +0800

    make `cppjieba` only available when NVDA's language is set to Chinese

commit 250e700
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 25 22:32:03 2025 +0800

    update UI text for Uniscribe

commit ccf07f9
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 25 22:31:47 2025 +0800

    correct method naming

commit 38ec7ff
Merge: dc23346 5562e70
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 25 22:31:06 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit 5562e70
Merge: 30e855f 339af3e
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 25 22:29:07 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit 30e855f
Merge: 2e730d6 dc22697
Author: Michael Curran <mick@nvaccess.org>
Date:   Mon Sep 22 18:20:36 2025 +1000

    Merge branch 'try-chineseWordSegmentation-staging' into integrateCPPJieba

commit dc23346
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 21 22:58:31 2025 +0800

    Update source/core.py

    Co-authored-by: Cyrille Bougot <cyrille.bougot2@laposte.net>

commit 9537999
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 21 22:52:10 2025 +0800

    revert copyright header of `configSpec.py`

commit 90660ba
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 21 22:24:18 2025 +0800

    update `wordSegStrategy.py`

commit 7ee08d0
Merge: a8955a3 2e730d6
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 21 22:22:54 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit a8955a3
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 21 22:19:19 2025 +0800

    Revert "update module importing order and type annotations"

    This reverts commit 3bfbe59.

commit 2e730d6
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 21 00:20:19 2025 +0800

    Update .gitattributes

    Co-authored-by: Sean Budd <seanbudd123@gmail.com>

commit 194a69e
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 21 00:10:40 2025 +0800

    avoid using compilation time path

commit c2cbb24
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 20 23:53:56 2025 +0800

    Revert "Update projectDocs/dev/createDevEnvironment.md"

    This reverts commit 06070c1.

commit 0f507d5
Merge: b3e08ee 5a557d0
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 20 23:53:19 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit bac3210
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Sat Sep 13 01:33:24 2025 +0000

    Pre-commit auto-fix

commit 97eb6dd
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 13 09:19:40 2025 +0800

    handle punctuation spacing

commit 2b1d4b3
Merge: cf3e115 984b6eb
Author: Wang Chong <306289287@qq.com>
Date:   Fri Sep 12 19:12:00 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit 984b6eb
Merge: b3e08ee 3d74061
Author: Wang Chong <306289287@qq.com>
Date:   Fri Sep 12 19:09:24 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit cf3e115
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Tue Sep 9 16:49:47 2025 +0000

    Pre-commit auto-fix

commit 3a0badc
Author: Wang Chong <306289287@qq.com>
Date:   Wed Sep 10 00:37:33 2025 +0800

    update `wordSegStrategy.py`

    * add LRU caching

commit f5087cc
Merge: 3bfbe59 b3e08ee
Author: Wang Chong <306289287@qq.com>
Date:   Wed Sep 10 00:24:14 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit b3e08ee
Author: Wang Chong <306289287@qq.com>
Date:   Wed Sep 10 00:23:09 2025 +0800

    update helper of `coojieba`

commit bec5dc5
Merge: 09b1890 a210f97
Author: Wang Chong <306289287@qq.com>
Date:   Wed Sep 10 00:19:54 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit 09b1890
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 7 19:04:29 2025 +0800

    fix building script

commit 00796fe
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 7 18:39:59 2025 +0800

    revert installing script

commit 30120f8
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 7 18:38:36 2025 +0800

    update building script

commit 53158b6
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 7 18:17:50 2025 +0800

    update changelog

commit 3bfbe59
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 7 17:04:33 2025 +0800

    update module importing order and type annotations

commit b848e1b
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 7 16:28:01 2025 +0800

    update `wordSegStrategy.py`

commit abeb147
Merge: a1113d8 2955ca8
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 7 12:29:00 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit 2955ca8
Author: Wang Chong <306289287@qq.com>
Date:   Sun Sep 7 12:28:14 2025 +0800

    simplify helper of `cppjieba`

    * turn to build-in `Word` structure
    * remove some items we don't use

commit a9281f6
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 6 18:36:20 2025 +0800

    update .gitattributes for .hpp header files

commit 49cc1fe
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 6 18:31:05 2025 +0800

    update cppjieba to the latest commit

commit fe118ee
Merge: 1869ed0 e6557a7
Author: Wang Chong <306289287@qq.com>
Date:   Sat Sep 6 18:27:32 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit 2d7c596
Author: Wang Chong <306289287@qq.com>
Date:   Fri Sep 5 00:09:16 2025 +0800

    add word separator to optimize braille output for Chinese text

    * add a subclass of `OffsetConverter` to handle the offset mapping for raw text and separated one
    * add logic to invoke it when Chinese translation tables are used

commit a1113d8
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 4 14:07:24 2025 +0800

    add `segmentedText` method

commit c1fb4b8
Merge: 9e6a2e1 1869ed0
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 4 12:50:22 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit 1869ed0
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 4 12:41:29 2025 +0800

    simplify the initialization of cppjieba

    drop off initialization of the keyword extractor which we don't need

commit 11827fb
Merge: 3e495d2 952db62
Author: Wang Chong <306289287@qq.com>
Date:   Thu Sep 4 09:51:52 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit 9e6a2e1
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Thu Aug 28 11:17:31 2025 +0000

    Pre-commit auto-fix

commit 3b2d835
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 28 19:11:05 2025 +0800

     resolve deprecation

commit a4edc9e
Merge: 97b6db7 3e495d2
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 28 19:05:26 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit 3e495d2
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 28 18:13:11 2025 +0800

    add wrappers for user dict management

commit a643391
Merge: c853b64 c30a787
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 28 18:10:09 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit 97b6db7
Author: Wang Chong <306289287@qq.com>
Date:   Sun Aug 24 23:47:59 2025 +0800

    update for pyright checks

commit 4a680ea
Author: Wang Chong <306289287@qq.com>
Date:   Sun Aug 24 23:45:48 2025 +0800

    make "Auto" the default option for word navigation

commit 356c11c
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Sat Aug 23 15:35:45 2025 +0000

    Pre-commit auto-fix

commit 3ba56f0
Author: Wang Chong <306289287@qq.com>
Date:   Sat Aug 23 23:25:47 2025 +0800

    add configuration for word navigation

    users can find it in NVDA settings -> Document Navigation -> Word Segmentation Method

commit eeb96aa
Author: Wang Chong <306289287@qq.com>
Date:   Sat Aug 23 20:33:54 2025 +0800

    use multithreading for cppjieba's initialization

commit 38b4bea
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Thu Aug 21 07:00:36 2025 +0000

    Pre-commit auto-fix

commit 3f54d62
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 21 14:59:22 2025 +0800

    add initialization logic to wordSeg module

    - add an decorator to easily add initializers
    - extract `cppjieba`'s initializer to fit the decorator

commit 8244a76
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 21 11:04:44 2025 +0800

    make wordSegment module to make file structure clearer

    - create `wordSeg` package
    - migrate wordSegment module into wordSeg package and rename to wordSeg

commit d69e8b7
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 21 10:44:37 2025 +0800

    add trailing commas in multi-line constructs

commit 3c65868
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 21 10:36:16 2025 +0800

    update log

commit ddd48e8
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 21 10:33:28 2025 +0800

    add type annotations

commit 676fc42
Author: Wang Chong <306289287@qq.com>
Date:   Thu Aug 21 09:51:24 2025 +0800

    add copyright header

commit 0d40f0a
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Wed Aug 20 13:31:57 2025 +0000

    Pre-commit auto-fix

commit 407d4b2
Merge: 4adac07 adc22fb
Author: Wang Chong <306289287@qq.com>
Date:   Wed Aug 20 21:27:13 2025 +0800

    Merge branch 'integrateCPPJieba' into wordNavigationForChineseText

commit 4adac07
Author: Wang Chong <306289287@qq.com>
Date:   Wed Aug 20 21:22:52 2025 +0800

    update the word segmentation structure

    - redesign 2 properties of 'OffsetTextInfo' as enums to make them more configurable, inspired by @LeonarddeR
    - override them in some subclasses to simulate specific behaviors

commit adc22fb
Author: Wang Chong <306289287@qq.com>
Date:   Wed Aug 20 19:22:28 2025 +0800

    add wrapper for word manager

commit 19cad8a
Merge: eba63ab 92f345e
Author: Wang Chong <306289287@qq.com>
Date:   Wed Aug 20 17:35:03 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit f72d348
Author: Wang Chong <306289287@qq.com>
Date:   Mon Aug 18 15:06:19 2025 +0800

    update type annotations

commit 557f404
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Mon Aug 18 04:09:20 2025 +0000

    Pre-commit auto-fix

commit da64cd8
Author: Wang Chong <306289287@qq.com>
Date:   Mon Aug 18 12:02:49 2025 +0800

    update `displayModel.py`

    make `DisplayModelTextInfo`'s flag aligned with its superclass

commit 81f2040
Author: Wang Chong <306289287@qq.com>
Date:   Mon Aug 18 11:55:36 2025 +0800

    update `textInfos/offsets.py`

    - replace `useUniscribe` with `useUniscribeForCharOffset` & `useWordSegmenterForWordOffset` for segmentation extensions
    - integrate `WordSegmenter` for calculating word offsets

commit 9f62f04
Author: Wang Chong <306289287@qq.com>
Date:   Mon Aug 18 11:54:41 2025 +0800

    update `textUtils/__init__.py`

    add `WordSegmenter` class for word segmentation, integrating segmentation strategies

commit b0ac081
Author: Wang Chong <306289287@qq.com>
Date:   Mon Aug 18 11:38:48 2025 +0800

    add `WordSegment` module

    - create `WordSegmentationStrategy' as an abstract base class to select segmentation strategy based on text content, following Strategy Pattern
    - implement `ChineseWordSegmentationStrategy` (for Chinese text)
    - implement `UniscribeWordSegmentationStrategy` (for other languages as default strategy)

commit eba63ab
Merge: 53dd3bb b9f19e6
Author: Wang Chong <306289287@qq.com>
Date:   Fri Aug 15 14:16:16 2025 +0800

    Merge branch 'master' into integrateCPPJieba

    merge for Python updated

commit 53dd3bb
Merge: c853b64 b0241da
Author: Wang Chong <306289287@qq.com>
Date:   Sat Aug 9 20:43:34 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit c853b64
Author: Wang Chong <306289287@qq.com>
Date:   Sat Aug 9 20:33:12 2025 +0800

    Update include/readme.md

    Co-authored-by: Sean Budd <seanbudd123@gmail.com>

commit c60c2da
Author: Wang Chong <306289287@qq.com>
Date:   Sat Aug 9 20:30:58 2025 +0800

    update copyright headers based on @seanbudd's suggestions

commit 38a12dc
Author: Wang Chong <306289287@qq.com>
Date:   Wed Aug 6 21:29:22 2025 +0800

    Update building and setup script for cppjieba's dicts installation

commit da662be
Author: Wang Chong <306289287@qq.com>
Date:   Wed Aug 6 21:27:44 2025 +0800

    Update .gitignore for cppjieba

commit 0d92c08
Author: Wang Chong <306289287@qq.com>
Date:   Wed Aug 6 12:05:54 2025 +0800

    Update GitHub action workflow to fetch cppjieba's submodule

    - Change 'submodules' in 'jobs - buildNVDA - Build NVDA - Checkout NVDA' from 'true' to 'recursive' to ensure cppjieba's submodule is fetched.
    - This will cause the submodule of sonic to be fetched as well, which seems currently unused.

commit d4c3a92
Merge: f4cab8a 432364c
Author: Wang Chong <306289287@qq.com>
Date:   Wed Aug 6 11:49:16 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit f4cab8a
Merge: 7de7464 4ba948a
Author: Wang Chong <306289287@qq.com>
Date:   Tue Aug 5 17:38:55 2025 +0800

    Merge branch 'master' into integrateCPPJieba

commit 7de7464
Author: Wang Chong <306289287@qq.com>
Date:   Tue Aug 5 12:52:39 2025 +0800

    add JiebaSingleton wrapper and C API for NVDA segmentation

    - Introduce `JiebaSingleton` class in `cppjieba.hpp`/`cppjieba.cpp` with def file under nvdaHelper/cppjieba/'
      - Inherits from `cppjieba::Jieba` and exposes a thread-safe `getOffsets()` method
      - Implements Meyers’ singleton via `getInstance()` with a private constructor
      - Deletes copy constructor, copy assignment, move constructor, and move assignment to enforce single instance
    - Add C-style API in the same module:
      - `int initJieba()` to force singleton initialization
      - `int segmentOffsets(const char* text, int** charOffsets, int* outLen)` to perform segmentation and return character offsets
      - `void freeOffsets(int* ptr)` to release allocated offset buffer

commit 1fbf05f
Author: Wang Chong <306289287@qq.com>
Date:   Mon Aug 4 09:59:03 2025 +0800

    add building script for cppjieba

commit 3d4d9f1
Author: Wang Chong <306289287@qq.com>
Date:   Fri Aug 1 13:59:53 2025 +0800

    Remove changes in sconscript for localLIb

commit 2273a60
Author: Wang Chong <306289287@qq.com>
Date:   Fri Aug 1 13:06:08 2025 +0800

    Update include/readme.md

    Co-authored-by: Sean Budd <seanbudd123@gmail.com>

commit 06070c1
Author: Wang Chong <306289287@qq.com>
Date:   Fri Aug 1 13:04:22 2025 +0800

    Update projectDocs/dev/createDevEnvironment.md

    Co-authored-by: Sean Budd <seanbudd123@gmail.com>

commit ae58e9b
Author: Wang Chong <306289287@qq.com>
Date:   Thu Jul 24 16:59:26 2025 +0800

    Add comments for building script of cppjieba and its dependency

commit fb4efef
Author: Wang Chong <306289287@qq.com>
Date:   Thu Jul 24 16:51:49 2025 +0800

    Update what's new

commit 5cb5189
Author: Wang Chong <306289287@qq.com>
Date:   Wed Jul 23 17:30:56 2025 +0800

    Introduce cppjieba as a submodule for Chinese word segmentation

    - Add `cppjieba` as a Git submodule under `third_party/cppjieba/` to provide
      robust Chinese word segmentation capabilities.
    - Update `.gitmodules` to point to the official `cppjieba` repository and
      configure it to track the `master` branch.
    - Update 'sconscript' to include the paths of 'cppjieba' and its dependency 'limonp'
    - Modify `copying.txt` to include the `cppjieba` license (MIT) alongside the
      project’s existing license, ensuring proper attribution and compliance.
    - Update documents
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.