From f837a3bd16655834d198f1b9b7f4bfb4dc609e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Gigandet?= <stephane@openfoodfacts.org>
Date: Mon, 5 Aug 2024 14:09:40 +0200
Subject: [PATCH] taxonomy: paprika for color (#10627)

Handles more synonyms used in the US for paprika used as a colour
---
 taxonomies/additives.txt         | 12 +++----
 taxonomies/additives_classes.txt |  6 ++--
 tests/unit/additives_tags.t      | 56 ++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/taxonomies/additives.txt b/taxonomies/additives.txt
index c612ee255900d..6564a090b50e6 100644
--- a/taxonomies/additives.txt
+++ b/taxonomies/additives.txt
@@ -20,8 +20,8 @@
 
 
 # stopwords for matching more additives
-stopwords:en: of
-stopwords:fr: de, d, des, du, le, la, les, a, aux
+stopwords:en: of, for, added
+stopwords:fr: de, d, des, du, l, le, la, les, a, au, aux, pour
 
 # synonyms need to be separated with an empty line
 synonyms:en: FD&C, FD and C, FDC, FFDCA, FDCA
@@ -52,9 +52,9 @@ synonyms:en: no11, n11, 11
 
 synonyms:en: no12, n12, 12
 
-synonyms:en: colour, color
+synonyms:en: colour, color, colouring, coloring
 
-en: E100, Curcumin, Turmeric extract, curcuma extract
+en: E100, Curcumin, Turmeric extract, curcuma extract, turmeric color
 xx: E100
 ar: E100, كركومين
 bg: E100, куркумин
@@ -2274,8 +2274,8 @@ xx: E160b(ii)
 additives_classes:en: en:colour
 e_number:en: 160b
 
-
-en: E160c, Paprika extract, capsanthin, capsorubin, Paprika oleoresin
+# in English, we sometimes have "paprika color", in which case it is clearly the additive
+en: E160c, Paprika extract, capsanthin, capsorubin, Paprika oleoresin, oleoresin of paprika, oleoresin paprika, paprika color, colored with paprika
 xx: E160c
 bg: E160c, Паприка екстракт, капсантин, капсорубин
 ca: E160c, Capsantina
diff --git a/taxonomies/additives_classes.txt b/taxonomies/additives_classes.txt
index 2d87d3f92d4f9..ca76532b0db3e 100644
--- a/taxonomies/additives_classes.txt
+++ b/taxonomies/additives_classes.txt
@@ -2,8 +2,8 @@
 # FAO reference: http://www.fao.org/gsfaonline/reference/techfuncs.html?lang=en
 
 # agent de blanchiment de la farine
-stopwords:en: a, an, for, added, to, as
-stopwords:fr: la, les, des, du, de, d, un, une, ajouté, ajoutés, ajoutée, ajoutées, pour
+stopwords:en: a, an, for, added, to, as, for, with, added
+stopwords:fr: l, la, les, des, du, de, d, un, une, ajouté, ajoutés, ajoutée, ajoutées, pour, avec
 stopwords:es: de, del, la, las, los, una
 
 en: Acid, Acidifier, Acidulant, tartness, provides tartness
@@ -348,7 +348,7 @@ description:en: A food additive used to dissolve, dilute, disperse or otherwise
 description:es: Aditivos alimentarios que se utilizan para disolver, diluir, dispersar o modificar de otras maneras un aditivo alimentario o nutriente sin alterar su función (y sin generar por sí mismos efecto tecnológico alguno) con el fin de facilitar la manipulación, la aplicación o uso del aditivo alimentario o nutriente.
 description:fr: Additif alimentaire utilisé pour dissoudre, diluer, disperser ou modifier physiquement de toute autre façon un additif alimentaire ou un nutriment sans altérer sa fonction (et sans produire lui-même d’effet technologique) afin de faciliter sa manipulation, son application ou son utilisationde l’additif alimentaire ou du nutriment.
 
-en: Colour, color, colouring, coloring, decorative pigment, surface colorant, for color, artificial color, artificial colour, color added, colors added, artificial color added, colorant, colours, colors, coloring food, colouring food, synthetic colour, colouring agent, coloring agent
+en: Colour, color, colouring, coloring, decorative pigment, surface colorant, for color, artificial color, artificial colour, color added, colors added, artificial color added, colorant, colours, colors, coloring food, colouring food, synthetic colour, colouring agent, coloring agent, colored, coloured
 bg: Оцветител, оцветители
 ca: Color, colors, colorant, colorants, pigment decoratiu
 cs: Barvivo
diff --git a/tests/unit/additives_tags.t b/tests/unit/additives_tags.t
index 9a1c63d79cd94..198ab4ded5fd1 100755
--- a/tests/unit/additives_tags.t
+++ b/tests/unit/additives_tags.t
@@ -211,6 +211,62 @@ my @tests = (
 		},
 		[]
 	],
+	# Paprika for color
+	[
+		{
+			lc => 'en',
+			ingredients_text => "paprika for color"
+		},
+		['en:e160c']
+	],
+	# Colored with paprika
+	[
+		{
+			lc => 'en',
+			ingredients_text => "colored with paprika"
+		},
+		['en:e160c']
+	],
+	# oleoresin paprika
+	[
+		{
+			lc => 'en',
+			ingredients_text => "oleoresin paprika"
+		},
+		['en:e160c']
+	],
+	# oleoresin of paprika
+	[
+		{
+			lc => 'en',
+			ingredients_text => "oleoresin of paprika"
+		},
+		['en:e160c']
+	],
+	# paprika added for color
+	[
+		{
+			lc => 'en',
+			ingredients_text => "paprika added for color"
+		},
+		['en:e160c']
+	],
+	# turmeric color
+	[
+		{
+			lc => 'en',
+			ingredients_text => "turmeric color"
+		},
+		['en:e100']
+	],
+	# turmeric for color
+	[
+		{
+			lc => 'en',
+			ingredients_text => "turmeric for color"
+		},
+		['en:e100']
+	],
 
 );