[apertium-nob] 01/02: Imported Upstream version 0.6.0~r66076
Tino Didriksen
tinodidriksen-guest at moszumanska.debian.org
Tue Mar 1 14:23:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
tinodidriksen-guest pushed a commit to branch master
in repository apertium-nob.
commit 4cf305bde2846f6412c468c2c8e4c739d2a083b7
Author: Tino Didriksen <tino at didriksen.cc>
Date: Tue Mar 1 14:22:41 2016 +0000
Imported Upstream version 0.6.0~r66076
---
Makefile.am | 8 ++++----
apertium-nob.nob.dix | 12 ++++++++++--
apertium-nob.nob.rlx | 42 +++++++++++++++++++++++++++++++++---------
configure.ac | 33 +++++++++++++++++++--------------
4 files changed, 66 insertions(+), 29 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 308946f..e8ae08e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
## Makefile for apertium-nob
###############################################################################
-RELEASE=0.5
-VERSION=0.5.1
+RELEASE=0.6
+VERSION=0.6.0
LANG1=nob
BASENAME=apertium-$(LANG1)
@@ -28,10 +28,10 @@ $(LANG1).automorf.bin: $(BASENAME).$(LANG1).dix
lt-comp lr $< $@
$(LANG1).autogen.att.gz: $(LANG1).autogen.bin
- lt-print $< | gzip -9 -c > $@
+ lt-print $< | gzip -9 -c -n > $@
$(LANG1).automorf.att.gz: $(LANG1).automorf.bin
- lt-print $< | gzip -9 -c > $@
+ lt-print $< | gzip -9 -c -n > $@
###############################################################################
## Disambiguation rules
diff --git a/apertium-nob.nob.dix b/apertium-nob.nob.dix
index 5c6c8d4..2d2c9b6 100644
--- a/apertium-nob.nob.dix
+++ b/apertium-nob.nob.dix
@@ -698,7 +698,6 @@
<e> <p><l>ei</l> <r>en<s n="det"/><s n="qnt"/><s n="f"/><s n="sg"/></r></p></e>
<e> <p><l>en</l> <r>en<s n="det"/><s n="qnt"/><s n="m"/><s n="sg"/></r></p></e>
<e> <p><l>et</l> <r>en<s n="det"/><s n="qnt"/><s n="nt"/><s n="sg"/></r></p></e>
- <e r="LR"><p><l>ett</l> <r>en<s n="det"/><s n="qnt"/><s n="nt"/><s n="sg"/></r></p></e>
<e r="RL"><p><l>en-</l> <r>en<s n="det"/><s n="qnt"/><s n="m"/><s n="sg"/><s n="guio"/></r></p></e>
<e r="RL"><p><l>ei-</l> <r>en<s n="det"/><s n="qnt"/><s n="f"/><s n="sg"/><s n="guio"/></r></p></e>
<e r="RL"><p><l>et-</l> <r>en<s n="det"/><s n="qnt"/><s n="nt"/><s n="sg"/><s n="guio"/></r></p></e>
@@ -13202,6 +13201,7 @@
<e lm="da capo"> <i>da<b/>capo</i><par n="dagevis__adv"/></e>
<e lm="da"> <i>da</i><par n="dagevis__adv"/></e>
<e lm="dagevis"> <i>dagevis</i><par n="dagevis__adv"/></e>
+<e c="wp" lm="Les mer"> <i>Les<b/>mer</i><par n="dagevis__adv"/></e>
<e lm="dagstøtt"> <i>dagstøtt</i><par n="dagevis__adv"/></e>
<e lm="dakapo"> <i>dakapo</i><par n="dagevis__adv"/></e>
<e lm="dam"> <i>dam</i><par n="dagevis__adv"/></e>
@@ -18060,6 +18060,7 @@
<e lm="tone"> <i>ton</i><par n="yt/e__vblex_adj"/></e>
<e lm="trekke"> <i>tr</i><par n="tr/ekke__vblex_adj"/></e>
<e lm="bygge"> <i>byg</i><par n="byg/ge__vblex_adj"/></e>
+<e lm="innebygge"> <i>innebyg</i><par n="byg/ge__vblex_adj"/></e>
<e lm="lette"> <i>lett</i><par n="di/e__vblex_adj"/></e>
<e lm="beskrive"> <i>beskr</i><par n="r/ive__vblex_adj"/></e>
<e lm="måte"> <i>måt</i><par n="di/e__vblex_adj"/></e>
@@ -19915,6 +19916,7 @@
<e lm="midle"><i>midl</i><par n="di/e__vblex_adj"/></e>
<e lm="mige"><i>m</i><par n="m/ige__vblex_adj"/></e>
<e lm="mikse"><i>miks</i><par n="di/e__vblex_adj"/></e>
+ <e lm="remikse"><i>remiks</i><par n="di/e__vblex_adj"/></e>
<e lm="mildne"><i>mildn</i><par n="adl/e__vblex_adj"/></e>
<e lm="mime"><i>mim</i><par n="di/e__vblex_adj"/></e>
<e lm="mimre"><i>mimr</i><par n="adl/e__vblex_adj"/></e>
@@ -27571,6 +27573,9 @@
<e lm="vikarierende"> <i>vikarierende</i><par n="OK__adj"/></e>
<e lm="fastboende"> <i>fastboende</i><par n="OK__adj"/></e>
<e lm="påholdende"> <i>påholdende</i><par n="OK__adj"/></e>
+<e lm="flytende"> <i>flytende</i><par n="OK__adj"/></e>
+<e lm="flyvende"> <i>flyvende</i><par n="OK__adj"/></e>
+<e lm="flygende"> <i>flygende</i><par n="OK__adj"/></e>
<e lm="vingkantet"> <i>vingkante</i><par n="øve/t__adj"/></e>
<e lm="visuell"> <i>visuel</i><par n="ideel/l__adj"/></e>
<e lm="vitenskapsteoretisk"> <i>vitenskapsteoretisk</i><par n="minst__adj"/></e>
@@ -28634,6 +28639,7 @@
<e lm="anerkjennelse"> <i>anerkjennelse</i><par n="re_\s__n"/></e>
<e lm="adam"> <i>adam</i><par n="ep_\Ø__n"/></e>
<e lm="finner"> <i>finner</i><par n="uer__n"/></e>
+<e lm="skanner"> <i>skanner</i><par n="uer__n"/></e>
<e lm="bidragsyter"> <i>bidragsyter</i><par n="uer__n"/></e>
<e lm="euro"> <i>euro</i><par n="ep_\Ø__n"/></e>
<e lm="elev"> <i>elev</i><par n="ep_\Ø__n"/></e>
@@ -32447,7 +32453,9 @@
<e lm="avisinnlegg"><i>avisinnlegg</i><par n="ul__n"/></e>
<e lm="aviskiosk"><i>aviskiosk</i><par n="ep_\Ø__n"/></e>
<e lm="avisoveksel"><i>avisoveks</i><par n="ad/el__n"/></e>
+<e lm="piksel"><i>piks</i><par n="ad/el__n"/></e>
<e lm="avispapir"><i>avispapir</i><par n="ja_\Ø__n"/></e>
+<e lm="artefakt"><i>artefakt</i><par n="ep__n"/></e>
<e lm="avispolemikk"><i>avispolemikk</i><par n="ep_\Ø__n"/></e>
<e lm="avisredaktør"><i>avisredaktør</i><par n="ep_\Ø__n"/></e>
<e lm="avisreferat"><i>avisreferat</i><par n="ja_\Ø__n"/></e>
@@ -84432,7 +84440,7 @@
<e lm="helmelk"> <i>helmelk</i><par n="då__n"/></e>
<e lm="helmjølk"> <i>helmjølk</i><par n="då__n"/></e>
<e lm="helmørke"> <i>helmørk</i><par n="ød/e__n"/></e>
-<e lm="helning"> <i>helning</i><par n="ep__n"/></e>
+<e lm="helning"> <i>helning</i><par n="då__n"/></e>
<e lm="helningsgrad"> <i>helningsgrad</i><par n="ep__n"/></e>
<e lm="helningsvinkel"> <i>helningsvink</i><par n="ad/el__n"/></e>
<e lm="helnote"> <i>helnote</i><par n="re_\Ø__n"/></e>
diff --git a/apertium-nob.nob.rlx b/apertium-nob.nob.rlx
index 6ae5d2d..0f95b0c 100644
--- a/apertium-nob.nob.rlx
+++ b/apertium-nob.nob.rlx
@@ -142,7 +142,7 @@ LIST %imot% = "imot" ;
LIST %ingen% = "ingen" ;
LIST %inn% = "inn" ;
LIST %ja-nei% = "nei" "ja" ;
-LIST %ja-nei-å% = "å" "nei" "jak" ;
+LIST %ja-nei-å% = "for å" "å" "nei" "ja" ;
LIST %jeg% = "jeg" ;
LIST %jesu/kristi/pauli% = ("jesu" gen) ("kristi" gen) ("pauli" gen) ;
LIST %kamp/fot/tall% = "tall" "kamp" "fot" ;
@@ -239,6 +239,8 @@ LIST %som/om% = "som" "om" ;
LIST %som/om/der% = "som" "om" "der" ;
LIST %sort/svart% = "svart" "sort" ;
LIST %spørre% = "spørre" ;
+LIST %spille% = ("spille" vblex) ;
+LIST %spile% = ("spile" vblex) ;
LIST %stein%-adv = ("stein" adv) ;
LIST %stikk% = ("stikk" adv) ;
LIST %stille% = "stille" ;
@@ -278,6 +280,8 @@ LIST %visst% = ("viss" adj pst nt ind sg) ;
LIST %være% = "være" ;
LIST %være/bli% = "være" "bli" ;
LIST %ytterligere% = "ytterligere" ;
+LIST %øy% = "øy" ;
+LIST %øye% = "øye" ;
LIST %år% = "år" ;
LIST top = top ;
LIST <<< = <<< ;
@@ -336,7 +340,7 @@ LIST adverbialsubst = "øyeblikk" "år" "vinter" "vei" "uke" "torsdag" "to
LIST advtype-konj = (cnjcoo <adv>) ;
LIST agens-p = "av" ;
LIST akk = acc ;
-LIST alt = "siden" adj adv vblex pr prn cnjsub "å" n np ij det cnjcoo <anf> cm <ellipse> <kolon> lpar rpar <semi> guio ;
+LIST alt = "siden" adj adv vblex pr prn cnjsub "for å" "å" n np ij det cnjcoo <anf> cm <ellipse> <kolon> lpar rpar <semi> guio ;
LIST anf = <anf> <ANF>;
LIST bare-adj = "vedkommende" "ugjort" "tilsvarende" "skrå" "nær" "ny" "middels" "kort" "iført" "halv" "fånyttes" "fri" ;
LIST be = def ;
@@ -387,7 +391,7 @@ LIST det-mask/fem = (det m) (det f) ;
LIST det-nøyt-ent = (det nt sg) ;
LIST det-nøyt-ent/poss/gen = (det nt sg) pos gen ;
LIST det-prep = det pr ;
-LIST det-prep-infmerke-adjbe = "siden" det pr "å" (adj def) (adj pprs) ;
+LIST det-prep-infmerke-adjbe = "siden" det pr "for å" "å" (adj def) (adj pprs) ;
LIST det-subst = det n np ;
LIST det/adj = det adj ;
LIST det/adj/gen/prop = det adj gen np ;
@@ -453,7 +457,7 @@ LIST ikke-adv-adj-det/clb-komma = "siden" "$:" ":" vblex pr prn cnjsub "å" n n
LIST ikke-adv-adj-det2 = "siden" "$:" ":" vblex pr prn cnjsub "å" n np ij <ellipse> ;
LIST ikke-adv-adj-komma = "siden" "$-" "-" rpar vblex pr prn cnjsub "å" n np ij det <ellipse> ("$," clb) ("," clb) (clb cnjcoo) (cnjcoo <adv>) ;
LIST ikke-adv-adj-komma-prep-det-pron-prop = "siden" "$-" "-" rpar vblex cnjsub "å" n ij <ellipse> ("$," clb) ("," clb) (clb cnjcoo) (cnjcoo <adv>) ;
-LIST ikke-adv-adj-konj = "siden" "$:" ":" vblex pr prn cnjsub "å" n np ij det <ellipse> ;
+LIST ikke-adv-adj-konj = "siden" "$:" ":" vblex pr prn cnjsub "for å" "å" n np ij det <ellipse> ;
LIST ikke-adv-adj-kvant = "siden" vblex pr prn cnjsub cnjcoo "å" n np ij <ellipse> (det dem) (det pos) (det emph) ;
LIST ikke-adv-adj-prep = "$," "," det vblex prn cnjsub cnjcoo "å" ij n np <ellipse> ;
LIST ikke-adv-adj-prep-det = "$," "," vblex prn cnjsub cnjcoo "å" ij n np <ellipse> ;
@@ -461,7 +465,7 @@ LIST ikke-adv-adj-subst = "siden" "$--" "--" "$:" ":" "$-" "-" "$," "," lpar rp
LIST ikke-adv-adj-subst-det-prep = "$-" "-" "$," "," vblex prn cnjsub cnjcoo "å" ij <<< >>> <ellipse> ;
LIST ikke-adv-adj-subst-pron-det = cnjcoo pr cnjsub "å" ij <ellipse> (vblex pres) (vblex pret) (det dem) (n gen) ("$," clb) ("," clb) ;
LIST ikke-adv-adj-subst-pron-konj-det = "siden" pr cnjsub "å" ij <ellipse> (vblex pres) (vblex pret) (det dem) (n gen) ("$," clb) ("," clb) (clb cnjcoo) (cnjcoo <adv>) ;
-LIST ikke-adv-adj-subst-pron-konj-det-sbu2 = "siden" pr "å" ij <ellipse> (vblex pres) (vblex pret) (vblex inf) (vblex pasv) (vblex pp) ("$," clb) ("," clb) (clb cnjcoo) (cnjcoo <adv>) ;
+LIST ikke-adv-adj-subst-pron-konj-det-sbu2 = "siden" pr "for å" "å" ij <ellipse> (vblex pres) (vblex pret) (vblex inf) (vblex pasv) (vblex pp) ("$," clb) ("," clb) (clb cnjcoo) (cnjcoo <adv>) ;
LIST ikke-adv-adj-subst-pron-konj-det2 = "siden" pr cnjsub "å" ij <ellipse> (vblex pres) (vblex pret) (vblex inf) (vblex pasv) (vblex pp) ("$," clb) ("," clb) (clb cnjcoo) (cnjcoo <adv>) ;
LIST ikke-adv-adj-subst-pron-konj-det2-prep = cnjsub "å" ij <ellipse> (vblex pres) (vblex pret) (vblex inf) (vblex pasv) (vblex pp) ("$," clb) ("," clb) (clb cnjcoo) (cnjcoo <adv>) ;
LIST ikke-adv-adj-substmgen-konj-detmdem-prep = prn cnjsub "å" ij <ellipse> (vblex pres) (vblex pret) ("$," clb) ("," clb) (clb cnjcoo) (cnjcoo <adv>) ;
@@ -481,7 +485,7 @@ LIST ikke-mod-@<p-utfyll- at adv-@fv- at app = inf @subj @obj @i-obj @s-pred @o-pred @
LIST ikke-poss-det = "siden" "$," "," adj adv vblex pr prn cnjsub cnjcoo "å" ij n np <ellipse> (det def) (det dem) (det emph) (det qnt) (det itg) ;
LIST ikke-premod- at kon = @fv @iv @subj @obj @i-obj @s-pred @o-pred @adv @<adv @app @<det @<subst @<p-utfyll @interj @løs-np @<sbu @<sbu-rel @s-gr ;
LIST ikke-prep = cnjsub adv adj vblex prn "å" n np ij det (clb cnjcoo) <anf> <ellipse> ;
-LIST ikke-prep-sbu = adv adj vblex prn "å" n np ij det (clb cnjcoo) <anf> <ellipse> ;
+LIST ikke-prep-sbu = adv adj vblex prn "for å" "å" n np ij det (clb cnjcoo) <anf> <ellipse> ;
LIST ikke-pres-pret = "siden" det pr prn cnjsub cnjcoo "å" n np ij adj adv inf vblex pp ;
LIST ikke-refl = n np n1 i1 i2 i3 i4 tr1 tr2 tr3 tr4 tr5 tr6 tr7 tr8 tr9 tr10 tr11 tr12 tr12/til tr13 tr13/til tr14 tr15 tr16 tr17 tr18 tr19 tr20 tr20/til tr21 tr21/til tr22 tr22/til tr23 d1 d2 d3 d4 d5 d6 d7 d8 d9 pr1 pr2 pr3 pr4 pr5 pr6 pr7 pr8 pr9 pr10 pr11 pr12 pr13 pa pa/til pa1 pa1/til pa1refl4 pa2 pa2/til pa3 pa3/til pa4 pa4/til pa5 pa5 pa5/til pa6 pa7 a2 a6 a7 a8 a9 a10 a11 a13 a14 a15 a16 a17 <aux1/inf> <aux1/infinitiv> <aux1/perf_part> k1 k2 ;
LIST ikke-sanns-adj = "kurr" ("regne" adj pp) ("grepet" adj)("sette" adj pp) ("pågå" adj pp) ("løye" adj pp) ("overholde" adj pp) ("befinne" adj pp) ("spekulere" adj pp) ("forbryte" adj pp) ("frabe" adj pp) ("tore" adj pp) ("bistå" adj pp) ("rådføre" adj pp) ("foreligge" adj pp) ("fornemme" adj pp) ("driste" adj pp) ("forholde" adj pp) ("håndtere" adj pp) ("håndtere" adj pp) ("avfinne" adj pp) ("dikke" adj pp) ("dikke" adj pp) ("overstige" adj pp) ("kvie" adj pp) [...]
@@ -507,7 +511,7 @@ LIST inf = inf ;
LIST inf/perf-part = (vblex inf) (vblex pp) ;
LIST inf/pres = (vblex inf pres) ;
LIST inf/pres/pret = inf pres pret ;
-LIST infmerke = "å" ;
+LIST infmerke = "for å" "å" ;
LIST int-setn-gr = "hvorledes" "hvorfor" "hvordan" "hvor" "hva" "$-" "-" cnjsub @sbu ("$;" clb) (";" clb) (clb cnjcoo) (clb cm) ;
LIST interj = ij ;
LIST iv = (vblex inf) (vblex pp) ;
@@ -792,8 +796,8 @@ SELECT:over_30._Men clb IF
# TODO: why can't I say >1?
;
-SELECT ("å" sep) IF (*-1 (vblex sep)) ;
-SELECT (vblex sep) IF (*1 ("å" sep)) ;
+SELECT (infmerke sep) IF (*-1 (vblex sep)) ;
+SELECT (vblex sep) IF (*1 (infmerke sep)) ;
## select domain
#:3787
@@ -2116,6 +2120,8 @@ SELECT (vblex sep) IF (*1 ("å" sep)) ;
;
# "en helt (subst)"))
+"<helte>" SELECT ("helle");
+# Unngå "hele" (å «heile vatnet»)
#:3543
@@ -4654,6 +4660,15 @@ SELECT ("ikon") + subst-nøyt IF
#CONSTRAINTS
## remove domain
+REMOVE ("sekund") + mask;
+
+REMOVE:spille_spile ("spile") + verb IF
+ (0 ("spille"))
+ (NEGATE 1 ("opp") LINK 1 ("øye"))
+;
+# tt: Vi vil gjerne ha kontekst for "å spile"...
+
+
"<leder>" REMOVE (vblex) IF
(-1 fork/ukjent-ord OR ("tidligere") OR ("parlamentarisk") OR ("<egentlige>") OR ("<egne>") OR ("eneste") OR berre-storbokstav)
;
@@ -7109,6 +7124,7 @@ SELECT ("ikon") + subst-nøyt IF
CONSTRAINTS
## select ndomain
+
#:6212
SELECT:6212 (adj) IF
(-1 ("<fargen>"))
@@ -23898,6 +23914,8 @@ REMOVE:skrev ("<skrev>"ri "skreve") IF
# "kh jan 2004: Bare ved spill levende, spill våken"
+
+
"<sport>" REMOVE:sport (vblex) IF
(0 subst)
;
@@ -23971,6 +23989,12 @@ REMOVE:skrev ("<skrev>"ri "skreve") IF
;
#bare fem i betydningen forvirring
+
+#
+REMOVE ("øye" n nt pl def) IF
+ (0 %øy% )
+;
+
#:3118
"<å>" REMOVE:3118 (n sg ind) IF
(0 infmerke)
diff --git a/configure.ac b/configure.ac
index ee53e71..93d51f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,32 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+
AC_PREREQ(2.52)
-AC_INIT([apertium-nob], [0.5.1], [unhammer+apertium at mm.st])
-AM_INIT_AUTOMAKE([apertium-nob], [0.5.1], no-define)
+m4_define([required_apertium_version], [3.4.0])
+m4_define([required_lttoolbox_version], [3.3.2])
+
+AC_INIT([Apertium Norwegian Bokmål], [0.6.0], [unhammer+apertium at mm.st], [apertium-nob], [http://wiki.apertium.org/wiki/Apertium-nob])
+AM_INIT_AUTOMAKE
+
AC_PROG_LN_S
AC_PROG_AWK
-m4_define([required_apertium_version], [3.4.0])
-m4_define([required_lttoolbox_version], [3.3.1])
-
PKG_CHECK_MODULES(APERTIUM, apertium >= required_apertium_version)
PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox >= required_lttoolbox_version)
+AC_PATH_PROG([LTPRINT], [lt-print], [false], [$PATH$PATH_SEPARATOR$with_lt_print/bin])
+AS_IF([test x$LTPRINT = xfalse], [AC_MSG_ERROR([You don't have lt-print installed])])
+
+AC_PATH_PROG([CGCOMP], [cg-comp], [false], [$PATH$PATH_SEPARATOR$with_cg_comp/bin])
+AS_IF([test x$CGCOMP = xfalse], [AC_MSG_ERROR([You don't have cg-comp installed])])
-AC_PATH_PROG(CGCOMP, cg-comp, no)
-if test x$ac_cv_path_CGCOMP = x
-then
- AC_MSG_ERROR([You don't have cg-comp installed.])
-fi
-if test x$ac_cv_path_CGPROC = xno
-then
- AC_MSG_ERROR([You don't have cg-comp installed.])
-fi
+AC_PATH_PROG([CGPROC], [cg-proc], [false], [$PATH$PATH_SEPARATOR$with_cg_proc/bin])
+AS_IF([test x$CGPROC = xfalse], [AC_MSG_ERROR([You don't have cg-proc installed])])
+AC_PATH_PROG([PKGCONFIG], [pkg-config], [false], [$PATH$PATH_SEPARATOR$with_pkg_config/bin])
+AS_IF([test x$PKGCONFIG = xfalse], [AC_MSG_ERROR([You don't have pkg-config installed])])
AP_MKINCLUDE
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/apertium-nob.git
More information about the debian-science-commits
mailing list