Merge branch 'add-phoneme-event-stress-marks' of https://github.com/e…

…chogarden-project/espeak-ng into add-phoneme-event-stress-marks
echogarden-project · Dec 9, 2024 · 8d342bc · 8d342bc
2 parents 006bcd2 + b978ed9
commit 8d342bc
Show file tree

Hide file tree

Showing 65 changed files with 24,078 additions and 791 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+# Keep GitHub Actions up to date with GitHub's Dependabot...
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    groups:
+      github-actions:
+        patterns:
+          - "*"  # Group all Actions updates into a single larger pull request
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -23,17 +23,17 @@ jobs:
             apkname: espeak-release-unsigned.apk
     name: Build ${{ matrix.config }} APK
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
           cache: gradle
       - name: make
         run: cd android && ./gradlew ${{ matrix.target }} --no-daemon
       - name: upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android-${{ matrix.config }}.apk
           path: android/build/outputs/apk/${{ matrix.config }}/${{ matrix.apkname }}

diff --git a/.github/workflows/autoconf.yml b/.github/workflows/autoconf.yml
@@ -23,8 +23,8 @@ jobs:
           - os: ubuntu
             osver: 22.04
           - os: macos
-            osver: 12
-          
+            osver: 14
+
           - arch: i386
             archcflags: "-m32 -msse2 -mfpmath=sse"
 
@@ -57,7 +57,7 @@ jobs:
       run: brew install gcc@12
 
     # Checkout code
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Configure
     - name: configure
@@ -74,7 +74,7 @@ jobs:
 
     - name: config-failed-upload
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: config-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}.log
         path: config.log

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,12 +25,12 @@ jobs:
             osver: 22.04
             sys: linux-gnu
           - os: macos
-            osver: 12
-            sys: apple-darwin21
+            osver: 14
+            sys: apple-darwin23
           - os: macos
             compiler: clang
-            sys: apple-darwin21.6.0
-          
+            sys: apple-darwin23.6.0
+
           - compiler: clang
             compiler_flags: "-fdebug-default-version=4"
 
@@ -99,6 +99,10 @@ jobs:
           - os: macos
             arch: riscv64
 
+          # fixme
+          - os: macos
+            compiler: gcc
+
           - os: macos
             config: valgrind # Not supported on macOS
 
@@ -206,7 +210,7 @@ jobs:
       run: brew install gcc@12
 
     # Checkout code
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     # Configure
     - name: configure
@@ -222,7 +226,7 @@ jobs:
 
     - name: config-failed-upload
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: cmake-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.compiler }}-${{ matrix.config }}-builddir
         path: build
@@ -235,4 +239,4 @@ jobs:
     - name: test
       run: |
         ${{ matrix.config_env }} ${{ matrix.runenv }} cmake --build build --target tests
-        ${{ matrix.config_env }} ${{ matrix.runenv }} ctest --test-dir build -Ttest -j8 --output-on-failure
+        ${{ matrix.config_env }} ${{ matrix.runenv }} ctest --test-dir build -T test -j8 --output-on-failure
diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
@@ -31,29 +31,29 @@ jobs:
             archconfigflags: ''
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: enable 32bit architecture
         run: sudo dpkg --add-architecture i386
         if: matrix.arch == 'x86-32'
       - name: dependencies
         run: sudo apt-get update && sudo apt-get install ${{ env.deps }} reprotest ${{ matrix.archdeps }}
       - name: run
-        run: reprotest 'CFLAGS="${{ matrix.archconfigflags }}" CXXFLAGS="${{ matrix.archconfigflags }}" rm -rf build && cmake -Bbuild -DUSE_ASYNC:BOOL=OFF && cmake --build build && ctest --test-dir build -Ttest -j1 --output-on-failure && touch success' success
+        run: reprotest 'CFLAGS="${{ matrix.archconfigflags }}" CXXFLAGS="${{ matrix.archconfigflags }}" rm -rf build && cmake -Bbuild -DUSE_ASYNC:BOOL=OFF && cmake --build build && ctest --test-dir build -T test -j1 --output-on-failure && touch success' success
 
   distcheck:
 
     runs-on: ubuntu-latest
     name: Run distcheck
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: dependencies
         run: sudo apt-get update && sudo apt-get install ${{ env.deps }}
       - name: configure
         run: cmake -Bbuild -DUSE_ASYNC:BOOL=OFF
       - name: make
         run: cmake --build build
       - name: make check
-        run: ctest --test-dir build -Ttest -j8 --output-on-failure
+        run: ctest --test-dir build -T test -j8 --output-on-failure
 
       - name: make package_source
         run: cmake --build build --target package_source
@@ -65,4 +65,4 @@ jobs:
       - name: re-make
         run: cd unpack/espeak-ng-* && cmake --build build
       - name: re-make check
-        run: cd unpack/espeak-ng-* && ctest --test-dir build -Ttest -j8 --output-on-failure
+        run: cd unpack/espeak-ng-* && ctest --test-dir build -T test -j8 --output-on-failure
diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml
@@ -25,7 +25,7 @@ jobs:
             archdeps: ""
             archconfigflags: ''
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: enable 32bit architecture
       run: sudo dpkg --add-architecture i386
       if: matrix.arch == 'x86-32'
@@ -41,13 +41,13 @@ jobs:
            ./configure ${{ matrix.archconfig }} --with-libfuzzer
     - name: Store the fuzzer config
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: config-${{ matrix.arch }}-${{ matrix.lang }}.log
         path: config.log
     - name: make
       run: make -j
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: /home/runner/work/espeak-ng/espeak-ng
         key: build-${{ matrix.arch }}-${{ github.sha }}
@@ -68,7 +68,7 @@ jobs:
           - arch: x86-64
             archdeps: ""
     steps:
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: /home/runner/work/espeak-ng/espeak-ng
         key: build-${{ matrix.arch }}-${{ github.sha }}
@@ -81,15 +81,15 @@ jobs:
       run:   mkdir tests/fuzzing/CORPUS_DIR ; FUZZ_VOICE=${{ matrix.lang }} tests/fuzzing/synth_fuzzer.test -seed=1  -runs=10000 -max_len=4096 tests/fuzzing/CORPUS_DIR
     - name: Store the crash POC
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: crash-${{ matrix.arch }}-${{ matrix.lang }}.1
         path: crash-* timeout-*
     - name: Fuzz function synth_espeak() with language-specific input
       run:   cp dictsource/${{ matrix.lang }}_* tests/fuzzing/CORPUS_DIR/ || true ; FUZZ_VOICE=${{ matrix.lang }} tests/fuzzing/synth_fuzzer.test -seed=1  -runs=10000 -max_len=4096 tests/fuzzing/CORPUS_DIR
     - name: Store the crash POC
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: crash-${{ matrix.arch }}-${{ matrix.lang }}.2
         path: crash-* timeout-*
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,6 +6,6 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v3
 
diff --git a/.github/workflows/windows-msbuild.yml b/.github/workflows/windows-msbuild.yml
@@ -0,0 +1,43 @@
+name: windows-msbuild
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    name: "build: ${{ matrix.config }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        config: [Debug, Release]
+
+    steps:
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+      - name: Install Windows 8.1 SDK
+        shell: powershell
+        run: |
+          Invoke-WebRequest -Method Get -Uri https://go.microsoft.com/fwlink/p/?LinkId=323507 -OutFile sdksetup.exe -UseBasicParsing
+          Start-Process -Wait sdksetup.exe -ArgumentList "/q", "/norestart", "/features", "OptionId.WindowsDesktopSoftwareDevelopmentKit", "OptionId.NetFxSoftwareDevelopmentKit"
+      - name: Install WiX
+        run: dotnet tool install --global wix
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Checkout pcaudiolib
+        uses: actions/checkout@v4
+        with:
+          repository: "espeak-ng/pcaudiolib"
+          path: "src/pcaudiolib"
+      - name: Do build
+        working-directory: "src/windows"
+        run: msbuild espeak-ng.sln /p:Configuration=${{ matrix.config }} /p:Platform=x64
+      - name: Upload MSI installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-${{ matrix.config }}-msi
+          path: "src/windows/installer/bin/x64/${{ matrix.config }}/espeak-ng.msi"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -24,10 +24,10 @@ jobs:
         - link: dll
           shlib: "ON"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: configure
         run: cmake -Bbuild -DUSE_ASYNC:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=${{ matrix.shlib }} -A ${{ matrix.arch }}
       - name: make
         run: cmake --build build --config ${{ matrix.config }}
       - name: make check
-        run: ctest --test-dir build -Ttest -C ${{ matrix.config }} -j8 --output-on-failure
+        run: ctest --test-dir build -T test -C ${{ matrix.config }} -j8 --output-on-failure
diff --git a/.travis.yml b/.travis.yml
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -39,6 +39,7 @@ updated languages:
 *  uz (Uzbek) -- Andiv06
 
 new languages:
+*  en-Shaw (English, Shavian script) -- Luna Rose
 *  ti (Tigrinya) -- Biniam Gebremichael
 *  mto (Totontepec Mixe) -- Bill Dengler, Elizabeth Resendiz
 *  fo (Faroese) -- Andras Eliassen, iSolveIT ApS and Setur.fo/Ravnur

diff --git a/README.md b/README.md
@@ -135,3 +135,9 @@ taken from the NetBSD `getopt_long` implementation, which is licensed under a
 [2-clause BSD](COPYING.BSD2) license.
 
 Android is a trademark of Google LLC.
+
+## Acknowledgements
+
+The catalan extension was funded by [Departament de la Vicepresidència i de Polítiques Digitals i Territori de la Generalitat de Catalunya](https://politiquesdigitals.gencat.cat/ca/inici/index.html#googtrans(ca|en) 
+within the framework of 
+[Projecte AINA](https://politiquesdigitals.gencat.cat/ca/economia/catalonia-ai/aina).
diff --git a/dictsource/ca_emoji b/dictsource/ca_emoji
@@ -12,6 +12,7 @@
 
 $textmode
 
+
 // 0000..007F : C0 Controls and Basic Latin
 
 //+	plus								// [002B] other (no translation)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,7 @@

		$textmode


		// 0000..007F : C0 Controls and Basic Latin

		//+ plus // [002B] other (no translation)
Expand Down