Skip to content

Commit 3d97a71

Browse files
codeofduskcodeofdusk
authored
Merge 04e4e65 into dff28c7 
2 parents dff28c7 + 04e4e65 commit 3d97a71

6 files changed

Lines changed: 46 additions & 7 deletions

File tree

‎include/liblouis‎

Submodule liblouis updated 94 files

‎nvdaHelper/liblouis/sconscript‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
###
22
#This file is a part of the NVDA project.
33
#URL: https://www.nvaccess.org/
4-
#Copyright 2011-2018 NV Access Limited, Joseph Lee, Babbage B.V.
4+
#Copyright 2011-2024 NV Access Limited, Joseph Lee, Babbage B.V., Leonard de Ruijter
55
#This program is free software: you can redistribute it and/or modify
66
#it under the terms of the GNU General Public License version 2.0, as published by
77
#the Free Software Foundation.
@@ -56,7 +56,9 @@ if len(clangDirs) == 0:
5656
"Perhaps the C++ Clang tools for Windows component in visual Studio is not installed"
5757
)
5858
env['CC'] = 'clang-cl'
59-
59+
env['M4'] = str(env.File("#miscdeps/tools/m4.exe"))
60+
# Liblouis disables GNU extensions for m4
61+
env.Append(M4FLAGS='-G')
6062
# Don't analyze the code as not our project
6163
if 'analyze' in env['nvdaHelperDebugFlags']:
6264
env.Append(CCFLAGS='/analyze-')
@@ -102,9 +104,19 @@ env.Install(
102104
outDir.Dir("tables"),
103105
[
104106
f for f in env.Glob(f"{louisTableDir}/*")
105-
if f.name not in ("Makefile", "Makefile.am", "Makefile.in", "README", "maketablelist.sh")
107+
if f.name not in (
108+
"Makefile.am",
109+
"README",
110+
"maketablelist.sh",
111+
) and not f.name.endswith(".in")
106112
]
107113
)
114+
# Tables containing macros
115+
for f in env.Glob(f"{louisTableDir}/*.in"):
116+
env.M4(
117+
source=f,
118+
target=outDir.Dir("tables").File(os.path.splitext(f.name)[0])
119+
)
108120
# Custom tables unit test
109121
testTable = env.InstallAs(unitTestTablesDir.File("test.utb"), louisTableDir.File("en-us-comp8-ext.utb"))
110122
env.Depends(testTable, env.Install(unitTestTablesDir, [

‎projectDocs/dev/createDevEnvironment.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ For reference, the following run time dependencies are included in Git submodule
8080
* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52-dev commit `cb62d93fd7b61d8593b9ae432e6e2a78e3711a77`
8181
* [Sonic](https://github.com/waywardgeek/sonic), commit `8694c596378c24e340c09ff2cd47c065494233f1`
8282
* [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit `3d8c7f0b833453f761ded6b12d8be431507bfe0b`
83-
* [liblouis](http://www.liblouis.io/), version 3.29.0
83+
* [liblouis](http://www.liblouis.io/), version 3.30.0
8484
* [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/), version 45.0
8585
* NVDA images and sounds
8686
* [Adobe Acrobat accessibility interface, version XI](https://download.macromedia.com/pub/developer/acrobat/AcrobatAccess.zip)

‎sconstruct‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ env = Environment(variables=vars,HOST_ARCH='x86',tools=[
105105
"gettextTool",
106106
"md2html",
107107
"doxygen",
108-
"recursiveInstall"
108+
"recursiveInstall",
109+
"m4",
109110
])
110111

111112
# speed up subsequent runs by checking timestamps of targets and dependencies, and only using md5 if timestamps differ.

‎source/brailleTables.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@ def listTables() -> list[BrailleTable]:
152152
addTable("afr-za-g2.ctb", _("Afrikaans grade 2"), contracted=True)
153153
# Translators: The name of a braille table displayed in the
154154
# braille settings dialog.
155+
addTable("akk.utb", _("Akkadian (US) grade 1"))
156+
# Translators: The name of a braille table displayed in the
157+
# braille settings dialog.
158+
addTable("akk-borger.utb", _("Akkadian (Borger) grade 1"))
159+
# Translators: The name of a braille table displayed in the
160+
# braille settings dialog.
155161
addTable("ar-ar-comp8.utb", _("Arabic 8 dot computer braille"))
156162
# Translators: The name of a braille table displayed in the
157163
# braille settings dialog.
@@ -194,6 +200,9 @@ def listTables() -> list[BrailleTable]:
194200
addTable("cop-eg-comp8.utb", _("Coptic 8 dot computer braille"), input=False)
195201
# Translators: The name of a braille table displayed in the
196202
# braille settings dialog.
203+
addTable("cuneiform-transliterated.utb", _("Cuneiform (transliterated) grade 1"))
204+
# Translators: The name of a braille table displayed in the
205+
# braille settings dialog.
197206
addTable("cy-cy-g1.utb", _("Welsh grade 1"))
198207
# Translators: The name of a braille table displayed in the
199208
# braille settings dialog.
@@ -355,6 +364,9 @@ def listTables() -> list[BrailleTable]:
355364
addTable("grc-international-es.utb", _("Spanish for Greek text"))
356365
# Translators: The name of a braille table displayed in the
357366
# braille settings dialog.
367+
addTable("hbo.utb", _("Hebrew (Biblical) grade 1"))
368+
# Translators: The name of a braille table displayed in the
369+
# braille settings dialog.
358370
addTable("he-IL.utb", _("Israeli grade 1"))
359371
# Translators: The name of a braille table displayed in the
360372
# braille settings dialog.
@@ -560,6 +572,9 @@ def listTables() -> list[BrailleTable]:
560572
# Translators: The name of a braille table displayed in the
561573
# braille settings dialog.
562574
addTable("sr-g1.ctb", _("Serbian grade 1"))
575+
# Translators: The name of a braille table displayed in the
576+
# braille settings dialog.
577+
addTable("sr-Cyrl.ctb", _("Serbian Cyrillic grade 1"))
563578

564579
# Translators: The name of a braille table displayed in the
565580
# braille settings dialog.
@@ -589,6 +604,9 @@ def listTables() -> list[BrailleTable]:
589604
# Translators: The name of a braille table displayed in the
590605
# braille settings dialog.
591606
addTable("sw-ke-g2.ctb", _("Swahili (Kenya) Grade 2"), contracted=True)
607+
# Translators: The name of a braille table displayed in the
608+
# braille settings dialog.
609+
addTable("syc.utb", _("Syriac grade 1"))
592610

593611
# Translators: The name of a braille table displayed in the
594612
# braille settings dialog.
@@ -616,6 +634,9 @@ def listTables() -> list[BrailleTable]:
616634
addTable("tsn-za-g2.ctb", _("Setswana grade 2"), contracted=True)
617635
# Translators: The name of a braille table displayed in the
618636
# braille settings dialog.
637+
addTable("uga.utb", _("Ugaritic grade 1"))
638+
# Translators: The name of a braille table displayed in the
639+
# braille settings dialog.
619640
addTable("uk.utb", _("Ukrainian grade 1"))
620641
# Translators: The name of a braille table displayed in the
621642
# braille settings dialog.
@@ -659,6 +680,9 @@ def listTables() -> list[BrailleTable]:
659680
# Translators: The name of a braille table displayed in the
660681
# braille settings dialog.
661682
addTable("xh-za-g2.ctb", _("Xhosa grade 2"), contracted=True)
683+
# Translators: The name of a braille table displayed in the
684+
# braille settings dialog.
685+
addTable("yi.utb", _("Yiddish grade 1"))
662686

663687
# Translators: The name of a braille table displayed in the
664688
# braille settings dialog.

‎user_docs/en/changes.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ You can enable this functionality for both speech and braille in their respectiv
1010
There are several bug fixes, particularly for the Windows 11 Emoji Panel and Clipboard history.
1111
For web browsers, there are fixes for reporting error messages, figures, captions, table labels and checkbox/radio button menu items.
1212

13-
Unicode CLDR has been updated.
13+
Unicode CLDR and Liblouis have been updated.
1414

1515

1616
### New Features
@@ -27,6 +27,8 @@ Unicode CLDR has been updated.
2727
* Component updates:
2828
* Updated Unicode CLDR to version 45.0. (#16507, @OzancanKaratas)
2929
* Updated fast_diff_match_patch (used to detect changes in terminals and other dynamic content) to version 2.1.0. (#16508, @codeofdusk)
30+
* Updated LibLouis Braille translator to [3.30.0](https://github.com/liblouis/liblouis/releases/tag/v3.30.0). (#16652, @codeofdusk)
31+
* New Braille tables for Cyrillic Serbian, Yiddish, several ancient languages (Biblical Hebrew, Akkadian, Syriac, and Ugaritic), and transliterated Cuneiform text.
3032
* The fallback braille input table is now equal to the fallback output table, which is Unified English Braille Code grade 1. (#9863, @JulienCochuyt, @LeonarddeR)
3133
* NVDA will now report figures with no accessible children, but with a label or description. (#14514)
3234
* When reading by line in browse mode, "caption" is no longer reported on each line of a long figure or table caption. (#14874)

0 commit comments

Comments
 (0)