Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
699eec5
LT-21804 Disambiguate In FLEx portion
AndyBlack Mar 25, 2026
fde2b9d
LT-21804 LingTree tool used in PcPatrBrowser to show tree diagrams
AndyBlack Mar 25, 2026
8dbc25c
LT-21804 PcPatrBrowser tool used with PcPatrFLEx
AndyBlack Mar 25, 2026
1e4bf7d
LT-21804 PrepFLExDB: add properties used by PcPatrFLEx & ToneParsFLEx
AndyBlack Mar 25, 2026
f17a86b
LT-21804 PcPatrFLEx add-on utility
AndyBlack Mar 25, 2026
0b012af
LT-21804 ToneParsFLEx add-on utility
AndyBlack Mar 25, 2026
b674b94
LT-21804 'Extract ANA file' add-on utility
AndyBlack Mar 25, 2026
1d54e5f
LT-21804 top-level files
AndyBlack Mar 25, 2026
cd5c5fb
Merge branch 'main' into LT22418
AndyBlack Mar 25, 2026
b1bc773
LT-21804: imperovements based on devin.ai code review
AndyBlack Mar 26, 2026
117b020
LT-21804: get GHA unit tests to work
AndyBlack Mar 26, 2026
9db92d6
Merge branch 'main' of FieldWorks into LT22418
AndyBlack Mar 26, 2026
5cc9dc8
Merge branch 'LT22418' of sillsdev/FieldWorks into LT22418
AndyBlack Mar 27, 2026
5da4aaf
LT-21804: add missing code table files for TonePars
AndyBlack Mar 27, 2026
85c46b8
LT-21804: add missing log test files and check for new exes
AndyBlack Mar 27, 2026
9e56648
LT-21804: use temp directory for FLEx data files
AndyBlack Mar 30, 2026
3f97670
LT-21804: try to get HVO to gloss and PCPatr invoker tests to pass
AndyBlack Mar 30, 2026
0c69654
LT-21804: try to get PCPatr invoker tests to pass
AndyBlack Mar 30, 2026
3769e0e
LT-21804: add some debug output to PCPatr invoker tests
AndyBlack Mar 30, 2026
90b0e09
LT-21804: add some debug output to PCPatr invoker tests
AndyBlack Mar 30, 2026
b85ef8e
LT-21804: try using FwDirectoryFinder.ExeOrDllDirectory
AndyBlack Mar 30, 2026
c0d68dc
Merge branch 'LT22418' of FieldWorks into LT22418
AndyBlack Mar 30, 2026
432e3ac
LT22418: Try more console debug for why fails in GH but not locally
AndyBlack Mar 31, 2026
367a21c
LT22418: take flle not found; try using \r\n
AndyBlack Mar 31, 2026
006cfd2
LT22418: take flle not found; try removing "\r"
AndyBlack Mar 31, 2026
92fc751
LT22418: take flle not found; use High Process Priority
AndyBlack Mar 31, 2026
8bf6313
LT22418: take flle not found; remove 
 in bat & tak
AndyBlack Mar 31, 2026
df08e01
LT22418: take flle not found; use 'cd /d ...'
AndyBlack Apr 1, 2026
0c2c61d
LT22418: per Hasso feedback; get PcPatrBrowser toolbar to work
AndyBlack Apr 1, 2026
9f8a88b
LT-21804: Include five new addons in utility catalog
AndyBlack Apr 2, 2026
ac93775
LT-21804: Improve some tonepars invoker tests
AndyBlack Apr 2, 2026
6d235fa
LT-21804: try ignoring new utility tests to avoid test failure
AndyBlack Apr 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ Bin/ilrepack-assemblies -whitespace
*.json -whitespace
*.js -whitespace
Src/LexText/ParserCore/ParserCoreTests/**/*.txt -whitespace
Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/TestData/*.* -whitespace
Src/Utilities/pcpatrflex/PcPatrBrowserDll/Transforms/*.* -whitespace
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ DistFiles/ReleaseData/
# Exceptions
!Lib/Windows/Debug
!Lib/Windows/Release
!Src/Utilities/pcpatrflex/DisambiguateInFLExDB/DisambiguateInFLExDBTests/TestData/*.log

Lib/icu*.lib
DistFiles/Icu*/data
Expand Down
30 changes: 30 additions & 0 deletions Build/PackageRestore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<DownloadsDir>$(fwrt)/Downloads</DownloadsDir>
<!-- GeckofxHtmlToPdf: download from GitHub release (https://github.com/sillsdev/geckofxHtmlToPdf/releases) -->
<GeckofxHtmlToPdfVersion>1.1.0</GeckofxHtmlToPdfVersion>
<!-- pc-parse: download from GitHub release (https://github.com/sillsdev/CarlaLegacy/releases/) -->
<PcParseVersion>pc-parse1.0.0</PcParseVersion>
<!-- PackagesDir: Use local packages folder. -->
<PackagesDir>$(fwrt)/packages</PackagesDir>
</PropertyGroup>
Expand Down Expand Up @@ -282,6 +284,19 @@
DownloadsDir="$(DownloadsDir)"
Condition="'$(OS)'=='Windows_NT' AND !Exists('$(DownloadsDir)/Args.dll')"
/>
<!-- pc-parse binaries downloaded from GitHub release. -->
<DownloadFile
Address="https://github.com/sillsdev/CarlaLegacy/releases/download/$(PcParseVersion)/pcpatr64.exe"
LocalFilename="pcpatr64.exe"
DownloadsDir="$(DownloadsDir)"
Condition="'$(OS)'=='Windows_NT' AND !Exists('$(DownloadsDir)/pcpatr64.exe')"
/>
<DownloadFile
Address="https://github.com/sillsdev/CarlaLegacy/releases/download/$(PcParseVersion)/TonePars64.exe"
LocalFilename="TonePars64.exe"
DownloadsDir="$(DownloadsDir)"
Condition="'$(OS)'=='Windows_NT' AND !Exists('$(DownloadsDir)/TonePars64.exe')"
/>
</Target>

<!-- ======================================================================================== -->
Expand Down Expand Up @@ -527,6 +542,21 @@
OverwriteReadOnlyFiles="true"
Condition="Exists('$(DownloadsDir)/GeckofxHtmlToPdf.exe.config')"
/>
<!-- Copy pre-populated binaries from pc-parse -->
<Copy
SourceFiles="$(DownloadsDir)/pcpatr64.exe"
DestinationFiles="$(dir-outputBase)/pcpatr64.exe"
SkipUnchangedFiles="true"
OverwriteReadOnlyFiles="true"
Condition="Exists('$(DownloadsDir)/pcpatr64.exe')"
/>
<Copy
SourceFiles="$(DownloadsDir)/TonePars64.exe"
DestinationFiles="$(dir-outputBase)/TonePars64.exe"
SkipUnchangedFiles="true"
OverwriteReadOnlyFiles="true"
Condition="Exists('$(DownloadsDir)/TonePars64.exe')"
/>
<!-- Encoding Converters Files (x64 only) -->
<!-- Note: encoding-converters-core package doesn't follow standard NuGet runtime conventions
(has extra EcDistFiles folder), so automatic runtime asset copying doesn't work.
Expand Down
12 changes: 12 additions & 0 deletions DistFiles/Language Explorer/Configuration/Grammar/ToneParscd.tab
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
\unified \lx
\ch '\u' 'U'
\ch '\eType' 'T'
\ch '\a' 'A'
\ch '\c' 'C'
\ch '\wc' 'F'
\ch '\o' 'O'
\ch '\lx' 'M'
\ch '\mp' 'P'
\ch '\mcc' 'Z'
\ch '\loc' 'L'
\ch '\noload' '!'
13 changes: 13 additions & 0 deletions DistFiles/Language Explorer/Configuration/Grammar/XAmplecd.tab
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
\unified \lx
\ch '\u' 'U'
\ch '\eType' 'T'
\ch '\a' 'A'
\ch '\c' 'C'
\ch '\wc' 'c'
\ch '\o' 'O'
\ch '\lx' 'M'
\ch '\fd' 'F'
\ch '\mp' 'P'
\ch '\mcc' 'Z'
\ch '\loc' 'L'
\ch '\noload' '!'
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,9 @@
<utility assemblyPath="LexEdDll.dll" class="SIL.FieldWorks.XWorks.LexEd.GoldEticGuidFixer"/>
<utility assemblyPath="LexEdDll.dll" class="SIL.FieldWorks.XWorks.LexEd.SortReversalSubEntries"/>
<utility assemblyPath="LexEdDll.dll" class="SIL.FieldWorks.XWorks.LexEd.CircularRefBreaker"/>
<utility assemblyPath="AllomorphGenerator.dll" class="SIL.AllomorphGenerator.FLExUtility"/>
<utility assemblyPath="VariantGenerator.dll" class="SIL.VariantGenerator.FLExUtility"/>
<utility assemblyPath="ExtractAnaFilesFromTextsDll.dll" class="SIL.PcPatrFLEx.FLExUtilityExtract"/>
<utility assemblyPath="ToneParsFLExDll.dll" class="SIL.ToneParsFLEx.FLExUtility"/>
<utility assemblyPath="PcPatrFLExDll.dll" class="SIL.PcPatrFLEx.FLExUtility"/>
</utilityCatalog>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<html>
<head>
<title>Initial Feature Structure info</title>
</head>
<body>
<p>When you click on a node in the tree shown in the panel to the left, any feature structure associated with that node will show up here. (Note: if you do not have PC-PATR include feature structures in the output, then no features will ever show here.)</p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<html>
<head>
<title>Initial Interlinear info</title>
</head>
<body>
<p>When you open a file, the interlinear of the current sentence will show here.</p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<html>
<head>
<title>No Interlinear info</title>
</head>
<body>
<p>Not able to display the interlinear for this sentence.</p>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
<!--
================================================================
Test unification via XSLT
Input: Pairs of tests to apply
Output: should be identical to input
================================================================
Revision History is at the end of this file.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Preamble
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<xsl:param name="sGlossFont">Times New Roman</xsl:param>
<xsl:param name="sGlossFontSize">12</xsl:param>
<xsl:param name="sGlossFontColor">Green</xsl:param>
<xsl:param name="sLexFont">Courier New</xsl:param>
<xsl:param name="sLexFontSize">11</xsl:param>
<xsl:param name="sLexFontColor">Blue</xsl:param>
<xsl:param name="sNTFont">Times New Roman</xsl:param>
<xsl:param name="sNTFontSize">14</xsl:param>
<xsl:param name="sNTFontColor">Black</xsl:param>
<!--
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Main template
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<xsl:template match="/">
<LingTree>
<Parameters>
<Layout>
<VerticalGap>300</VerticalGap>
<HorizontalGap>300</HorizontalGap>
<InitialXCoord>100</InitialXCoord>
<InitialYCoord>300</InitialYCoord>
<HorizontalOffset>5529</HorizontalOffset>
<LexGlossGapAdjustment>10</LexGlossGapAdjustment>
<ShowFlatView>false</ShowFlatView>
</Layout>
<Fonts>
<Gloss>
<GlossFontFace>
<xsl:value-of select="$sGlossFont"/>
</GlossFontFace>
<GlossFontSize>
<xsl:value-of select="$sGlossFontSize"/>
</GlossFontSize>
<GlossFontStyle>Regular</GlossFontStyle>
<GlossColorArgb>-16744447</GlossColorArgb>
<GlossColorName>
<xsl:value-of select="$sGlossFontColor"/>
</GlossColorName>
</Gloss>
<Lex>
<LexFontFace>
<xsl:value-of select="$sLexFont"/>
</LexFontFace>
<LexFontSize>
<xsl:value-of select="$sLexFontSize"/>
</LexFontSize>
<LexFontStyle>Regular</LexFontStyle>
<LexColorArgb>-16776961</LexColorArgb>
<LexColorName>
<xsl:value-of select="$sLexFontColor"/>
</LexColorName>
</Lex>
<NT>
<NTFontFace>
<xsl:value-of select="$sNTFont"/>
</NTFontFace>
<NTFontSize>
<xsl:value-of select="$sNTFontSize"/>
</NTFontSize>
<NTFontStyle>Regular</NTFontStyle>
<NTColorArgb>-16777216</NTColorArgb>
<NTColorName>
<xsl:value-of select="$sNTFontColor"/>
</NTColorName>
</NT>
<Lines>
<LineWidth>15</LineWidth>
<LinesColorArgb>-16777216</LinesColorArgb>
<LinesColorName>Black</LinesColorName>
</Lines>
<Background>
<BackgroundColorArgb>-1</BackgroundColorArgb>
<BackgroundColorName>White</BackgroundColorName>
</Background>
</Fonts>
</Parameters>
<TreeDescription>
<xsl:apply-templates/>
</TreeDescription>
</LingTree>
</xsl:template>
<!--
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Node
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<xsl:template match="Node">
<node type="nonterminal">
<xsl:attribute name="id">
<xsl:value-of select="@id"/>
</xsl:attribute>
<label>
<xsl:value-of select="@cat"/>
<xsl:if test="@all='true'">+</xsl:if>
<xsl:if test="@fail='true'">-</xsl:if>
</label>
<xsl:apply-templates/>
</node>
</xsl:template>
<!--
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Leaf
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<xsl:template match="Leaf">
<node type="nonterminal">
<xsl:attribute name="id">
<xsl:value-of select="@id"/>
</xsl:attribute>
<label>
<xsl:value-of select="@cat"/>
</label>
<node type="lex">
<xsl:attribute name="id">
<xsl:value-of select="@id"/>lex</xsl:attribute>
<label>
<xsl:choose>
<xsl:when test="Fs/F[@name='decomposition']/Str">
<xsl:value-of select="Fs/F[@name='decomposition']/Str"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="Str"/>
</xsl:otherwise>
</xsl:choose>
</label>
<node type="gloss">
<xsl:attribute name="id">
<xsl:value-of select="@id"/>gloss</xsl:attribute>
<label>
<xsl:choose>
<xsl:when test="Fs/F[@name='gloss']/Str">
<xsl:value-of select="Fs/F[@name='gloss']/Str"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@gloss"/>
</xsl:otherwise>
</xsl:choose>
</label>
</node>
</node>
</node>
</xsl:template>
<!--
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Elements to ignore
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-->
<xsl:template match="Fs | F | Str | Lexfs"/>
</xsl:stylesheet>
<!--
================================================================
Revision History
- - - - - - - - - - - - - - - - - - -
15-Nov-2005 Andy Black Increase InitialYCoord value so the Parse x of y does not conflict with tree
21-Sep-2005 Andy Black Add plus sign to nodes with @all='true'
08-Dec-2004 Andy Black Began working on Initial Draft
================================================================
-->
Loading
Loading