# HG changeset patch # User Oleksandr Gavenko # Date 1473607205 -10800 # Node ID b5197c70972c6e80f325ef248fe7192fe2792c31 # Parent c7deb60dcd6270f43f10a0664caa33e621907c5e Add commonly used contractions. diff -r c7deb60dcd62 -r b5197c70972c contrib/gadict.el --- a/contrib/gadict.el Fri Sep 09 22:38:29 2016 +0300 +++ b/contrib/gadict.el Sun Sep 11 18:20:05 2016 +0300 @@ -31,7 +31,7 @@ ("^\\(?:en\\|ru\\|uk\\|la\\)> " . font-lock-doc-face) ("^\\(?:topic\\|ant\\|syn\\): " . font-lock-doc-face) ("^ +\\(?:v1\\|v2\\|v3\\|s\\|pl\\|male\\|female\\|abbr\\|comp\\|super\\|Am\\|Br\\|Au\\)$" . font-lock-doc-face) - ("^\\(?:n\\|v\\|adj\\|adv\\|pron\\|prep\\|num\\|conj\\|int\\|phr\\|phr\\.v\\|abbr\\|prefix\\)$" . font-lock-type-face) )) + ("^\\(?:n\\|v\\|adj\\|adv\\|pron\\|prep\\|num\\|conj\\|int\\|phr\\|phr\\.v\\|contr\\|abbr\\|prefix\\)$" . font-lock-type-face) )) (defun gadict-setup-fontlock () "Setup gadict fontlock." diff -r c7deb60dcd62 -r b5197c70972c gadict_en-ru+uk.gadict --- a/gadict_en-ru+uk.gadict Fri Sep 09 22:38:29 2016 +0300 +++ b/gadict_en-ru+uk.gadict Sun Sep 11 18:20:05 2016 +0300 @@ -202,6 +202,34 @@ uk: приємно познайомитись __ +I'd + [aɪd] + +contr +en: I had / I would +__ + +I'll + [aɪl] + +contr +en: I shall / I will +__ + +I'm + [aɪm] + +contr +en: I am +__ + +I've + [aɪv] + +contr +en: I have +__ + IPA [ˌaɪ piː ˈeɪ] @@ -1172,6 +1200,13 @@ uk: місцерозташування, місцезнаходження __ +aren't + [ɑːrnt] + +contr +en: are not +__ + argument [ˈɑːrɡjʊmənt] @@ -2868,6 +2903,13 @@ ru: мочь, уметь __ +can't + [kænt] + +contr +en: cannot +__ + cancer [ˈkænsər] @@ -3050,6 +3092,14 @@ uk: справа; процес __ +cell + [sel] + +n +ru: клетка (организма) +uk: клітина (організму) +__ + cellar [ˈselər] @@ -3945,6 +3995,13 @@ uk: бавовна __ +couldn't + [ˈkʊdənt] + +contr +en: could not +__ + count [kaʊnt] @@ -4638,6 +4695,13 @@ uk: словник __ +didn't + [ˈdɪdənt] + +contr +en: did not +__ + die [daɪ] s @@ -4865,6 +4929,13 @@ uk: документ __ +doesn't + [ˈdʌzənt] + +contr +en: does not +__ + dog [dɒg] @@ -4905,6 +4976,13 @@ uk: домашній __ +don't + [dəʊnt] + +contr +en: do not +__ + door [dɔːr] @@ -5830,8 +5908,9 @@ [ˈfæktəri] n -ru: фабрика; завод -uk: фабрика; завод +syn: plant +ru: фабрика; завод; предприятие +uk: фабрика; завод; підприємство __ fail @@ -6221,6 +6300,22 @@ ru: ноготь __ +finish + [ˈfɪnɪʃ] + +v +ru: заканчивать; завершать +uk: закінчувати; завершати + +n +ru: конец; окончание +uk: кінець; закінчення + +n +ru: финиш (спорт) +uk: фініш (спорт) +__ + fire [ˈfaɪr] @@ -6686,6 +6781,15 @@ uk: частий __ +frequently + [ˈfriːkwəntli] + +adv +ant: rarely +ru: часто +uk: часто +__ + fresh [freʃ] @@ -7002,6 +7106,13 @@ uk: золото __ +gonna + [ˈɡɒnə] + +contr +en: going to +__ + good [ɡʊd] better @@ -7058,6 +7169,13 @@ ru: большой, крупный __ +gotta + [ˈɡɒtə] + +contr +en: got to / got a +__ + government [ˈɡʌvərnmənt] @@ -7266,6 +7384,13 @@ uk: спортзал __ +hadn't + [ˈhædnt] + +contr +en: had not +__ + hair [heər] @@ -7381,6 +7506,13 @@ uk: щасливий __ +hasn't + [ˈhæzənt] + +contr +en: has not +__ + hat [hæt] @@ -7425,6 +7557,13 @@ uk: снідати __ +haven't + [ˈhævənt] + +contr +en: have not +__ + he [hiː] @@ -7432,6 +7571,27 @@ ru: он __ +he'd + [hid] + +contr +en: he had / he would +__ + +he'll + [hil] + +contr +en: he shall / he will +__ + +he's + [hiz] + +contr +en: he has / he is +__ + head [hed] @@ -8213,7 +8373,8 @@ v3 v -ru: воткать +ru: сплетать; переплетать +uk: сплітати; переплітати __ into @@ -8290,6 +8451,13 @@ uk: острів __ +isn't + [ˈɪzənt] + +contr +en: is not +__ + issue [ˈɪʃuː] @@ -8305,6 +8473,13 @@ ru: оно __ +it's + [ɪts] + +contr +en: it has / it is +__ + its [ɪts] @@ -8918,6 +9093,13 @@ uk: дозволити __ +let's + [lets] + +contr +en: let us +__ + letter [letər] @@ -9693,6 +9875,13 @@ uk: середина __ +mightn't + [ˈmaɪtənt] + +contr +en: might not +__ + military [ˈmɪlɪtərɪ] @@ -10178,6 +10367,13 @@ ru: должен __ +mustn't + [ˈmʌsənt] + +contr +en: must not +__ + my [maɪ] @@ -10281,6 +10477,13 @@ uk: потребувати __ +needn't + [ˈniːdnt] + +contr +en: need not +__ + negative [ˈneɡətɪv] @@ -10609,6 +10812,14 @@ uk: медсестра __ +nutrition + [njuːˈtrɪʃən] + +n +ru: питание +uk: харчування +__ + nylon [ˈnaɪlɒn] @@ -10621,6 +10832,13 @@ uk: нейлоновий __ +o'clock + [əˈklɒk] + +contr +en: of the clock +__ + oasis [əʊˈeɪsɪs] @@ -11877,9 +12095,18 @@ plant [plænt] +v +ru: сажать (растение) +uk: саджати; садити (рослину) + n ru: растерие uk: рослина + +n +syn: factory +ru: фабрика; завод; предприятие +uk: фабрика; завод; підприємство __ plate @@ -12763,11 +12990,25 @@ uk: ростити, вирощувати __ +rare + [rer] + +adj +ru: редкий; нечастый +uk: рідкісний; нечастий + +adj +ru: разреженный (газ, среда); негустой +uk: розрідженний (газ, середовище); негустий +__ + rarely - [ˈreəlɪ] - -adv -ru: редко + [ˈrerli] + +adv +ant: often; frequently +ru: редко; нечасто +uk: рідко; нечасто __ rather @@ -14003,6 +14244,13 @@ ru: неглубокий __ +shan't + [ʃænt] + +contr +en: shall not +__ + shape [ʃeɪp] @@ -14038,6 +14286,27 @@ ru: она __ +she'd + [ʃid] + +contr +en: she had / she would +__ + +she'll + [ʃil] + +contr +en: she shall / she will +__ + +she's + [ʃiz] + +contr +en: she has / she is +__ + shear v1 sheared @@ -14165,6 +14434,13 @@ uk: короткий; низький __ +shouldn't + [ˈʃʊdnt] + +contr +en: should not +__ + show [ʃəʊ] v1 @@ -16093,6 +16369,13 @@ uk: те __ +that's + [ðæts] + +contr +en: that has / that is +__ + that's all right [ðæts ɔːl raɪt] @@ -16171,6 +16454,13 @@ uk: туди __ +there's + [ðerz] + +contr +en: there has / there is +__ + these [ðiːz] @@ -16187,6 +16477,34 @@ uk: вони __ +they'd + [ðeɪd] + +contr +en: they had / they would +__ + +they'll + [ðeɪl] + +contr +en: they shall / they will +__ + +they're + [ðer] + +contr +en: they are +__ + +they've + [ðeɪv] + +contr +en: they have +__ + thick [θɪk] @@ -17454,6 +17772,13 @@ uk: гаманець __ +wanna + [ˈwɒnə] + +contr +en: want to +__ + want [wɒnt] @@ -17509,6 +17834,13 @@ uk: вмиватись __ +wasn't + [ˈwɒzənt] + +contr +en: was not +__ + watch [wɒʧ] @@ -17554,6 +17886,34 @@ ru: мы __ +we'd + [wid] + +contr +en: we had / we would +__ + +we'll + [wil] + +contr +en: we will +__ + +we're + [wɪr] + +contr +en: we are +__ + +we've + [wiv] + +contr +en: we have +__ + weak [wiːk] @@ -17693,6 +18053,13 @@ uk: ну, отож __ +weren't + [wɜːrnt] + +contr +en: were not +__ + west [west] @@ -17739,6 +18106,13 @@ uk: ким ви працюєте? __ +what's + [wɒts] + +contr +en: what is +__ + wheel [wiːl] @@ -17808,6 +18182,13 @@ uk: хто __ +who's + [huːz] + +contr +en: who is +__ + whole [həʊl] @@ -17992,6 +18373,13 @@ uk: жінка __ +won't + [wəʊnt] + +contr +en: will not +__ + wonderful [ˈwʌndərfəl] @@ -18081,6 +18469,20 @@ uk: гідний; вартий __ +would've + [ˈwʊdəv] + +contr +en: would have +__ + +wouldn't + [ˈwʊdnt] + +contr +en: would not +__ + wring v1 wrung @@ -18212,6 +18614,34 @@ ru: ты, вы __ +you'd + [juːd] + +contr +en: you had / you would +__ + +you'll + [juːl] + +contr +en: you shall / you will +__ + +you're + [jɔːr] + +contr +en: you are +__ + +you've + [juːv] + +contr +en: you have +__ + young [jʌŋ] younger diff -r c7deb60dcd62 -r b5197c70972c py/gadict.py --- a/py/gadict.py Fri Sep 09 22:38:29 2016 +0300 +++ b/py/gadict.py Sun Sep 11 18:20:05 2016 +0300 @@ -81,7 +81,7 @@ HEADWORD_RE = regex.compile(r"^(\p{L}.*)$") HEADWORD_VAR_RE = regex.compile(r"^ +(s|pl|v[123]|male|female|comp|super|abbr|Am|Br|Au)$") HEADWORD_PRON_RE = regex.compile(r"^ +\[([\p{L}' ]+)\]$") - TRANSL_POS_RE = regex.compile(r"^n|det|pron|adj|v|adv|prep|conj|num|int|phr|phr\.v|abbr|prefix$") + TRANSL_POS_RE = regex.compile(r"^n|det|pron|adj|v|adv|prep|conj|num|int|phr|phr\.v|contr|abbr|prefix$") TRANSL_RE = regex.compile(r"^(ru|uk|la|en): ([\p{L}(].*)$") TRANSL_EX_RE = regex.compile(r"^(ru|uk|la|en)> ([-\p{L}].*)$") TOPIC_RE = regex.compile(r"^topic: (\p{L}.*)$") diff -r c7deb60dcd62 -r b5197c70972c www/HACKING.rst --- a/www/HACKING.rst Fri Sep 09 22:38:29 2016 +0300 +++ b/www/HACKING.rst Sun Sep 11 18:20:05 2016 +0300 @@ -108,6 +108,7 @@ * ``abbr`` - abbreviation * ``phr`` - phrase * ``phr.v`` - phrasal verb +* ``contr`` - contraction * ``prefix`` - word prefix Each meaning may refer to topics, like: