Merge branch 'master' into fix

gap/Library/library.gd

@@ -433,13 +433,14 @@ DeclareOperation( "Icosahedron", [] );
 DeclareOperation( "JanusHead", [] );
 
 
-
-#! @BeginGroup SimplicialUmbrella
-#! @Description
-#! Return a simplicial surface consisting of one closed umbrella-path
-#! with <A>nrFaces</A> triangles. The labels are assigned according
-#! to the following illustration, in which <M>n</M> is <A>nrFaces</A>:
-
+#! <ManSection Label="SimplicialUmbrella"> 
+#!   <Oper Name="SimplicialUmbrella" Arg="nrFaces" Label="for IsPosInt"/>
+#!   <Filt Name="SimplicialGon" Arg="nrFaces" Type="operation"/>
+#!   <Returns><K>a simplicial surface</K></Returns>
+#!   <Description>
+#!   Return a simplicial surface consisting of one closed umbrella-path
+#!   with <A>nrFaces</A> triangles. The labels are assigned according
+#!   to the following illustration, in which <M>n</M> is <A>nrFaces</A>:
 #!  <Alt Only="HTML">
 #! &lt;br>&lt;img src='./images/_Wrapper_library-1-1.svg'> &lt;/img> &lt;br>
 #! </Alt>
@@ -450,7 +451,7 @@ DeclareOperation( "JanusHead", [] );
 #! </Alt>
 #! <Alt Only = "Text">
 #! Image omitted in terminal text
-            #! </Alt>
+#! </Alt>
 #!
 #! @ExampleSession
 #! gap> umb4 := SimplicialUmbrella(4);
@@ -468,13 +469,12 @@ DeclareOperation( "JanusHead", [] );
 #! [ [ 1, 3 ], [ 2, 3 ], [ 1, 2 ], [ 1, 2 ] ]
 #! gap> EdgesOfFaces(umb2);
 #! [ [ 1, 2, 3 ], [ 1, 2, 4 ] ]
-#! @EndExampleSession
-#!
-#!
-#! @Returns a simplicial surface
-#! @Arguments nrFaces
-DeclareOperation( "SimplicialUmbrella", [ IsPosInt ] );
-#! @EndGroup
+#! @EndExampleSession 
+#!   </Description>
+#! </ManSection>
+# here no AutoDoc documentation since synonyms can't be handled automatically
+DeclareOperation("SimplicialUmbrella", [ IsPosInt ] );
+DeclareSynonym("SimplicialGon", SimplicialUmbrella);
 
 #! @BeginGroup SimplicialOpenGeodesic
 #! @Description

gap/PolygonalComplexes/graphs.gi

@@ -300,6 +300,7 @@ if IsPackageMarkedForLoading( "GRAPE", ">=0" ) then
             if IsSimplicialSurface(complex1) and IsSimplicialSurface(complex2) and CounterOfButterflies(complex1)<>CounterOfButterflies(complex2) then
 		return false;
 	    fi;
+
             inc1 := IncidenceGrapeGraph(complex1);
             inc2 := IncidenceGrapeGraph(complex2);
             # We copy the structure fully, so that all components stay mutable
@@ -315,15 +316,15 @@ fi;
 if IsPackageMarkedForLoading("NautyTracesInterface", ">=0") then
     InstallMethod( IsIsomorphic, 
         "for two twisted polygonal complexes", 
-        [IsTwistedPolygonalComplex, IsTwistedPolygonalComplex],
+        [IsTwistedPolygonalComplex, IsTwistedPolygonalComplex],5,
         function(complex1, complex2)
-	    if IsSimplicialSurface(complex1) and IsSimplicialSurface(complex2) and CounterOfButterflies(complex1)<>CounterOfButterflies(complex2) then
-                
-		return false;
-            fi;
-            return IsomorphismGraphs( 
-                ChamberAdjacencyGraph(complex1),
-                ChamberAdjacencyGraph(complex2)) <> fail;
+        if IsSimplicialSurface(complex1) and IsSimplicialSurface(complex2) and CounterOfButterflies(complex1)<>CounterOfButterflies(complex2) then
+              return false;
+        fi;
+
+        return IsomorphismGraphs( 
+            ChamberAdjacencyGraph(complex1),
+            ChamberAdjacencyGraph(complex2)) <> fail;
         end
     );