Commit a732260d authored by Ludan Stoecklé's avatar Ludan Stoecklé

French contractions 1.1.1

parent 96d54cca
{
"name": "english-determiners",
"version": "2.1.0",
"version": "2.1.1",
"description": "English determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-adjectives",
"version": "2.1.0",
"version": "2.1.1",
"description": "Agreement of adjectives in French",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -45,7 +45,7 @@
},
"dependencies": {
"debug": "^4.1.1",
"french-h-muet-aspire": "2.1.0"
"french-h-muet-aspire": "2.1.1"
},
"keywords": [
"french",
......
{
"name": "french-determiners",
"version": "2.1.0",
"version": "2.1.1",
"description": "French determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-h-muet-aspire",
"version": "2.1.0",
"version": "2.1.1",
"description": "List of French words that are \"aspiré\" (vs. \"muet\")\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[D\u001b[Dstarting with a h that is \"aspiré\" vs \"muet\"",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-ordinals",
"version": "2.1.0",
"version": "2.1.1",
"description": "Ordinal numbers in French: 12 => douzième",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "french-verbs",
"version": "2.1.0",
"version": "2.1.1",
"description": "French verbs: conjugation, based on the Lefff contents, and list of transitive and intransitive verbs",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -50,7 +50,7 @@
},
"dependencies": {
"debug": "^4.1.1",
"french-h-muet-aspire": "2.1.0"
"french-h-muet-aspire": "2.1.1"
},
"devDependencies": {
"copyfiles": "^2.1.0",
......
{
"name": "french-words-gender",
"version": "2.1.0",
"version": "2.1.1",
"description": "Gender of French words, based on the Lefff",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-adjectives",
"version": "2.1.0",
"version": "2.1.1",
"description": "German adjectives, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-determiners",
"version": "2.1.0",
"version": "2.1.1",
"description": "German determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-dict-helper",
"version": "2.1.0",
"version": "2.1.1",
"description": "Helper functions on an included database derived from german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-ordinals",
"version": "2.1.0",
"version": "2.1.1",
"description": "Ordinal numbers in German: 12 => zwölfte",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-verbs",
"version": "2.1.0",
"version": "2.1.1",
"description": "German verbs, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "german-words",
"version": "2.1.0",
"version": "2.1.1",
"description": "Gender and case of German words, based on german-pos-dict",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "gulp-rosaenlg",
"version": "2.1.0",
"version": "2.1.1",
"description": "RosaeNLG client side packaging helper",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -60,6 +60,6 @@
"browserify": "^16.2.3",
"debug": "^4.1.1",
"minify-stream": "^1.2.0",
"rosaenlg": "1.1.0"
"rosaenlg": "1.1.1"
}
}
{
"name": "italian-adjectives",
"version": "2.1.0",
"version": "2.1.1",
"description": "Italian adjectives, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -58,6 +58,6 @@
"license": "MIT",
"dependencies": {
"debug": "^4.1.1",
"rosaenlg-filter": "2.1.0"
"rosaenlg-filter": "2.1.1"
}
}
{
"name": "italian-determiners",
"version": "2.1.0",
"version": "2.1.1",
"description": "Italian determiners",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-ordinals-cardinals",
"version": "2.1.0",
"version": "2.1.1",
"description": "Ordinal and cardinal numbers in Italian",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-verbs",
"version": "2.1.0",
"version": "2.1.1",
"description": "Italian verbs, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "italian-words",
"version": "2.1.0",
"version": "2.1.1",
"description": "Gender and plural of Italian words, based on morph-it",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "lefff-helper",
"version": "2.1.0",
"version": "2.1.1",
"description": "Helper functions on an included database derived from Lefff",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
{
"name": "morph-it-helper",
"version": "2.1.0",
"version": "2.1.1",
"description": "Helper functions on an included database derived from morph-it (Free Morphological Lexicon for the Italian Language)",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
......@@ -11,7 +11,20 @@ export function contractions(input: string): string {
// de + voyelle, que + voyelle, etc.
{
const contrList: string[] = ['[Dd]e', '[Qq]ue', '[Ll]e', '[Ll]a', '[Ss]e', '[Jj]e'];
const contrList: string[] = [
'[Dd]e',
'[Qq]ue',
'[Ll]e',
'[Ll]a',
'[Ss]e',
'[Jj]e',
'[Tt]e',
'[Mm]e',
'[Nn]e',
'[Pp]uisque',
'[Jj]usque',
'[Ll]orsque',
];
for (let i = 0; i < contrList.length; i++) {
// gérer le cas où 'de' est en début de phrase
const regexDe = new RegExp(
......@@ -52,9 +65,15 @@ export function contractions(input: string): string {
const contrList = [
['de', 'le', 'du'],
['de', 'les', 'des'],
['de', 'lequel', 'duquel'],
['de', 'lesquels', 'desquels'],
['de', 'lesquelles', 'desquelles'],
['des', 'les', 'des'],
['à', 'le', 'au'],
['à', 'lequel', 'auquel'],
['à', 'les', 'aux'],
['à', 'lesquels', 'auxquels'],
['à', 'lesquelles', 'auxquelles'],
];
for (let i = 0; i < contrList.length; i++) {
......
{
"name": "rosaenlg-filter",
"version": "2.1.0",
"version": "2.1.1",
"description": "Filtering feature of RosaeNLG",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......@@ -43,7 +43,7 @@
"better-title-case": "^1.0.1",
"compromise": "^11.14.3",
"debug": "^4.1.1",
"french-h-muet-aspire": "2.1.0",
"french-h-muet-aspire": "2.1.1",
"titlecase-french": "^1.0.1"
},
"keywords": [
......
......@@ -164,6 +164,24 @@ const testCasesList = [
['bla à les étudiants', 'Bla aux étudiants'],
['bla.À le cinéma', 'Bla. Au cinéma'],
// new ones
['bla de lequel', 'Bla duquel'],
['bla de lesquels', 'Bla desquels'],
['bla de lesquelles', 'Bla desquelles'],
['cela me ira', "Cela m'ira"],
['cela te ira', "Cela t'ira"],
['cela ne a pas de sens', "Cela n'a pas de sens"],
['cela ne me va pas', 'Cela ne me va pas'],
['lorsque arrivé', "Lorsqu'arrivé"],
['lorsque il', "Lorsqu'il"],
['lorsque venu', 'Lorsque venu'],
['puisque il', "Puisqu'il"],
['puisque il', "Puisqu'il"],
['jusque alors', "Jusqu'alors"],
['bla à lequel', 'Bla auquel'],
['bla à lesquels', 'Bla auxquels'],
['bla à lesquelles', 'Bla auxquelles'],
// complex ones
['le <i class="toto">hedbomadaire</i>', 'L\'<i class="toto">hedbomadaire</i>'],
[
......
{
"name": "rosaenlg-pug-code-gen",
"version": "3.1.0",
"version": "3.1.1",
"description": "Default code-generator for pug. It generates HTML via a JavaScript template function. - RosaeNLG fork",
"scripts": {
"build": "tsc && cp lib/index.js dist/",
......@@ -53,13 +53,13 @@
"constantinople": "^3.1.2",
"debug": "^4.1.1",
"doctypes": "^1.1.0",
"french-verbs": "2.1.0",
"german-adjectives": "2.1.0",
"german-verbs": "2.1.0",
"german-words": "2.1.0",
"italian-adjectives": "2.1.0",
"italian-verbs": "2.1.0",
"italian-words": "2.1.0",
"french-verbs": "2.1.1",
"german-adjectives": "2.1.1",
"german-verbs": "2.1.1",
"german-words": "2.1.1",
"italian-adjectives": "2.1.1",
"italian-verbs": "2.1.1",
"italian-words": "2.1.1",
"js-stringify": "^1.0.1",
"pug-attrs": "^2.0.3",
"pug-error": "^1.3.2",
......
{
"name": "rosaenlg-pug-filters",
"version": "4.1.0",
"version": "4.1.1",
"description": "Code for processing filters in pug templates - RosaeNLG fork",
"scripts": {
"snyk-protect": "snyk protect",
......@@ -15,7 +15,7 @@
"jstransformer": "1.0.0",
"pug-error": "^1.3.2",
"resolve": "^1.1.6",
"rosaenlg-pug-walk": "2.0.0",
"rosaenlg-pug-walk": "2.0.1",
"snyk": "^1.232.0"
},
"devDependencies": {
......@@ -25,8 +25,8 @@
"jstransformer-markdown-it": "^2.1.0",
"jstransformer-stylus": "^1.0.0",
"rosaenlg-pug-lexer": "5.0.0",
"rosaenlg-pug-load": "3.0.0",
"rosaenlg-pug-parser": "6.0.0"
"rosaenlg-pug-load": "3.0.1",
"rosaenlg-pug-parser": "6.0.1"
},
"repository": {
"type": "git",
......
{
"name": "rosaenlg-pug-linker",
"version": "4.0.0",
"version": "4.0.1",
"description": "Link multiple pug ASTs together using include/extends - RosaeNLG fork",
"keywords": [
"pug"
......@@ -8,12 +8,12 @@
"scripts": {},
"dependencies": {
"pug-error": "^1.3.2",
"rosaenlg-pug-walk": "2.0.0"
"rosaenlg-pug-walk": "2.0.1"
},
"devDependencies": {
"rosaenlg-pug-lexer": "5.0.0",
"rosaenlg-pug-load": "3.0.0",
"rosaenlg-pug-parser": "6.0.0"
"rosaenlg-pug-load": "3.0.1",
"rosaenlg-pug-parser": "6.0.1"
},
"repository": {
"type": "git",
......
{
"name": "rosaenlg-pug-load",
"version": "3.0.0",
"version": "3.0.1",
"description": "The Pug loader is responsible for loading the depenendencies of a given Pug file. - RosaeNLG fork",
"keywords": [
"pug"
......@@ -8,11 +8,11 @@
"scripts": {},
"dependencies": {
"object-assign": "^4.1.0",
"rosaenlg-pug-walk": "2.0.0"
"rosaenlg-pug-walk": "2.0.1"
},
"devDependencies": {
"rosaenlg-pug-lexer": "5.0.0",
"rosaenlg-pug-parser": "6.0.0"
"rosaenlg-pug-parser": "6.0.1"
},
"repository": {
"type": "git",
......
{
"name": "rosaenlg-pug-parser",
"version": "6.0.0",
"version": "6.0.1",
"description": "The pug parser (takes an array of tokens and converts it to an abstract syntax tree) - RosaeNLG fork",
"keywords": [
"pug"
......@@ -11,8 +11,6 @@
"pug-error": "^1.3.2",
"token-stream": "^1.0.0"
},
"devDependencies": {
},
"repository": {
"type": "git",
"url": "git@gitlab.com:rosaenlg-projects/rosaenlg.git"
......
{
"name": "rosaenlg-pug-walk",
"version": "2.0.0",
"version": "2.0.1",
"description": "Walk and transform a pug AST - RosaeNLG fork",
"keywords": [
"pug"
......@@ -8,7 +8,7 @@
"scripts": {},
"devDependencies": {
"rosaenlg-pug-lexer": "5.0.0",
"rosaenlg-pug-parser": "6.0.0"
"rosaenlg-pug-parser": "6.0.1"
},
"dependencies": {
"debug": "^4.1.1"
......
{
"name": "rosaenlg-yseop",
"version": "2.1.0",
"version": "2.1.1",
"description": "Yseop code generator for RosaeNLG. It generates Yseop Text compatible templates. Derived from rosaenlg-pug-code-gen.",
"scripts": {},
"keywords": [
......
name: rosaenlg
version: '1.1.0'
version: '1.1.1'
title: RosaeNLG
nav:
- modules/ROOT/nav.adoc
......
......@@ -8,7 +8,7 @@ https://keepachangelog.com/en/0.3.0/
=== Changed
////
== [Unreleased]
== [1.1.1] - 2019-10-09
=== Added
......@@ -17,7 +17,7 @@ https://keepachangelog.com/en/0.3.0/
=== Fixed
* Dev dependancies security issues thanks to Snyk
* More French contractions (_j'ai_, _lorsqu'il_, _puisqu'elle_, _jusqu'à_ etc.) thanks to link:https://github.com/societe-generale/core-nlg[CoreNLG] source code
=== Changed
......
{
"name": "rosaenlg",
"description": "A complete Natural Language Generation library based on Pug",
"version": "1.1.0",
"version": "1.1.1",
"keywords": [
"NLG",
"Natural Language Generation"
......@@ -74,40 +74,40 @@
"@types/random-js": "^1.0.31",
"compromise": "^11.14.3",
"debug": "^4.1.1",
"english-determiners": "2.1.0",
"french-adjectives": "2.1.0",
"french-determiners": "2.1.0",
"french-ordinals": "2.1.0",
"french-verbs": "2.1.0",
"french-words-gender": "2.1.0",
"german-adjectives": "2.1.0",
"german-determiners": "2.1.0",
"german-dict-helper": "2.1.0",
"german-ordinals": "2.1.0",
"german-verbs": "2.1.0",
"german-words": "2.1.0",
"italian-adjectives": "2.1.0",
"italian-determiners": "2.1.0",
"italian-ordinals-cardinals": "2.1.0",
"italian-verbs": "2.1.0",
"italian-words": "2.1.0",
"lefff-helper": "2.1.0",
"english-determiners": "2.1.1",
"french-adjectives": "2.1.1",
"french-determiners": "2.1.1",
"french-ordinals": "2.1.1",
"french-verbs": "2.1.1",
"french-words-gender": "2.1.1",
"german-adjectives": "2.1.1",
"german-determiners": "2.1.1",
"german-dict-helper": "2.1.1",
"german-ordinals": "2.1.1",
"german-verbs": "2.1.1",
"german-words": "2.1.1",
"italian-adjectives": "2.1.1",
"italian-determiners": "2.1.1",
"italian-ordinals-cardinals": "2.1.1",
"italian-verbs": "2.1.1",
"italian-words": "2.1.1",
"lefff-helper": "2.1.1",
"moment": "^2.24.0",
"morph-it-helper": "2.1.0",
"morph-it-helper": "2.1.1",
"numeral": "^2.0.6",
"pluralize-fr": "^1.0.1",
"pug-runtime": "^2.0.4",
"pug-strip-comments": "^1.0.3",
"random-js": "^2.0.0-rc3",
"rosaenlg-filter": "2.1.0",
"rosaenlg-pug-code-gen": "3.1.0",
"rosaenlg-pug-filters": "4.1.0",
"rosaenlg-filter": "2.1.1",
"rosaenlg-pug-code-gen": "3.1.1",
"rosaenlg-pug-filters": "4.1.1",
"rosaenlg-pug-lexer": "5.0.0",
"rosaenlg-pug-linker": "4.0.0",
"rosaenlg-pug-load": "3.0.0",
"rosaenlg-pug-parser": "6.0.0",
"rosaenlg-yseop": "2.1.0",
"synonym-optimizer": "2.1.0",
"rosaenlg-pug-linker": "4.0.1",
"rosaenlg-pug-load": "3.0.1",
"rosaenlg-pug-parser": "6.0.1",
"rosaenlg-yseop": "2.1.1",
"synonym-optimizer": "2.1.1",
"write-int": "^0.0.2",
"written-number": "^0.9.1"
},
......
{
"name": "synonym-optimizer",
"version": "2.1.0",
"version": "2.1.1",
"description": "Finds the text which has the least number of repetitions",
"main": "dist/index.js",
"types": "dist/index.d.ts",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment