From 623421261904e0ec1b76aa539a3864a65884d5e0 Mon Sep 17 00:00:00 2001
From: iBobo <andrea@bhweb.it>
Date: Fri, 20 Jan 2017 14:55:45 +0100
Subject: [PATCH] More italian fixes (#203)

* Add "un'ora" "un quarto d'ora"... as durations

* Make article optional for "next days", "next X hours"...

* "una" is a latent time

* Now handling intervals with day number without a month

* Handles "X and X+1" as an interval

* Better handling for part-of-day in not-latent mode

* handle explicit intervals with "today" "tomorrow", like "da domani a dopodomani"

* Handles "per tutta la settimana" "per tutto il mese" "per tutto l'anno"

* Removed two letters abbreviations of days of week in italian

* Handles latent days as single numbers without month and handles better open intervals

* Handles 'il weekend del X'

* There was some confusion about 'now' and 'today'

* Removed <integer> e <integer+1> rule that didn't work

* There was some incomprehensions in durations

* Naked days refinement

* Correctly handle "in nottata" as synonim of "stanotte" when alone
---
 resources/languages/it/corpus/time.clj    |  74 +++++++++++++--
 resources/languages/it/rules/cycles.clj   |  12 +--
 resources/languages/it/rules/duration.clj |  18 +++-
 resources/languages/it/rules/time.clj     | 104 +++++++++++++---------
 4 files changed, 148 insertions(+), 60 deletions(-)

diff --git a/resources/languages/it/corpus/time.clj b/resources/languages/it/corpus/time.clj
index e795d1f8..5c4103a2 100644
--- a/resources/languages/it/corpus/time.clj
+++ b/resources/languages/it/corpus/time.clj
@@ -6,12 +6,12 @@
   "subito"
   "immediatamente"
   "in questo momento"
+  "ora"
+  "adesso"
   (datetime 2013 2 12 4 30 00)
 
-  "ora"
   "di oggi"
   "oggi"
-  "adesso"
   "in giornata"
   (datetime 2013 2 12)
 
@@ -30,7 +30,8 @@
 
   "martedì"
   "Martedì 19"
-  "ma 19"
+  "mar 19"
+  "il 19"
   (datetime 2013 2 19)
 
   "l'altro ieri"
@@ -38,7 +39,6 @@
   (datetime 2013 2 10)
 
   "lunedi"
-  "lu."
   "lun"
   (datetime 2013 2 18 :day-of-week 1)
 
@@ -216,6 +216,13 @@
   "la settimana del 7 ott"
   (datetime 2013 10 7 :grain :week)
 
+  "il weekend del 15"
+  "il we del 15 febbraio"
+  (datetime-interval [2013 2 15 18] [2013 2 18 00])
+
+  "il week-end del 10 aprile"
+  (datetime-interval [2013 4 12 18] [2013 4 15 00])
+
   "l'ultimo giorno di ottobre 2015"
   "l'ultimo giorno dell'ottobre 2015"
   (datetime 2015 10 31)
@@ -223,6 +230,19 @@
   "l'ultima settimana di settembre 2014"
   (datetime 2014 9 22 :grain :week)
 
+  "tra un'ora"
+  "tra 1 ora"
+  (datetime 2013 2 12 5 30)
+
+  "tra un quarto d'ora"
+  (datetime 2013 2 12 4 45 00)
+
+  "tra mezz'ora"
+  (datetime 2013 2 12 5 00 00)
+
+  "tra tre quarti d'ora"
+  (datetime 2013 2 12 5 15 00)
+
   ;; nth of
   "primo martedì di ottobre"
   "primo martedì in ottobre"
@@ -444,8 +464,12 @@
   "questa sera"
   "sta sera"
   "stasera"
-  "in serata"
   "nella sera"
+  "la sera"
+  "alla sera"
+  "in serata"
+  "la serata"
+  "nella serata"
   (datetime-interval [2013 2 12 18] [2013 2 13 00])
 
   "domani mattina"
@@ -457,6 +481,8 @@
   (datetime-interval [2013 2 12 4 30 00] [2013 2 18])
 
   "stanotte"
+  "nella notte"
+  "in nottata"
   (datetime-interval [2013 2 13 0] [2013 2 13 04])
 
   "ultimo weekend"
@@ -536,7 +562,7 @@
   (datetime-interval [2013 2 11 4] [2013 2 12 4])
 
   "le prossime 3 ore"
-  "le prossime tre ore"
+  "prossime tre ore"
   "nelle prossime 3 ore"
   (datetime-interval [2013 2 12 5] [2013 2 12 8])
 
@@ -551,13 +577,14 @@
   "i due giorni scorsi"
   (datetime-interval [2013 2 10] [2013 2 12])
 
-  "i prossimi 3 giorni"
+  "prossimi 3 giorni"
   "i prossimi tre giorni"
   "nei prossimi 3 giorni"
   (datetime-interval [2013 2 13] [2013 2 16])
 
   "i prossimi giorni"
   "nei prossimi giorni"
+  "prossimi giorni"
   (datetime-interval [2013 2 13] [2013 2 16])
 
   "le ultime 2 settimane"
@@ -567,7 +594,7 @@
   "nelle 2 ultime settimane"
   (datetime-interval [2013 1 28 :grain :week] [2013 2 11 :grain :week])
 
-  "le prossime 3 settimane"
+  "prossime 3 settimane"
   "le prossime tre settimane"
   "le 3 prossime settimane"
   "nelle prossime 3 settimane"
@@ -588,6 +615,7 @@
 
   "i prossimi 3 mesi"
   "i prossimi tre mesi"
+  "prossimi 3 mesi"
   "i 3 prossimi mesi"
   "i tre prossimi mesi"
   "nei prossimi tre mesi"
@@ -615,12 +643,22 @@
   "dal 13 al 15 luglio"
   "tra il 13 e il 15 luglio"
   "tra 13 e 15 luglio"
+  "dal tredici al quindici luglio"
   "13 luglio - 15 luglio"
   (datetime-interval [2013 7 13] [2013 7 16])
 
+  "dal 3 al 5"
+  "tra il 3 e il 5"
+  "dal tre al cinque"
+  (datetime-interval [2013 3 3] [2013 3 6])
+
   "8 ago - 12 ago"
   (datetime-interval [2013 8 8] [2013 8 13])
 
+  "da domani a giovedì"
+  "da domani a dopodomani"
+  (datetime-interval [2013 2 13] [2013 2 15])
+
   "9:30 - 11:00"
   (datetime-interval [2013 2 12 9 30] [2013 2 12 11 1])
 
@@ -641,6 +679,9 @@
   "dalle tre all'una di giovedì"
   (datetime-interval [2013 2 14 3] [2013 2 14 14])
 
+  "dalla mezzanotte alle 2"
+  (datetime-interval [2013 2 13 0] [2013 2 13 3])
+
   "domani dalle 15:00 alle 17:00"
   (datetime-interval [2013 2 13 15 00] [2013 2 13 17 01])
 
@@ -709,6 +750,9 @@
   "dalle 14"
   (datetime 2013 2 12 14 :direction :after)
 
+  "dalla mezzanotte"
+  (datetime 2013 2 13 0 :direction :after)
+
   "domani dopo le 14"
   "domani dalle 14"
   (datetime 2013 2 13 14 :direction :after)
@@ -726,6 +770,18 @@
   "da giovedì"
   (datetime 2013 2 14 :direction :after)
 
+  "dal primo"
+  (datetime 2013 3 1 :direction :after)
+
+  "dal 20"
+  (datetime 2013 2 20 :direction :after)
+
+  "entro il 15"
+  (datetime 2013 2 15 :direction :before)
+
+  "prima del 20 aprile"
+  (datetime 2013 4 20 :direction :before)
+
   "nel pomeriggio"
   (datetime-interval [2013 2 12 12] [2013 2 12 19])
 
@@ -735,6 +791,8 @@
   (datetime 2013 2 12 13 30)
 
   "in 15 minuti"
+  (datetime-interval [2013 2 12 4 30 0] [2013 2 12 4 45 0])
+
   "tra 15 minuti"
   (datetime 2013 2 12 4 45 0)
 
diff --git a/resources/languages/it/rules/cycles.clj b/resources/languages/it/rules/cycles.clj
index 027ac06f..827b8b80 100644
--- a/resources/languages/it/rules/cycles.clj
+++ b/resources/languages/it/rules/cycles.clj
@@ -70,14 +70,6 @@
   [#"(?i)((il|la|[nd]el(la)?) )?prossim[oa]" (dim :cycle)]
   (cycle-nth (:grain %2) 1)
 
-  "le <time> prossime <cycle>|i <time> prossimi <cycle>"
-  [#"(?i)([nd]e)?i|([nd]el)?le" (dim :time) #"(?i)prossim[ie]" (dim :cycle)]
-  (cycle-nth-after (:grain %4) 1 %2)
-
-  "le prossime <time> <cycle>|i prossimi <time> <cycle>"
-  [#"(?i)(([nd]e)?i|([nd]el)?le) prossim[ie]" (dim :time) (dim :cycle)]
-  (cycle-nth-after (:grain %3) 1 %2)
-
   "il <cycle> dopo <time>"
   [#"(?i)l[a']|il|[nd]el" (dim :cycle) #"(?i)dopo" (dim :time)]
   (cycle-nth-after (:grain %2) 1 %4)
@@ -99,11 +91,11 @@
   ;(cycle-n-not-immediate (:grain %2) -1)
 
   "next n <cycle>"
-  [#"(?i)(([nd]e)?i|([nd]el)?le) prossim[ei]" (integer 2 9999) (dim :cycle)]
+  [#"(?i)((([nd]e)?i|([nd]el)?le) )?prossim[ei]" (integer 2 9999) (dim :cycle)]
   (cycle-n-not-immediate (:grain %3) (:value %2))
 
   "next n <cycle>"
-  [#"(?i)(([nd]e)?i|([nd]el)?le)" (integer 2 9999) #"(?i)prossim[ei]" (dim :cycle)]
+  [#"(?i)([nd]e)?i|([nd]el)?le" (integer 2 9999) #"(?i)prossim[ei]" (dim :cycle)]
   (cycle-n-not-immediate (:grain %4) (:value %2))
 
   "last <day-of-week> of <time>"
diff --git a/resources/languages/it/rules/duration.clj b/resources/languages/it/rules/duration.clj
index 9b76e998..7cd843f1 100644
--- a/resources/languages/it/rules/duration.clj
+++ b/resources/languages/it/rules/duration.clj
@@ -42,13 +42,27 @@
    :value (duration (:grain %2) (:value %1))}
 
   "une <unit-of-duration>"
-  [#"(?i)una?" (dim :unit-of-duration)]
+  [#"(?i)un[a']?" (dim :unit-of-duration)]
   {:dim :duration
    :value (duration (:grain %2) 1)}
 
+  "un quarto d'ora"
+  [#"(?i)un quarto d['i] ?ora"]
+  {:dim :duration
+   :value (duration :minute 15)}
+
+  "mezz'ora"
+  [#"(?i)mezz[a'] ?ora"]
+  {:dim :duration
+   :value (duration :minute 30)}
+
+  "tre quarti d'ora"
+  [#"(?i)(3|tre) quarti d['i] ?ora"]
+  {:dim :duration
+   :value (duration :minute 45)}
 
   "in/after <duration>"
-  [#"(?i)[tf]ra|in|dopo" (dim :duration)]
+  [#"(?i)[tf]ra|dopo" (dim :duration)]
   (in-duration (:value %2))
 
   "<duration> ago"
diff --git a/resources/languages/it/rules/time.clj b/resources/languages/it/rules/time.clj
index 798bc88a..06d94754 100644
--- a/resources/languages/it/rules/time.clj
+++ b/resources/languages/it/rules/time.clj
@@ -7,7 +7,7 @@
 
   ; same thing, with "de" in between like "domingo de la semana pasada"
   "two time tokens separated by `di`"
-  [(dim :time #(not (:latent %))) #"(?i)de" (dim :time #(not (:latent %)))] ; sequence of two tokens with a time fn
+  [(dim :time #(not (:latent %))) #"(?i)di" (dim :time #(not (:latent %)))] ; sequence of two tokens with a time fn
   (intersect %1 %3)
 
   "in <named-month>" ; in September
@@ -17,31 +17,31 @@
   ;;
 
   "named-day"
-  #"(?i)luned[ìi]|lun?\.?"
+  #"(?i)luned[iì]|lun\.?"
   (day-of-week 1)
 
   "named-day"
-  #"(?i)marted[iì]|mar?\.?"
+  #"(?i)marted[iì]|mar\.?"
   (day-of-week 2)
 
   "named-day"
-  #"(?i)mercoled[iì]|mer?\.?"
+  #"(?i)mercoled[iì]|mer\.?"
   (day-of-week 3)
 
   "named-day"
-  #"(?i)gioved[iì]|gio?\.?"
+  #"(?i)gioved[iì]|gio\.?"
   (day-of-week 4)
 
   "named-day"
-  #"(?i)venerd[iì]|ven?\.?"
+  #"(?i)venerd[iì]|ven\.?"
   (day-of-week 5)
 
   "named-day"
-  #"(?i)sabato|sab?\.?"
+  #"(?i)sabato|sab\.?"
   (day-of-week 6)
 
   "named-day"
-  #"(?i)domenica|dom?\.?"
+  #"(?i)domenica|dom\.?"
   (day-of-week 7)
 
   "named-month"
@@ -164,12 +164,12 @@
   (intersect (day-of-week 7) (month 5) (cycle-nth-after :week 1 (month-day 5 1)))
 
 
-  "right now"
-  #"(subito|immediatamente|proprio adesso|in questo momento)"
+  "now"
+  #"(?i)subito|(immediata|attual)mente|(proprio )?adesso|(in questo|al) momento|ora"
   (cycle-nth :second 0)
 
-  "now"
-  #"(?i)(ora|al momento|attualmente|adesso|(di )?oggi|in giornata)"
+  "today"
+  #"(?i)(di )?oggi|in giornata"
   (cycle-nth :day 0)
 
   "tomorrow"
@@ -222,7 +222,7 @@
   (pred-nth %1 1)
 
   "prossimi <unit-of-duration>"
-  [#"(?i)((ne)?i|(nel)?le) prossim[ie]" (dim :unit-of-duration)]
+  [#"(?i)((([nd]e)?i|([nd]el)?le) )?prossim[ie]" (dim :unit-of-duration)]
   (interval (cycle-nth (:grain %2) 1) (cycle-nth (:grain %2) 3) true)
 
   "<time> last"
@@ -283,12 +283,12 @@
   ; In general we are flexible and accept both ordinals (3rd) and numbers (3)
 
   "day of month (1st)"
-  [#"(?i)(primo|1o|1º|1°)( di)?"];
+  [#"(?i)(primo|1o|1º|1°)"];
   (day-of-month 1)
 
-  "the <day-of-month>" ; this one is not latent
-  [#"(?i)il" (integer 1 31)]
-  (assoc (day-of-month (:value %2)) :latent true)
+  "il <day-of-month>" ; this one is not latent
+  [#"(?i)il|l'" (integer 1 31)]
+  (day-of-month (:value %2))
 
   "<day-of-month> <named-month>" ;  dodici luglio 2010 (this rule removes latency)
   [(integer 1 31) {:form :month}]
@@ -298,8 +298,8 @@
   [{:form :day-of-week} (integer 1 31)]
   (intersect %1 (day-of-month (:value %2)))
 
-  "il <day-of-month> de <named-month>" ; il dodici luglio 2010
-  [#"(?i)il" (integer 1 31) {:form :month}]
+  "il <day-of-month> <named-month>" ; il dodici luglio 2010
+  [#"(?i)il|l'" (integer 1 31) {:form :month}]
   (intersect %3 (day-of-month (:value %2)))
 
   ;; hours and minutes (absolute time)
@@ -324,7 +324,7 @@
   (dissoc %2 :latent)
 
   "at <time-of-day>" ; alle due
-  [#"(?i)all[e']|le|a" {:form :time-of-day}]
+  [#"(?i)all[e']|l[e']|a" {:form :time-of-day}]
   (dissoc %2 :latent)
 
 
@@ -366,7 +366,7 @@
 
   "una"
   #"(?i)una"
-  (hour 1 true)
+  (assoc (hour 1 true) :latent true)
 
   "quarter (relative minutes)"
   #"(?i)un quarto"
@@ -385,7 +385,7 @@
   {:relative-minutes (:value %1)}
 
   "<integer> minutes (as relative minutes)"
-  [(integer 1 59) #"(?i)min\.?(ut[oi])?"]
+  [(integer 1 59) #"(?i)min(ut[oi]|\.)?"]
   {:relative-minutes (:val %1)}
 
   "<hour-of-day> <integer> (as relative minutes)"
@@ -441,7 +441,7 @@
   (assoc (intersect (cycle-nth :day 1) (interval (hour 0 false) (hour 4 false) false)) :form :part-of-day :latent true)
 
   "this <part-of-day>"
-  [#"(?i)quest[oa]|sta|in|nel(la)?" {:form :part-of-day}]
+  [#"(?i)(que)?st[oa]|in|(al|nel)(la)?|la|il" {:form :part-of-day}]
   (assoc (intersect (cycle-nth :day 0) %2) :form :part-of-day) ;; removes :latent
 
   "<time> notte"
@@ -461,7 +461,7 @@
   (assoc (intersect (cycle-nth :day 0) (interval (hour 18 false) (hour 0 false) false)) :form :part-of-day)
 
   "stanotte"
-  [#"(?i)stanotte"]
+  [#"(?i)(sta|nella )notte|(in|nella) nottata"]
   (assoc (intersect (cycle-nth :day 1) (interval (hour 0 false) (hour 4 false) false)) :form :part-of-day)
 
   "domattina"
@@ -496,6 +496,12 @@
             (intersect (day-of-week 1) (hour 0 false))
             false)
 
+  "il week-end del <time>"
+  [#"(?i)il (week[ -]?end|fine ?settimana|we) del" (dim :time)]
+  (interval (intersect (intersect (cycle-nth-after :week 0 %2) (day-of-week 5)) (hour 18 false))
+            (intersect (intersect (cycle-nth-after :week 1 %2) (day-of-week 1)) (hour 0 false))
+            false)
+
   "season"
   #"(?i)(in )?estate" ;could be smarter and take the exact hour into account... also some years the day can change
   (interval (month-day 6 21) (month-day 9 23) false)
@@ -517,7 +523,7 @@
   ; a specific version of "il", above, removes :latent for integer as day of month
   ; this one is more general but does not remove latency
   "il <time>"
-  [#"(?i)il" (dim :time #(not (:latent %)))]
+  [#"(?i)il|l'" (dim :time #(not (:latent %)))]
   %2
 
   ;; Time zones
@@ -562,15 +568,21 @@
   ; Intervals
 
   "dd-dd <month> (interval)"
-  [#"(?i)(?:dal(?: |l'))?(3[01]|[12]\d|0?[1-9])" #"(?i)\-|([fs]ino )?al(l')?" #"(3[01]|[12]\d|0?[1-9])" {:form :month}]
+  [#"(3[01]|[12]\d|0?[1-9])" #"\-" #"(3[01]|[12]\d|0?[1-9])" {:form :month}]
   (interval (intersect %4 (day-of-month (Integer/parseInt (-> %1 :groups first))))
             (intersect %4 (day-of-month (Integer/parseInt (-> %3 :groups first))))
             true)
 
-  "dd-dd <month> (interval)"
-  [#"(?i)tra( il|l')?" #"(3[01]|[12]\d|0?[1-9])" #"(?i)e( il|l')?" #"(3[01]|[12]\d|0?[1-9])" {:form :month}]
-  (interval (intersect %5 (day-of-month (Integer/parseInt (-> %2 :groups first))))
-            (intersect %5 (day-of-month (Integer/parseInt (-> %4 :groups first))))
+  "dal <integer> al <integer> (interval)"
+  [#"(?i)dal(?:l')?" (integer 1 31) #"(?i)([fs]ino )?al(l')?" (integer 1 31)]
+  (interval (day-of-month (:value %2))
+            (day-of-month (:value %4))
+            true)
+
+  "tra il <integer> e il <integer> (interval)"
+  [#"(?i)tra( (il|l'))?" (integer 1 31) #"(?i)e( (il|l'))?" (integer 1 31)]
+  (interval (day-of-month (:value %2))
+            (day-of-month (:value %4))
             true)
 
   ; Blocked for :latent time. May need to accept certain latents only, like hours
@@ -580,15 +592,15 @@
   (interval %1 %3 true)
 
   "fino al <datetime> (interval)"
-  [#"\-|[fs]ino a(l(l[ae'])?)?" (dim :time #(not (:latent %)))]
+  [#"[fs]ino a(l(l[ae'])?)?" (dim :time #(not (:latent %)))]
   (interval (cycle-nth :second 0) %2 false)
 
   "dal <datetime> al <datetime> (interval)"
-  [#"(?i)da(l(l')?)?" (dim :time) #"\-|([fs]ino )?al(l')?" (dim :time)]
+  [#"(?i)da(l(l')?)?" (dim :time #(not (:latent %))) #"([fs]ino )?a(l(l')?)?" (dim :time #(not (:latent %)))]
   (interval %2 %4 true)
 
   "tra il <datetime> e il <datetime> (interval)"
-  [#"(?i)tra( il| l')?" (dim :time) #"e( il| l')?" (dim :time)]
+  [#"(?i)tra( il| l')?" (dim :time #(not (:latent %))) #"e( il| l')?" (dim :time #(not (:latent %)))]
   (interval %2 %4 true)
 
   "<time-of-day> - <time-of-day> <day-of-month> (interval)"
@@ -598,7 +610,7 @@
   ; Specific for time-of-day, to help resolve ambiguities
 
   "dalle <time-of-day> alle <time-of-day> (interval)"
-  [#"(?i)da(l(le|l')?)?" {:form :time-of-day} #"\-|([fs]ino )?a(l(l[e'])?)?" {:form :time-of-day}]
+  [#"(?i)da(ll[ae'])?" {:form :time-of-day} #"\-|([fs]ino )?a(ll[ae'])?" {:form :time-of-day}]
   (interval %2 %4 true)
 
   ; Specific for within duration... Would need to be reworked
@@ -607,22 +619,34 @@
   (interval (cycle-nth :second 0) (in-duration (:value %2)) false)
 
   "entro il <duration>"
-  [#"(?i)entro (il|l')|per (il|l[a'])|in|nel(l[a'])?" (dim :unit-of-duration)]
+  [#"(?i)(entro|durante|per( tutt[ao])?) (il|l[a'])|in|nel(l[a'])?" (dim :unit-of-duration)]
   (interval (cycle-nth :second 0) (cycle-nth (:grain %2) 1) false)
 
   ; One-sided Intervals
 
   "entro le <time-of-day>"
-  [#"(?i)entro( l[ea'])?|prima d(i|ell['e])" (dim :time)]
+  [#"(?i)entro( l[ea'])?|prima d(i|ell['ea])" {:form :time-of-day}]
   (merge %2 {:direction :before})
 
+  "entro <time>"
+  [#"(?i)entro( la)?|prima d(i|ella)" (dim :time)]
+  (merge %2 {:direction :before})
+
+  "entro il <integer>"
+  [#"(?i)entro il|prima del" (integer 1 31)]
+  (merge (day-of-month (:value %2)) {:direction :before})
+
   "dopo le <time-of-day>"
-  [#"(?i)dopo l[e']|da(l(l['e])?)?" (dim :time)]
+  [#"(?i)dopo( l['ea])?|dal(l['ea])?" {:form :time-of-day}]
   (merge %2 {:direction :after})
 
-  "<time> dopo le <time-of-day>"
-  [(dim :time) #"(?i)dopo l[e']|dall['e]" {:form :time-of-day}]
-  (merge (intersect %1 %3) {:direction :after})
+  "dopo <time>"
+  [#"(?i)dopo|dal?" (dim :time)]
+  (merge %2 {:direction :after})
+
+  "dal <integer>"
+  [#"(?i)dal" (integer 1 31)]
+  (merge (day-of-month (:value %2)) {:direction :after})
 
   "<time> dopo le <time-of-day>"
   [(dim :time) #"(?i)dopo l[e']|dall['e]" {:form :time-of-day}]