switch to utf8, mwy.aff populated, ~100 words added

fin-w · Feb 8, 2023 · 040c885 · 040c885
1 parent 9e052e7
commit 040c885
Show file tree

Hide file tree

Showing 8 changed files with 135,181 additions and 21 deletions.
diff --git a/add b/add
@@ -17,17 +17,19 @@ if [[ $1 -eq "-w" ]] ; then
  echo "$2 is already in word list"
  else
  echo $2 >> dictionaries/word_list.txt
- sort -u dictionaries/word_list.txt > dictionaries/dict.tmp
- wc -l < dictionaries/dict.tmp > dictionaries/mwy.dic
- cat dictionaries/dict.tmp >> dictionaries/mwy.dic
- rm dictionaries/dict.tmp
- fi
-else
- if [[ -f $1 ]] ; then
- cat $1 >> dictionaries/word_list.txt
- sort -u dictionaries/word_list.txt > dictionaries/dict.tmp
- wc -l < dictionaries/dict.tmp > dictionaries/mwy.dic
- cat dictionaries/dict.tmp >> dictionaries/mwy.dic
- rm dictionaries/dict.tmp
+ #sort -u dictionaries/word_list.txt > dictionaries/dict.tmp
+ #wc -l < dictionaries/dict.tmp > dictionaries/tmp.dic
+ #cat dictionaries/dict.tmp >> dictionaries/tmp.dic
+ #iconv -f utf-8 -t iso-8859-1 -o dictionaries/mwy.dic dictionaries/tmp.dic
+ #rm dictionaries/dict.tmp
+ #rm dictionaries/tmp.dic
  fi
+elif [[ -f $1 ]] ; then
+ cat $1 >> dictionaries/word_list.txt
+ #sort -u dictionaries/word_list.txt > dictionaries/dict.tmp
+ #wc -l < dictionaries/dict.tmp > dictionaries/tmp.dic
+ #cat dictionaries/dict.tmp >> dictionaries/tmp.dic
+ #iconv -f utf-8 -t iso-8859-1 -o dictionaries/mwy.dic dictionaries/tmp.dic
+ #rm dictionaries/dict.tmp
+ #rm dictionaries/tmp.dic
 fi
diff --git a/build b/build
@@ -12,7 +12,7 @@ version=${version/*value=\"/}
 version=${version/\"*/} 
 
 # zip the latest files
-zip -qr out.zip description/ META-INF/ dictionaries/bangor/cy_GB.dic dictionaries/bangor/cy_GB.aff dictionaries/mwy.dic dictionaries/mwy.aff baner_cymreig.png description.xml dictionaries.xcu LICENSE
+zip -qr out.zip description/ META-INF/ dictionaries/cy_GB.dic dictionaries/cy_GB.aff dictionaries/mwy.dic dictionaries/mwy.aff baner_cymreig.png description.xml dictionaries.xcu LICENSE
 
 # rename the latest zip to oxt
 mv out.zip libreoffice-geiriadur-$version.oxt
diff --git a/description.xml b/description.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <description xmlns="http:https://openoffice.org/extensions/description/2006" xmlns:d="http:https://openoffice.org/extensions/description/2006" xmlns:xlink="http:https://www.w3.org/1999/xlink">
- <version value="v1.1" />
+ <version value="v1.2" />
  <identifier value="org.libreoffice.dictionaries.geiriadurcymraeg" />
  <display-name>
  <name lang="cy-GB">Geiriadur Cymraeg</name>
@@ -15,9 +15,9 @@
  <default xlink:href="baner_cymreig.png" />
  </icon>
  <publisher>
- <name xlink:href="https://www.youtube.com/watch?v=dQw4w9WgXcQ" lang="cy-GB">Cyfranwyr</name>
- <name xlink:href="https://www.youtube.com/watch?v=dQw4w9WgXcQ" lang="en-GB">Cyfranwyr</name>
- <name xlink:href="https://www.youtube.com/watch?v=dQw4w9WgXcQ" lang="en-US">Cyfranwyr</name>
+ <name xlink:href="https://github.com/fin-w/LibreOffice-Geiriadur-Cymraeg-Welsh-Dictionary" lang="cy-GB">Cyfranwyr</name>
+ <name xlink:href="https://github.com/fin-w/LibreOffice-Geiriadur-Cymraeg-Welsh-Dictionary" lang="en-GB">Cyfranwyr</name>
+ <name xlink:href="https://github.com/fin-w/LibreOffice-Geiriadur-Cymraeg-Welsh-Dictionary" lang="en-US">Cyfranwyr</name>
  </publisher>
  <extension-description>
  <src xlink:href="description/description-cy.txt" lang="cy-GB" />

diff --git a/dictionaries.xcu b/dictionaries.xcu
@@ -4,7 +4,7 @@
  <node oor:name="Dictionaries">
  <node oor:name="HunSpellDic_cy" oor:op="fuse">
  <prop oor:name="Locations" oor:type="oor:string-list">
- <value>%origin%/dictionaries/bangor/cy_GB.aff %origin%/dictionaries/bangor/cy_GB.dic</value>
+ <value>%origin%/dictionaries/cy_GB.aff %origin%/dictionaries/cy_GB.dic</value>
  </prop>
  <prop oor:name="Format" oor:type="xs:string">
  <value>DICT_SPELL</value>