From f7723bf092cecfed5a58c880f833b5b0ea88644b Mon Sep 17 00:00:00 2001 From: berndmoos Date: Thu, 7 Nov 2024 10:23:34 +0100 Subject: [PATCH] Updated lexicon for OrthoNormal to FOLK 2.22 --- .../lexicon/FOLK_Normalization_Lexicon_JULY_2023.xml | 2 -- .../lexicon/FOLK_Normalization_Lexicon_NOV_2024.xml | 2 ++ src/org/exmaralda/orthonormal/lexicon/XMLLexicon.java | 5 +++-- src/org/exmaralda/tei/xml/gatIntonationUnits.xsl | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 src/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_JULY_2023.xml create mode 100644 src/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_NOV_2024.xml diff --git a/src/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_JULY_2023.xml b/src/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_JULY_2023.xml deleted file mode 100644 index 65e27ea5..00000000 --- a/src/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_JULY_2023.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_NOV_2024.xml b/src/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_NOV_2024.xml new file mode 100644 index 00000000..e29be9b0 --- /dev/null +++ b/src/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_NOV_2024.xml @@ -0,0 +1,2 @@ + + diff --git a/src/org/exmaralda/orthonormal/lexicon/XMLLexicon.java b/src/org/exmaralda/orthonormal/lexicon/XMLLexicon.java index ec59791e..22fe2866 100644 --- a/src/org/exmaralda/orthonormal/lexicon/XMLLexicon.java +++ b/src/org/exmaralda/orthonormal/lexicon/XMLLexicon.java @@ -38,8 +38,9 @@ public class XMLLexicon extends AbstractNormalizationLexicon { //String DEFAULT_LEXICON = "/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_MAY_2020.xml"; //String DEFAULT_LEXICON = "/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_JUNE_2021.xml"; //String DEFAULT_LEXICON = "/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_JULY_2022.xml"; - - String DEFAULT_LEXICON = "/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_JULY_2023.xml"; + //String DEFAULT_LEXICON = "/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_JULY_2023.xml"; + + String DEFAULT_LEXICON = "/org/exmaralda/orthonormal/lexicon/FOLK_Normalization_Lexicon_NOV_2024.xml"; String CAPITAL_ONLY_LIST = "/org/exmaralda/orthonormal/lexicon/dereko_capital_only.txt"; HashSet capitalOnly = new HashSet<>(240000, 1.0f); diff --git a/src/org/exmaralda/tei/xml/gatIntonationUnits.xsl b/src/org/exmaralda/tei/xml/gatIntonationUnits.xsl index be08d4db..a8e36187 100644 --- a/src/org/exmaralda/tei/xml/gatIntonationUnits.xsl +++ b/src/org/exmaralda/tei/xml/gatIntonationUnits.xsl @@ -39,6 +39,7 @@ +