Merge branch 'main' into stable-1.7

Author: james-d-mitchell

.mailmap

@@ -7,7 +7,7 @@ Tom Conti-Leslie <tom.contileslie@gmail.com> Tom Conti-Leslie <tdcl@st-andrews.a
 Jan De Beule <jdebeule@cage.ugent.be>
 Jan De Beule <jdebeule@cage.ugent.be> Jan De Beule <jan@debeule.eu>
 Jan De Beule <jdebeule@cage.ugent.be> jdebeule <unknown>
-Joe Edwards <je53@st-andrews.ac.uk> Joe Edwards <80713360+Joseph-Edwards@users.noreply.github.com>
+Joseph Edwards <jde1@st-andrews.ac.uk> Joseph Edwards <80713360+Joseph-Edwards@users.noreply.github.com>
 Luke Elliott <le27@st-andrews.ac.uk> Luke <le27@st-andrews.ac.uk>
 Luke Elliott <le27@st-andrews.ac.uk> le27 <le27@st-andrews.ac.uk>
 Max Horn <horn@mathematik.uni-kl.de> Max Horn <max@quendi.de>

PackageInfo.g

@@ -127,10 +127,10 @@ Persons := [
 
   rec(
     LastName      := "Edwards",
-    FirstNames    := "Joe",
+    FirstNames    := "Joseph",
     IsAuthor      := false,
     IsMaintainer  := false,
-    Email         := "je53@st-andrews.ac.uk",
+    Email         := "jde1@st-andrews.ac.uk",
     PostalAddress := _STANDREWSMATHS,
     Place         := "St Andrews",
     Institution   := "University of St Andrews",

gap/oper.gi

@@ -241,7 +241,7 @@ function(D, src, ran)
   pos := Position(D!.OutNeighbours[src], ran);
   if pos <> fail then
     Remove(D!.OutNeighbours[src], pos);
-    Remove(DigraphEdgeLabels(D)[src], pos);
+    RemoveDigraphEdgeLabel(D, src, pos);
   fi;
   return D;
 end);

tst/testinstall.tst

@@ -416,6 +416,19 @@ gap> d := EdgeWeightedDigraph([[2], [1]], [[5], [10]]);
 gap> EdgeWeights(d);
 [ [ 5 ], [ 10 ] ]
 
+# Issue 617: bug in DigraphRemoveEdge, wasn't removing edge labels
+gap> D := DigraphByEdges(IsMutableDigraph, [[1, 2], [2, 3], [3, 4], [4, 1], [1, 1]]);;
+gap> DigraphEdgeLabels(D);
+[ [ 1, 1 ], [ 1 ], [ 1 ], [ 1 ] ]
+gap> DigraphRemoveEdge(D, [1, 2]);;
+gap> DigraphEdgeLabels(D);
+[ [ 1 ], [ 1 ], [ 1 ], [ 1 ] ]
+gap> D := DigraphByEdges(IsMutableDigraph, [[1, 2], [2, 3], [3, 4], [4, 1], [1, 1]]);;
+gap> SetDigraphEdgeLabel(D, 1, 2, "test");
+gap> DigraphRemoveEdge(D, 1, 2);;
+gap> DigraphEdgeLabels(D);
+[ [ 1 ], [ 1 ], [ 1 ], [ 1 ] ]
+
 #  DIGRAPHS_UnbindVariables
 gap> Unbind(D);
 gap> Unbind(adj);