Apertium: update binaries and makefiles

CreateInstallFolder2-0.bat

@@ -1,4 +1,4 @@
-SET FLEXTRANS_VERSION=3.11
+SET FLEXTRANS_VERSION=3.11.1
 rem It doesn't matter so much what this next version # is, 1) we get requirements.txt from it. So this folder, with flextools- prepended, has to exist
 rem  2) we create a folder named this in the install
 SET INSTALL_FOLDER_VERSION=2.2.1

FLExTrans-installer.nsi

@@ -10,7 +10,7 @@
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
-!define PRODUCT_VERSION "3.11"
+!define PRODUCT_VERSION "3.11.1"
 !define PRODUCT_ZIP_FILE "FLExToolsWithFLExTrans${PRODUCT_VERSION}.zip"
 !define ADD_ON_ZIP_FILE "AddOnsForXMLmind${PRODUCT_VERSION}.zip"
 !define HERMIT_CRAB_ZIP_FILE "HermitCrabTools${PRODUCT_VERSION}.zip"
@@ -29,7 +29,7 @@ VIAddVersionKey "FileDescription" ""
 VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
 VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
 
-VIProductVersion 3.11.0.${BUILD_NUM}
+VIProductVersion 3.11.1.${BUILD_NUM}
 
 ; MUI Settings
 !define MUI_ABORTWARNING

LiveRuleTesterTool.py

@@ -5,6 +5,10 @@
 #   SIL International
 #   7/2/16
 #
+#   Version 3.11.1 - 8/30/24 - Ron Lockwood
+#    apertium_transfer now gives additional info. in the trace -- namely the target lexical
+#    unit. Remove this when outputting to the Rule Execution Information yellow box.
+#
 #   Version 3.11 - 8/20/24 - Ron Lockwood
 #    Bumped to 3.11.
 #
@@ -407,7 +411,7 @@
 # Documentation that the user sees:
 
 docs = {FTM_Name       : "Live Rule Tester Tool",
-        FTM_Version    : "3.11",
+        FTM_Version    : "3.11.1",
         FTM_ModifiesDB : False,
         FTM_Synopsis   : "Test transfer rules and synthesis live against specific words.",
         FTM_Help   : "",
@@ -2399,6 +2403,9 @@ def processLogLines(self, inputLines):
 
                 # Split into lexical units
                 lexUnitList = lexUnitsStr.split('\t')
+
+                # Each lexical unit also has / plus the target lexical unit. Remove these.
+                lexUnitList = [myLU.split('/')[0] for myLU in lexUnitList]
 
                 # Create a <p> html element
                 paragraphEl = ET.Element('p')

Makefile

@@ -1,5 +1,5 @@
 ${TARGET_PATH}: bilingual.bin transfer_rules.t1x.bin ${SOURCE_PATH}
-	${FLEXTOOLS_PATH}\apertium-transfer -t tr.t1x transfer_rules.t1x.bin bilingual.bin ${SOURCE_PATH} > ${TARGET_PATH} 2> apertium_log.txt
+	${FLEXTOOLS_PATH}\lt-proc -b -N1 -L1 bilingual.bin ${SOURCE_PATH} | ${FLEXTOOLS_PATH}\apertium-transfer -b -t tr.t1x transfer_rules.t1x.bin > ${TARGET_PATH} 2> apertium_log.txt
 bilingual.bin: ${DICTIONARY_PATH}
 	${FLEXTOOLS_PATH}\lt-comp lr ${DICTIONARY_PATH} bilingual.bin
 transfer_rules.t1x.bin: tr.t1x

Makefile.advanced

@@ -2,8 +2,10 @@ ${TARGET_PATH}: transfer_rules.t3x.bin target_text2.txt
 	${FLEXTOOLS_PATH}\apertium-postchunk -t tr.t3x transfer_rules.t3x.bin target_text2.txt > ${TARGET_PATH} 2>>apertium_log.txt
 target_text2.txt: transfer_rules.t2x.bin target_text1.txt
 	${FLEXTOOLS_PATH}\apertium-interchunk -t tr.t2x transfer_rules.t2x.bin target_text1.txt > target_text2.txt 2>>apertium_log.txt
-target_text1.txt: bilingual.bin transfer_rules.t1x.bin ${SOURCE_PATH}
-	${FLEXTOOLS_PATH}\apertium-transfer -t tr.t1x transfer_rules.t1x.bin bilingual.bin ${SOURCE_PATH} > target_text1.txt 2>apertium_log.txt
+target_text1.txt: transfer_rules.t1x.bin target_text0.txt
+	${FLEXTOOLS_PATH}\apertium-transfer -b -t tr.t1x transfer_rules.t1x.bin target_text0.txt > target_text1.txt 2>apertium_log.txt
+target_text0.txt: bilingual.bin ${SOURCE_PATH}
+	${FLEXTOOLS_PATH}\lt-proc -b -N1 -L1 bilingual.bin ${SOURCE_PATH} > target_text0.txt
 bilingual.bin: ${DICTIONARY_PATH}
 	${FLEXTOOLS_PATH}\lt-comp lr ${DICTIONARY_PATH} bilingual.bin
 transfer_rules.t1x.bin: tr.t1x

MakefileForLiveRuleTester

@@ -1,9 +1,8 @@
 target_text.txt: bilingual.bin transfer_rules.t1x.bin source_text.txt
-	${FLEXTOOLS_PATH}\apertium-transfer -t transfer_rules.t1x transfer_rules.t1x.bin bilingual.bin source_text.txt > target_text.txt 2>apertium_log.txt
+	${FLEXTOOLS_PATH}\lt-proc -b -N1 -L1 bilingual.bin source_text.txt | ${FLEXTOOLS_PATH}\apertium-transfer -b -t transfer_rules.t1x transfer_rules.t1x.bin > target_text.txt 2>apertium_log.txt
 bilingual.bin: bilingual.dix
 	${FLEXTOOLS_PATH}\lt-comp lr bilingual.dix bilingual.bin
 transfer_rules.t1x.bin: transfer_rules.t1x
 	${FLEXTOOLS_PATH}\apertium-preprocess-transfer transfer_rules.t1x transfer_rules.t1x.bin
 clean:
 	del target_text.txt bilingual.bin transfer_rules.t1x.bin
-

MakefileForLiveRuleTester.advanced

@@ -2,8 +2,10 @@ target_text.txt: transfer_rules.t3x.bin target_text2.txt
 	${FLEXTOOLS_PATH}\apertium-postchunk -t transfer_rules.t3x transfer_rules.t3x.bin target_text2.txt > target_text.txt 2>apertium_log3.txt
 target_text2.txt: transfer_rules.t2x.bin target_text1.txt
 	${FLEXTOOLS_PATH}\apertium-interchunk -t transfer_rules.t2x transfer_rules.t2x.bin target_text1.txt > target_text2.txt 2>apertium_log2.txt
-target_text1.txt: bilingual.bin transfer_rules.t1x.bin source_text.txt
-	${FLEXTOOLS_PATH}\apertium-transfer -t transfer_rules.t1x transfer_rules.t1x.bin bilingual.bin source_text.txt > target_text1.txt 2>apertium_log.txt
+target_text1.txt: transfer_rules.t1x.bin target_text0.txt
+	${FLEXTOOLS_PATH}\apertium-transfer -b -t transfer_rules.t1x transfer_rules.t1x.bin target_text0.txt > target_text1.txt 2>apertium_log.txt
+target_text0.txt: bilingual.bin source_text.txt
+	${FLEXTOOLS_PATH}\lt-prob -b -N1 -L1 bilingual.bin source_text.txt > target_text0.txt
 bilingual.bin: bilingual.dix
 	${FLEXTOOLS_PATH}\lt-comp lr bilingual.dix bilingual.bin
 transfer_rules.t1x.bin: transfer_rules.t1x
@@ -17,7 +19,6 @@ clean:
 clean_all:
 	rm -f *.bin target_*.txt source_text.txt tr.t*x log err_log bilingual.dix
 trace2: transfer_rules.t2x.bin target_text1.txt
-	cat target_text1.txt | ${FLEXTOOLS_PATH}\apertium-interchunk -t tr.t2x transfer_rules.t2x.bin > target_text2.txt 
-trace1: bilingual.bin transfer_rules.t1x.bin source_text.txt
-	cat source_text.txt | ${FLEXTOOLS_PATH}\apertium-transfer -t transfer_rules.t1x transfer_rules.t1x.bin bilingual.bin > target_text1.txt
-
+	cat target_text1.txt | ${FLEXTOOLS_PATH}\apertium-interchunk -t tr.t2x transfer_rules.t2x.bin > target_text2.txt
+trace1: transfer_rules.t1x.bin target_text0.txt
+	cat target_text0.txt | ${FLEXTOOLS_PATH}\apertium-transfer -b transfer_rules.t1x transfer_rules.t1x.bin > target_text1.txt

ReleaseChecklist.txt

@@ -1,9 +1,9 @@
 Do these things when making a new release
 -Update module version #s to X.X if they are lower. E.g. bring everything up to 3.6 that was 3.5.x
 -Finish code changes and commit
--Edit createInstallFolder2.0.bat and set the version # at the top.
--Edit C:\Users\rlboo\GitHub\FLExTrans\FLExTrans-installer.nsi setting Product version to the version #
--Change VIProductVersion in the .nsi file.
+-Edit createInstallFolder2.0.bat and set FLEXTRANS_VERSION at the top to the new version #.
+-Edit FLExTrans-installer.nsi setting PRODUCT_VERSION to the new version #.
+-Also change VIProductVersion in the .nsi file  to the new version #.
 -Change Copyright date if necessary in the .nsi file. 
 -Edit Version.py in the FlexTools folder with the new version #s (Also for FLExTools) (this shows up in the title bar and About)
 -Build and test the install locally

Version.py

@@ -2,7 +2,10 @@
 #   The version name and number to display in the title bar of the 
 #   FlexTools window.
 #
-#   Version 3.11 - 9/15/24 - Ron Lockwood
+#   Version 3.11.1 - 8/29/24 - Ron Lockwood
+#    Bumped  FLExTrans to 3.11.1
+#
+#   Version 3.11 - 8/15/24 - Ron Lockwood
 #    Bumped  FLExTrans to 3.11
 #
 #   Version 3.10.4 - 8/2/24 - Ron Lockwood
@@ -38,6 +41,6 @@
 
 Name = "FLExTrans"
 
-Version = "3.11"
+Version = "3.11.1"
 
 Title = f"{FTName} {FTVersion} ({Name} {Version})"