[Hejes-devel] [1695] dates: hyphen --> en dash; spell: new words

[hejes-devel at nytud.hu]

Revision: 1695
Author:   ludanyizs
Date:     2017-02-01 17:22:39 +0100 (Wed, 01 Feb 2017)
Log Message:
-----------
dates: hyphen --> en dash; spell: new words

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/modules/keltezes.py
    trunk/web2py/applications/helyesiras_webdev/modules/resources/egybekulon2.grm
    trunk/web2py/applications/helyesiras_webdev/modules/resources/sajat_szotar_akh11
    trunk/web2py/applications/helyesiras_webdev/modules/resources/sajat_szotar_akh12
    trunk/web2py/applications/helyesiras_webdev/modules/resources/spell_exceptions_akh12.tsv

Modified: trunk/web2py/applications/helyesiras_webdev/modules/keltezes.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/keltezes.py	2017-02-01 14:05:55 UTC (rev 1694)
+++ trunk/web2py/applications/helyesiras_webdev/modules/keltezes.py	2017-02-01 16:22:39 UTC (rev 1695)
@@ -90,16 +90,16 @@
 
 	#~ 2017. január 31. -- február 28.
 	if int(month) == 12:
-		out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". - " + str(int(year)+1) + ". " + listOfMonths[0][0] + " 28.", ['AkH12-296']])
-		out.append([year + ". " + listOfMonths[int(month)-1][2] + " " + day + ". - " + str(int(year)+1) + ". " + listOfMonths[0][2] + " 28.", ['AkH12-296']])
+		out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". – " + str(int(year)+1) + ". " + listOfMonths[0][0] + " 28.", ['AkH12-296']])
+		out.append([year + ". " + listOfMonths[int(month)-1][2] + " " + day + ". – " + str(int(year)+1) + ". " + listOfMonths[0][2] + " 28.", ['AkH12-296']])
 	else:
-		out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". - " + listOfMonths[int(month)][0] + " 28.", ['AkH12-296']])
-		out.append([year + ". " + listOfMonths[int(month)-1][2] + " " + day + ". - " + listOfMonths[int(month)][2] + " 28.", ['AkH12-296']])
+		out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". – " + listOfMonths[int(month)][0] + " 28.", ['AkH12-296']])
+		out.append([year + ". " + listOfMonths[int(month)-1][2] + " " + day + ". – " + listOfMonths[int(month)][2] + " 28.", ['AkH12-296']])
 	
 	#~ 2017. január 31. -- 2018. február 28.
 	if int(month) != 12:
-		out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". - " + str(int(year)+1) + ". " + listOfMonths[0][0] + " 28.", ['AkH12-296']])
-		out.append([year + ". " + listOfMonths[int(month)-1][2] + " " + day + ". - " + str(int(year)+1) + ". " + listOfMonths[0][2] + " 28.", ['AkH12-296']])
+		out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". – " + str(int(year)+1) + ". " + listOfMonths[0][0] + " 28.", ['AkH12-296']])
+		out.append([year + ". " + listOfMonths[int(month)-1][2] + " " + day + ". – " + str(int(year)+1) + ". " + listOfMonths[0][2] + " 28.", ['AkH12-296']])
 
 	#~ 2011. novemberi:
 	out.append([year + ". " + listOfMonths[int(month)-1][0] + "i", ["AkH11-294", "AkH12-296"]])

Modified: trunk/web2py/applications/helyesiras_webdev/modules/resources/egybekulon2.grm
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/resources/egybekulon2.grm	2017-02-01 14:05:55 UTC (rev 1694)
+++ trunk/web2py/applications/helyesiras_webdev/modules/resources/egybekulon2.grm	2017-02-01 16:22:39 UTC (rev 1695)
@@ -1543,17 +1543,17 @@
 kill: M_EK_IGEKOTO_3_1
 
 id: M_EK_JELOLETLEN_HATAROZOS_5_3_1_1
-rule: Adv(join1="Rogzult") + V() == V(sep='')
+rule: Adv(join1="Rogzult") + V(join2="Rogzult") == V(sep='')
 comment: Ha a jelentés: ’{RogzultDef1}’, a kifejezést egybeírjuk.
 refs: OH-92, AkH12-95, AkH12-105
-ex: alul + marad = alulmarad
+ex: alul + marad = alulmarad, tovább + tanul = továbbtanul
 kill: M_EK_JELOLETLEN_HATAROZOS_5_3_1,M_EK_JELOLT_HATAROZOS_3_1_2_1, M_EK_JELOLT_HATAROZOS_3_1_2_2, M_EK_JELOLT_HATAROZOS_3_1_3_2
 
 id: M_EK_JELOLETLEN_HATAROZOS_5_3_1_2
-rule: Adv(join1="Rogzult") + V() == V(sep=' ', hasnesep="1")
+rule: Adv(join1="Rogzult") + V(join2="Rogzult") == V(sep=' ', hasnesep="1")
 comment: Ha a jelentés '{RogzultDef2}', a kifejezést különírjuk.
 refs: OH-92, AkH12-95, AkH12-105
-ex: alul + marad = alul marad
+ex: alul + marad = alul marad, tovább + tanul = tovább tanul
 kill: M_EK_JELOLETLEN_HATAROZOS_5_3_1, M_EK_JELOLT_HATAROZOS_3_1_2_2, M_EK_JELOLT_HATAROZOS_3_1_3_2
 
 id: M_EK_JELOLETLEN_HATAROZOS_5_3_2

Modified: trunk/web2py/applications/helyesiras_webdev/modules/resources/sajat_szotar_akh11
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/resources/sajat_szotar_akh11	2017-02-01 14:05:55 UTC (rev 1694)
+++ trunk/web2py/applications/helyesiras_webdev/modules/resources/sajat_szotar_akh11	2017-02-01 16:22:39 UTC (rev 1695)
@@ -2,7 +2,7 @@
 mindenekfeletti/feletti
 műértőleg
 viszontkíván/kíván
-tehetetlenkedés/késés
+tehetetlenkedés
 Facebook
 pendrive
 debütáns/mutáns

Modified: trunk/web2py/applications/helyesiras_webdev/modules/resources/sajat_szotar_akh12
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/resources/sajat_szotar_akh12	2017-02-01 14:05:55 UTC (rev 1694)
+++ trunk/web2py/applications/helyesiras_webdev/modules/resources/sajat_szotar_akh12	2017-02-01 16:22:39 UTC (rev 1695)
@@ -3,7 +3,7 @@
 tablet/ötlet
 műértőleg
 viszontkíván/kíván
-tehetetlenkedés/késés
+tehetetlenkedés
 transzilvanizmus
 Facebook
 pendrive

Modified: trunk/web2py/applications/helyesiras_webdev/modules/resources/spell_exceptions_akh12.tsv
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/resources/spell_exceptions_akh12.tsv	2017-02-01 14:05:55 UTC (rev 1694)
+++ trunk/web2py/applications/helyesiras_webdev/modules/resources/spell_exceptions_akh12.tsv	2017-02-01 16:22:39 UTC (rev 1695)
@@ -1353,4 +1353,6 @@
 pendriveja	0	pendrive-ja
 transzszilvanizmus	0	transzilvanizmus
 fémalkatrész	0	fém alkatrész
-üzemanyagellását	0	üzemanyag-ellátás
\ No newline at end of file
+üzemanyagellását	0	üzemanyag-ellátás
+termóharisnya	0	termoharisnya
+thermoharisnya	0	termoharisnya
\ No newline at end of file