nvaccess · michaelDCurran · Mar 28, 2018 · Dec 4, 2017 · Dec 7, 2017 · Dec 7, 2017
@@ -62,7 +62,7 @@ For reference, the following dependencies are included in Git submodules:
 * [Sonic](https://github.com/waywardgeek/sonic), commit 4f8c1d11
 * [IAccessible2](http://www.linuxfoundation.org/collaborate/workgroups/accessibility/iaccessible2), version 1.3
 * [ConfigObj](http://www.voidspace.org.uk/python/configobj.html), version 4.6.0
-* [liblouis](http://www.liblouis.org/), version 3.3.0
+* [liblouis](http://www.liblouis.org/), version 3.5.0
 * NVDA images and sounds
 * System dlls not present on many systems: mfc90.dll, msvcp90.dll, msvcr90.dll, Microsoft.VC90.CRT.manifest
 * [Adobe Acrobat accessibility interface, version XI](http://download.macromedia.com/pub/developer/acrobat/AcrobatAccess.zip)

@@ -378,8 +378,6 @@ def update(self):
 		@postcondition: L{brailleCells}, L{brailleCursorPos}, L{brailleSelectionStart} and L{brailleSelectionEnd} are updated and ready for rendering.
 		"""
 		mode = louis.dotsIO
-		if config.conf["braille"]["outputPass1Only"]:
-			mode |= louis.pass1Only
 		if config.conf["braille"]["expandAtCursor"] and self.cursorPos is not None:
 			mode |= louis.compbrlAtCursor
 		text=unicode(self.rawText).replace('\0','')

@@ -66,8 +66,11 @@ def listTables():
 	"da-dk-g16.utb":"da-dk-g16.ctb",
 	"da-dk-g18.utb":"da-dk-g18.ctb",
 	"en-us-comp8.ctb" : "en-us-comp8-ext.utb",
+	"fr-ca-g1.utb":"fr-bfu-comp6.utb",
+	"Fr-Ca-g2.ctb":"fr-bfu-g2.ctb",
 	"gr-gr-g1.utb":"el.ctb",
 	"hr.ctb":"hr-comp8.utb",
+	"mn-MN.utb":"mn-MN-g1.utb",
 	"nl-BE-g1.ctb":"nl-BE-g0.utb",
 	"nl-NL-g1.ctb":"nl-NL-g0.utb",
 	"no-no.ctb":"no-no-comp8.ctb",
@@ -187,13 +190,7 @@ def listTables():
 addTable("fr-bfu-comp8.utb", _("French (unified) 8 dot computer braille"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
-addTable("fr-bfu-g2.ctb", _("French (unified) Grade 2"), contracted=True)
-# Translators: The name of a braille table displayed in the
-# braille settings dialog.
-addTable("fr-ca-g1.utb", _("French (Canada) grade 1"))
-# Translators: The name of a braille table displayed in the
-# braille settings dialog.
-addTable("Fr-Ca-g2.ctb", _("French (Canada) grade 2"), contracted=True)
+addTable("fr-bfu-g2.ctb", _("French (unified) grade 2"), contracted=True)
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
 addTable("ga-g1.utb", _("Irish grade 1"))
@@ -253,7 +250,10 @@ def listTables():
 addTable("ks-in-g1.utb", _("Kashmiri grade 1"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
-addTable("lt.ctb", _("Lithuanian"))
+addTable("lt.ctb", _("Lithuanian 8 dot"))
+# Translators: The name of a braille table displayed in the
+# braille settings dialog.
+addTable("lt-6dot.utb", _("Lithuanian 6 dot"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
 addTable("Lv-Lv-g1.utb", _("Latvian grade 1"))
@@ -265,7 +265,10 @@ def listTables():
 addTable("mn-in-g1.utb", _("Manipuri grade 1"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
-addTable("mn-MN.utb", _("Mongolian"))
+addTable("mn-MN-g1.utb", _("Mongolian grade 1"))
+# Translators: The name of a braille table displayed in the
+# braille settings dialog.
+addTable("mn-MN-g2.ctb", _("Mongolian grade 2"), contracted=True)
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
 addTable("mr-in-g1.utb", _("Marathi grade 1"))
@@ -316,6 +319,9 @@ def listTables():
 addTable("pu-in-g1.utb", _("Punjabi grade 1"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
+addTable("ro.ctb", _("Romanian"))
+# Translators: The name of a braille table displayed in the
+# braille settings dialog.
 addTable("ru-compbrl.ctb", _("Russian braille for computer code"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
@@ -349,6 +355,9 @@ def listTables():
 addTable("tr.ctb", _("Turkish grade 1"))
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.
+addTable("uk.utb", _("Ukrainian"))
+# Translators: The name of a braille table displayed in the
+# braille settings dialog.
 addTable("unicode-braille.utb", _("Unicode braille"), output=False)
 # Translators: The name of a braille table displayed in the
 # braille settings dialog.

@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 #A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2006-2017 NV Access Limited, Babbage B.V., Davy Kager
+#Copyright (C) 2006-2018 NV Access Limited, Babbage B.V., Davy Kager
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
@@ -65,7 +65,6 @@
 	readByParagraph = boolean(default=false)
 	wordWrap = boolean(default=true)
 	focusContextPresentation = option("changedContext", "fill", "scroll", default="changedContext")
-	outputPass1Only = boolean(default=true)
 
 	# Braille display driver settings
 	[[__many__]]

@@ -0,0 +1,30 @@
+#tests/unit/test_brailleTables.py
+#A part of NonVisual Desktop Access (NVDA)
+#This file is covered by the GNU General Public License.
+#See the file COPYING for more details.
+#Copyright (C) 2018 NV Access Limited, Babbage B.V.
+
+"""Unit tests for the brailleTables module.
+"""
+
+import unittest
+import brailleTables
+import os.path
+
+class TestFBrailleTables(unittest.TestCase):
+	"""Tests for braille table files and their existence."""
+
+	def test_tableExistence(self):
+		"""Tests whether all defined tables exist."""
+		tables = brailleTables.listTables()
+		for table in tables:
+			self.assertTrue(
+				os.path.isfile(os.path.join(brailleTables.TABLES_DIR, table.fileName)),
+				msg="{table} table not found".format(table=table.displayName)
+			)
+
+	def test_renamedTableExistence(self):
+		"""Tests whether all defined renamed tables are part of the actual list of tables."""
+		tableNames = [table.fileName for table in brailleTables.listTables()]
+		for name in brailleTables.RENAMED_TABLES.itervalues():
+			self.assertIn(name, tableNames)