correcting merge

.gitlab-ci.yml

+# This file is a template, and might need editing before it works on your project.
+# Full project: https://gitlab.com/pages/plain-html
+pages:
+  stage: deploy
+  script:
+  - mkdir .public
+  - cp -r * .public
+  - mv .public public
+  artifacts:
+    paths:
+    - public
+  only:
+  - master

am2wiki.html

@@ -7,8 +7,9 @@
 
 <!--
 	Am2Wiki by Oncela
+
 	Last modification: 27-04-2017
-	
+
 	This program intends to convert amendments drafted by Members of European 
 	Parliament into reusable formats.
 	
@@ -29,7 +30,9 @@
 	var colors 	= [		"white", 	"#A60000", 	"#F55E33", 	"#BABABA", 	"#AEF279", 	"#44C92C"	];
 	
 	// Political groups of the EP
-	var groups  = [ "", "EPP", "S&D", "ALDE", "Verts/ALE", "ECR", "GUE/NGL", "NI", "EFD" ];
+
+	var groups  = [ "", "EPP", "S&D", "ALDE", "Verts/ALE", "ECR", "GUE/NGL", "NI", "EFDD", "ENF"];
+
 	
 	// Template for conversion (how the amendments are displayed once processed: you can change it at will) 
 	/* 
@@ -192,15 +195,15 @@
 	
 
 		// Use the internal tags to isolate each amendment in an array
-		var parser = cleanFile.match(/Am>.*?<\/NumAm>.*?\[\[.*?\]\].*?((<Num)|$)/g);
+
+		var parser = cleanFile.match(/Am>.*?<\/NumAm>.*?<Members>.*?\[\[.*?\]\].*?((<Num)|$)/g);
 	
 		// Use the internal tags to retrive each info and put them into the amendments array
 		for (var i = 0; i < parser.length ; i++)
 		{
 			var am = {};
 				am.number 	= parser[i].replace(/Am> *(.*?) *<\/NumAm>.*/, "Amendment $1");
-				am.member = (rapporteur != "") ? rapporteur :
-							  parser[i].replace(/.*<RepeatBlock-By> *<Members> *(.*?) *<\/Members>.*/, "$1");
+				am.member	= parser[i].replace(/.*<RepeatBlock-By> *<Members> *(.*?) *<\/Members>.*/, "$1");
 				am.article 	= parser[i].replace(/.*<Article> *(.*?) *<\/Article>.*/, "$1");
 				am.left 	= parser[i].replace(/.*\[\[ *(.*?) *\|\|.*/, "$1");
 				am.right 	= parser[i].replace(/.*\|\| *(.*?) *\]\].*/, "$1");