conjugate 1.4.10 → 1.4.11

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/conjugate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'conjugate'
-  s.version     = '1.4.10'
+  s.version     = '1.4.11'
   s.date        = '2012-02-15'
   s.summary     = "Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates"
   s.description = s.summary

data/lib/conjugate/french_templates/irregular_verbs.rb

@@ -8,6 +8,8 @@ FrenchIrregularVerbs = {
   'dire' => :dire,
 
   'avoir' => :avoir,
+  
+  'lire' => :lire,
 
   'aller' => :aller,
 

data/lib/conjugate/french_templates/templates.rb

@@ -143,6 +143,53 @@ FrenchTemplates = {
   	:present_participle => "{{{1}}}ant",
     :past_participle => "{{{1}}}u"
   },
+  
+  :lire => {
+  	:infinitive => "{{{1}}}re", 
+  	:present => {
+  		:je => "lis",
+  		:tu => "lis",
+  		:il => "lit",
+  		:nous => "lisons",
+  		:vous => "lisez",
+  		:ils => "lisent"
+  	}, 
+  	:imperfect => {
+  		:je => "{{{1}}}sais",
+  		:tu => "{{{1}}}sais",
+  		:il => "{{{1}}}sait",
+  		:nous => "{{{1}}}sions",
+  		:vous => "{{{1}}}siez",
+  		:ils => "{{{1}}}saient"
+  	},
+  	:past_historic => {
+  		:je => "{{{1}}}is",
+  		:tu => "{{{1}}}is",
+  		:il => "{{{1}}}it",
+  		:nous => "{{{1}}}îmes",
+  		:vous => "{{{1}}}îtes",
+  		:ils => "{{{1}}}irent"
+  	},
+  	:future => {
+  		:je => "{{{1}}}rai",
+  		:tu => "{{{1}}}ras",
+  		:il => "{{{1}}}ra",
+  		:nous => "{{{1}}}rons",
+  		:vous => "{{{1}}}rez",
+  		:ils => "{{{1}}}ront"
+  	},
+  	:conditional => {
+  		:je => "{{{1}}}rais",
+  		:tu => "{{{1}}}rais",
+  		:il => "{{{1}}}rait",
+  		:nous => "{{{1}}}rions",
+  		:vous => "{{{1}}}riez",
+  		:ils => "{{{1}}}raient"
+  	},
+  	
+  	:present_participle => "{{{1}}}sant",
+    :past_participle => "lu"
+  },
 
   :aillir => {
   	:infinitive => "aillir", 
@@ -2077,8 +2124,8 @@ FrenchTemplates = {
   		:je => "{{{1}}}e{{{2}}}{{{2}}}e",
   		:tu => "{{{1}}}e{{{2}}}{{{2}}}es",
   		:il => "{{{1}}}e{{{2}}}{{{2}}}e",
-  		:nous => "{{{1}}}e{{{2}}}{{{2}}}ons",
-  		:vous => "{{{1}}}e{{{2}}}{{{2}}}ez",
+  		:nous => "{{{1}}}e{{{2}}}ons",
+  		:vous => "{{{1}}}e{{{2}}}ez",
   		:ils => "{{{1}}}e{{{2}}}{{{2}}}ent"
   	}, 
   	:imperfect => {
@@ -2098,20 +2145,20 @@ FrenchTemplates = {
   		:ils => "{{{1}}}e{{{2}}}èrent"
   	},
   	:future => {
-  		:je => "{{{1}}}e{{{2}}}{{{2}}}erai",
-  		:tu => "{{{1}}}e{{{2}}}{{{2}}}eras",
-  		:il => "{{{1}}}e{{{2}}}{{{2}}}era",
-  		:nous => "{{{1}}}e{{{2}}}{{{2}}}erons",
-  		:vous => "{{{1}}}e{{{2}}}{{{2}}}erez",
-  		:ils => "{{{1}}}e{{{2}}}{{{2}}}eront"
+  		:je => "{{{1}}}e{{{2}}}erai",
+  		:tu => "{{{1}}}e{{{2}}}eras",
+  		:il => "{{{1}}}e{{{2}}}era",
+  		:nous => "{{{1}}}e{{{2}}}erons",
+  		:vous => "{{{1}}}e{{{2}}}erez",
+  		:ils => "{{{1}}}e{{{2}}}eront"
   	},
   	:conditional => {
-  		:je => "{{{1}}}e{{{2}}}{{{2}}}erais",
-  		:tu => "{{{1}}}e{{{2}}}{{{2}}}erais",
-  		:il => "{{{1}}}e{{{2}}}{{{2}}}erait",
-  		:nous => "{{{1}}}e{{{2}}}{{{2}}}erions",
-  		:vous => "{{{1}}}e{{{2}}}{{{2}}}eriez",
-  		:ils => "{{{1}}}e{{{2}}}{{{2}}}eraient"
+  		:je => "{{{1}}}e{{{2}}}erais",
+  		:tu => "{{{1}}}e{{{2}}}erais",
+  		:il => "{{{1}}}e{{{2}}}erait",
+  		:nous => "{{{1}}}e{{{2}}}erions",
+  		:vous => "{{{1}}}e{{{2}}}eriez",
+  		:ils => "{{{1}}}e{{{2}}}eraient"
   	},
   	
   	:present_participle => "{{{1}}}e{{{2}}}ant",
@@ -2124,8 +2171,8 @@ FrenchTemplates = {
   		:je => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}e",
   		:tu => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}es",
   		:il => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}e",
-  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}ons",
-  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}ez",
+  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}ons",
+  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}ez",
   		:ils => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}ent"
   	}, 
   	:imperfect => {
@@ -2145,20 +2192,20 @@ FrenchTemplates = {
   		:ils => "{{{1}}}e{{{2}}}e{{{3}}}èrent"
   	},
   	:future => {
-  		:je => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erai",
-  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}eras",
-  		:il => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}era",
-  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erons",
-  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erez",
-  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}eront"
+  		:je => "{{{1}}}e{{{2}}}e{{{3}}}erai",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}eras",
+  		:il => "{{{1}}}e{{{2}}}e{{{3}}}era",
+  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}erons",
+  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}erez",
+  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}eront"
   	},
   	:conditional => {
-  		:je => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erais",
-  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erais",
-  		:il => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erait",
-  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}erions",
-  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}eriez",
-  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}{{{3}}}eraient"
+  		:je => "{{{1}}}e{{{2}}}e{{{3}}}erais",
+  		:tu => "{{{1}}}e{{{2}}}e{{{3}}}erais",
+  		:il => "{{{1}}}e{{{2}}}e{{{3}}}erait",
+  		:nous => "{{{1}}}e{{{2}}}e{{{3}}}erions",
+  		:vous => "{{{1}}}e{{{2}}}e{{{3}}}eriez",
+  		:ils => "{{{1}}}e{{{2}}}e{{{3}}}eraient"
   	},
   	
   	:present_participle => "{{{1}}}e{{{2}}}e{{{3}}}ant",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjugate
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .DS_Store
+- .gitignore
 - README.markdown
 - conjugate.gemspec
 - lib/.DS_Store
@@ -50,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Conjugate Verbs using a version of the templates defined here http://en.wiktionary.org/wiki/Category:Spanish_verb_inflection-table_templates