update to latest

Author: NSoiffer

Cargo.toml

@@ -19,19 +19,19 @@ name = "libmathcat_py"
 crate-type = ["cdylib"]
 
 [dependencies.mathcat]
-version = "0.2.0"
+version = "0.2.3"
 # for testing MathCAT without having to publish a new version (change two occurences)
-path = "../MathCAT/"
+# path = "../MathCAT/"
 
 [dependencies.pyo3]
 version = "0.15.1"
 features = ["extension-module", "abi3"]
 
 [build-dependencies]
 zip = { version = "0.6.2", default-features = false, features = ["deflate"] }
-# mathcat = "0.2.0"
+ mathcat = "0.2.3"
 # for testing MathCAT without having to publish a new version (change two occurences)
-mathcat = {version= "0.2.0", path = "../MathCAT/"}
+# mathcat = {version= "0.2.3", path = "../MathCAT/"}
 
 
 [profile.release]

NVDA-addon/.gitignore

@@ -2,9 +2,10 @@ addon/doc/*.css
 addon/doc/en/
 *_docHandler.py
 *.html
-*.ini
+manifest.ini
 *.mo
 *.pot
 *.py[co]
 *.nvda-addon
 .sconsign.dblite
+/[0-9]*.[0-9]*.[0-9]*.json

NVDA-addon/README

@@ -1,3 +1,3 @@
 To build the addon, type "scons".
 This rebuilds addon/manifest.ini and then zips up the addon dir to create 
-  MathCAT-0.1.nvda-addon  (where the version number comes from the manifest)
+  MathCAT-0.2.nvda-addon  (where the version number comes from the manifest)

NVDA-addon/buildVars.py

@@ -26,16 +26,18 @@ def _(arg):
 	"addon_description": _("""
 		MathCAT is a replacement for MathPlayer which has been discontinued.
 		It provides speech and braille support, and also supports MathPlayer's three modes of navigation.
-		The initial version of MathCAT is English-only but is designed with translations in mind.
+		The speech quality is not quite as good as MathPlayer's speech yet,
+		but the braille support is much better and includes both Nemeth and UEB Technical.
+		Translations to languages other than English are in progress.
 		"""),
 	# version
-	"addon_version": "0.2.0",
+	"addon_version": "0.2.1",
 	# Author(s)
 	"addon_author": "Neil Soiffer <soiffer@alum.mit.edu>",
 	# URL for the add-on documentation support
 	"addon_url": "https://nsoiffer.github.io/MathCAT/",
 	# URL for the add-on repository where the source code can be found
-	"addon_sourceURL": "https://github.com/NSoiffer/MathCAT",
+	"addon_sourceURL": "https://github.com/NSoiffer/MathCATForPython",
 	# Documentation file name
 	"addon_docFileName": "readme.html",
 	# Minimum NVDA version supported (e.g. "2018.3.0", minor version is optional)

NVDA-addon/sconstruct

@@ -100,7 +100,9 @@ if env["dev"]:
 	import datetime
 	buildDate = datetime.datetime.now()
 	year, month, day = str(buildDate.year), str(buildDate.month), str(buildDate.day)
-	env["addon_version"] = "".join([year, month.zfill(2), day.zfill(2), "-dev"])
+	versionTimestamp = "".join([year, month.zfill(2), day.zfill(2)])
+	env["addon_version"] = f"{versionTimestamp}-dev"
+	env["versionNumber"] = f"{versionTimestamp}.0.0"
 	env["channel"] = "dev"
 elif env["version"] is not None:
 	env["addon_version"] = env["version"]
@@ -189,20 +191,26 @@ def createAddonStoreJson(bundle):
 		versionNumberParsed = []
 	if len(versionNumberParsed):
 		major, minor, patch = [int(part) for part in versionNumberParsed]
-		jsonFilename = f'{buildVars.addon_info["addon_name"]}-{major}.{minor}.{patch}.json'
+		jsonFilename = f'{major}.{minor}.{patch}.json'
 	else:
-		jsonFilename = f'{buildVars.addon_info["addon_name"]}-{buildVars.addon_info["addon_version"]}.json'
+		jsonFilename = f'{buildVars.addon_info["addon_version"]}.json'
 		major, minor, patch = 0, 0, 0
 	print('Generating % s' % jsonFilename)
 	sha256 = hashlib.sha256()
 	with open(bundle, "rb") as f:
 		for byte_block in iter(lambda: f.read(65536), b""):
 			sha256.update(byte_block)
 	hashValue = sha256.hexdigest()
-	minimumNVDAVersion = buildVars.addon_info["addon_minimumNVDAVersion"].split(".")
+	try:
+		minimumNVDAVersion = buildVars.addon_info["addon_minimumNVDAVersion"].split(".")
+	except AttributeError:
+		minimumNVDAVersion = [0, 0, 0]
 	minMajor, minMinor = minimumNVDAVersion[:2]
 	minPatch = minimumNVDAVersion[-1] if len(minimumNVDAVersion) == 3 else "0"
-	lastTestedNVDAVersion = buildVars.addon_info["addon_lastTestedNVDAVersion"].split(".")
+	try:
+		lastTestedNVDAVersion = buildVars.addon_info["addon_lastTestedNVDAVersion"].split(".")
+	except AttributeError:
+		lastTestedNVDAVersion = [0, 0, 0]
 	lastTestedMajor, lastTestedMinor = lastTestedNVDAVersion[:2]
 	lastTestedPatch = lastTestedNVDAVersion[-1] if len(lastTestedNVDAVersion) == 3 else "0"
 	channel = buildVars.addon_info["addon_updateChannel"]