Merge branch 'master' into patch-1

Author: fingolfin

.github/workflows/CI.yml

@@ -5,13 +5,14 @@ on:
   push:
     branches:
       - master
+      - main
   pull_request:
 
 # the `concurrency` settings ensure that not too many CI jobs run in parallel
 concurrency:
   # group by workflow and ref; the last slightly strange component ensures that for pull
-  # requests, we limit to 1 concurrent job, but for the master branch we don't
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.run_number }}
+  # requests, we limit to 1 concurrent job, but for the default repository branch we don't
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref_name != github.event.repository.default_branch || github.run_number }}
   # Cancel intermediate builds, but only if it is a pull request build.
   cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
 
@@ -25,12 +26,13 @@ jobs:
       matrix:
         gap-branch:
           - master
+          - stable-4.15
           - stable-4.14
           - stable-4.13
           - stable-4.12
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: gap-actions/setup-gap@v2
         with:
           GAP_PKGS_TO_CLONE: "cvec"
@@ -45,23 +47,3 @@ jobs:
       - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-
-  # The documentation job
-  manual:
-    name: Build manuals
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v5
-      - uses: gap-actions/setup-gap@v2
-      - run: sudo apt-get install tipa # for textipa
-      - uses: gap-actions/build-pkg-docs@v1
-        with:
-          use-latex: 'true'
-          warnings-as-errors: 'false'  # disable warnings: too many labels multiply defined
-      - name: 'Upload documentation'
-        uses: actions/upload-artifact@v4
-        with:
-          name: manual
-          path: ./doc/manual.pdf
-          if-no-files-found: error

.github/workflows/docs.yml

@@ -0,0 +1,38 @@
+name: Docs
+
+# Trigger the workflow on push or pull request
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+
+# the `concurrency` settings ensure that not too many CI jobs run in parallel
+concurrency:
+  # group by workflow and ref; the last slightly strange component ensures that for pull
+  # requests, we limit to 1 concurrent job, but for the default repository branch we don't
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref_name != github.event.repository.default_branch || github.run_number }}
+  # Cancel intermediate builds, but only if it is a pull request build.
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
+jobs:
+  manual:
+    name: Build manuals
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v6
+      - uses: gap-actions/setup-gap@v3
+      - run: sudo apt-get install tipa # for textipa
+      - uses: gap-actions/build-pkg-docs@v2
+        with:
+          use-latex: 'true'
+          warnings-as-errors: 'false'
+          # Disabled due to a gazillion multiply defined label warnings
+      - name: 'Upload documentation'
+        uses: actions/upload-artifact@v4
+        with:
+          name: manual
+          path: ./doc/manual.pdf
+          if-no-files-found: error

.github/workflows/release.yml

@@ -4,12 +4,12 @@ on:
   workflow_dispatch:
     inputs:
       dry-run:
-        description: "Only create an archive containing the release instead of publishing it on GitHub"
+        description: "Dry run: only create an archive containing the release instead of publishing it on GitHub"
         type: boolean
         required: false
         default: false
       force:
-        description: "Allow overwriting an existing release, or making a release with an incorrect date"
+        description: "Force: allow overwriting an existing release, or making a release with an incorrect date"
         type: boolean
         required: false
         default: false
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: gap-actions/setup-gap@v3
       - uses: gap-actions/build-pkg-docs@v2
         with:

.mailmap

@@ -1,4 +1,4 @@
-Jan De Beule <jan@debeule.eu> 
+Jan De Beule <jan@debeule.eu>
 Jan De Beule <jan@debeule.eu> <16762220+jdebeule@users.noreply.github.com>
 Jan De Beule <jan@debeule.eu> <jdebeule@iMac-El-Capitan.local>
 Jan De Beule <jan@debeule.eu> <jdebeule@cage.ugent.be>

PackageInfo.g

@@ -1,13 +1,13 @@
 #############################################################################
-##  
-##  PackageInfo.g for the package `FinInG'                 
+##
+##  PackageInfo.g for the package `FinInG'
 ##                                                               John Bamberg
 ##                                                               Anton Betten
 ##                                                              Philippe Cara
 ##                                                               Jan De Beule
 ##                                                             Michel Lavrauw
 ##                                                            Max Neunhoeffer
-##  
+##
 
 SetPackageInfo( rec(
 
@@ -36,7 +36,7 @@ ArchiveURL      := Concatenation( ~.SourceRepository.URL,
 ArchiveFormats := ".tar.gz .tar.bz2",
 
 Persons := [
-  rec( 
+  rec(
     LastName      := "Bamberg",
     FirstNames    := "John",
     IsAuthor      := true,
@@ -53,7 +53,7 @@ Persons := [
     Place         := "Perth",
     Institution   := "The University of Western Australia",
   ),
-  rec( 
+  rec(
     LastName      := "Betten",
     FirstNames    := "Anton",
     IsAuthor      := true,
@@ -75,8 +75,8 @@ Persons := [
     IsAuthor      := true,
     IsMaintainer  := true,
     Email         := "pcara@vub.ac.be",
-    WWWHome       := "http://homepages.vub.ac.be/~pcara",
-    GitHubUsername := "pcara",
+    WWWHome       := "https://wids.research.vub.be/nl/philippe-cara",
+    GitHubUsername:= "pcara",
     PostalAddress := Concatenation( [
                        "Department of Mathematics\n",
                        "Vrije Universiteit Brussel\n",
@@ -103,7 +103,7 @@ Persons := [
     Place         := "Brussels",
     Institution   := "Vrije Universiteit Brussel",
   ),
-  rec( 
+  rec(
     LastName      := "Lavrauw",
     FirstNames    := "Michel",
     IsAuthor      := true,
@@ -121,7 +121,7 @@ Persons := [
     Place         := "Koper",
     Institution   := "University of Primorska",
   ),
-  rec( 
+  rec(
     LastName      := "Neunhoeffer",
     FirstNames    := "Max",
     IsAuthor      := true,
@@ -159,7 +159,7 @@ AbstractHTML := "<span class=\"pkgname\">FinInG</span> is a package for computat
  in its facility with matrix and permutation groups.",
 
 PackageDoc := rec(
-  # use same as in GAP            
+  # use same as in GAP
   BookName  := "FinInG",
   ArchiveURLSubset := ["doc"],
   HTMLStart := "doc/chap0_mj.html",

TODO

@@ -1,5 +1,5 @@
 StandardFrame is applicable on subgeometries of projective spaces but
-gives currently a non acceptable error. Should be fixed. 
+gives currently a non acceptable error. Should be fixed.
 
 CoordinatesWithRespectToDefininigFrameOfSubgeometry
 

archive/celles_prefun.g

@@ -1,29 +1,29 @@
 		prefun := function( subspace ) # This map is the inverse of func and returns an error, or a subspace of geom1
 			local flag,basvecs,mat1,span,x,v,v1,i;
 			flag:=true;
-			if not subspace in pg2 then 
+			if not subspace in pg2 then
 				Error("The input is not in the range fo the field reduction map!");
 			fi;
-			if not IsInt((Dimension(subspace)+1)/t) then 
+			if not IsInt((Dimension(subspace)+1)/t) then
 				flag:=false;
 			else
 				basvecs:=BasisVectors(basis);
 				mat1:=[];
 				span:=[];
 				repeat
-					repeat 
-						x:=Random(Points(subspace)); 
+					repeat
+						x:=Random(Points(subspace));
 					until not x in span;
 					v:=Coordinates(x);
 					v1:=List([1..d1],i->v{[(i-1)*t+1..i*t]}*basvecs);
 					Add(mat1,v1);
 					span:=VectorSpaceToElement(pg2,BlownUpMat(basis,mat1));
 				until Dimension(span)=Dimension(subspace);
-				if not span = subspace then 
+				if not span = subspace then
 					flag:= false;
 				fi;
 			fi;
-			if flag= false then 
+			if flag= false then
 				Error("The input is not in the range of the field reduction map!");
 			fi;
 			return VectorSpaceToElement(pg1,mat1);

archive/cvec/frobcveccmat.g

@@ -4,7 +4,7 @@ InstallOtherMethod( \^, "for a cvec and a trivial frobenius automorphism",
     return v;
   end );
 
-InstallOtherMethod( \^, 
+InstallOtherMethod( \^,
   "for a mutable cvec and a trivial frobenius automorphism",
   [IsCVecRep and IsFFECollection and IsMutable, IsMapping and IsOne],
   function( v, f )

archive/efkes.gi

@@ -1,10 +1,10 @@
 psdim := ps!.dimension;
 f := ps!.basefield;
 b := Unpack(v!.obj); #cmat unpack necessary for infra.
-vdim := v!.type;  
+vdim := v!.type;
 if vdim = 1 then b:=[b]; fi;
 vs := ps!.vectorspace;
-sub := Subspace(vs, b);  
+sub := Subspace(vs, b);
 
 group1 := List(coll1);;
 objs := List(Points(quadric));;
@@ -190,7 +190,7 @@ cs := SolutionMat(systemmat,ie);
 id := IdentityMat(4,f);
 
 twinerprefun := function( el )
-local mat, newmat, id, lines, 
+local mat, newmat, id, lines,
 mat := Unpack(el!.mat);
 lines := [];
 lines[1] := [[id[1],id[2]],[id[1],id[3]],[id[1],id[4]]];
@@ -634,7 +634,7 @@ end );
 # Added april 2014 jdb.
 #############################################################################
 #O  NaturalDuality( <gq1>, <gq2>, <bool> )
-# This is the interface to the helper functions. It simply checks the input 
+# This is the interface to the helper functions. It simply checks the input
 # and decides which NaturalDuality... to use.
 ##
 InstallMethod( NaturalDuality,
@@ -645,7 +645,7 @@ InstallMethod( NaturalDuality,
 # Added april 2014 jdb.
 #############################################################################
 #O  NaturalDuality( <gq1>, <computeintertwiner> )
-# This is the interface to the helper functions. It simply checks the input 
+# This is the interface to the helper functions. It simply checks the input
 # and decides which NaturalDuality... to use.
 ##
 InstallMethod( NaturalDuality,

archive/emptyset.gi

@@ -11,73 +11,73 @@ InstallMethod( ViewObj, [IsEmptySubspace],
     Print("< empty subspace >");
   end );
 
-InstallMethod( IsIncident, "for the empty subspace and a nonempty subspace", 
+InstallMethod( IsIncident, "for the empty subspace and a nonempty subspace",
    [ IsEmptySubspace, IsSubspaceOfProjectiveSpace ],
   function( x, y )
     return true;
   end );
 
-InstallMethod( IsIncident, "for the empty subspace and a nonempty subspace", 
+InstallMethod( IsIncident, "for the empty subspace and a nonempty subspace",
    [ IsSubspaceOfProjectiveSpace, IsEmptySubspace ],
   function( x, y )
     return true;
   end );
 
-InstallMethod( IsIncident, "for the empty subspace and a projective subspace", 
+InstallMethod( IsIncident, "for the empty subspace and a projective subspace",
    [ IsEmptySubspace, IsProjectiveSpace ],
   function( x, y )
     return true;
   end );
 
-InstallMethod( IsIncident, "for the empty subspace and a projective subspace", 
+InstallMethod( IsIncident, "for the empty subspace and a projective subspace",
    [ IsProjectiveSpace, IsEmptySubspace ],
   function( x, y )
     return true;
   end );
 
-InstallMethod( Span, "for the empty subspace and a projective subspace", 
+InstallMethod( Span, "for the empty subspace and a projective subspace",
    [ IsEmptySubspace, IsSubspaceOfProjectiveSpace ],
   function( x, y )
     return y;
   end );
 
-InstallMethod( Span, "for the empty subspace and a projective subspace", 
+InstallMethod( Span, "for the empty subspace and a projective subspace",
    [ IsSubspaceOfProjectiveSpace, IsEmptySubspace ],
   function( x, y )
     return x;
   end );
 
-InstallMethod( Span, "for the empty subspace and a projective subspace", 
+InstallMethod( Span, "for the empty subspace and a projective subspace",
    [ IsEmptySubspace, IsProjectiveSpace ],
   function( x, y )
     return y;
   end );
 
-InstallMethod( Span, "for the empty subspace and a projective subspace", 
+InstallMethod( Span, "for the empty subspace and a projective subspace",
    [ IsProjectiveSpace, IsEmptySubspace ],
   function( x, y )
     return x;
   end );
 
-InstallMethod( Meet, "for the empty subspace and a projective subspace", 
+InstallMethod( Meet, "for the empty subspace and a projective subspace",
    [ IsEmptySubspace, IsSubspaceOfProjectiveSpace ],
   function( x, y )
     return x;
   end );
 
-InstallMethod( Meet, "for the empty subspace and a projective subspace", 
+InstallMethod( Meet, "for the empty subspace and a projective subspace",
    [ IsSubspaceOfProjectiveSpace, IsEmptySubspace ],
   function( x, y )
     return y;
   end );
 
-InstallMethod( Meet, "for the empty subspace and a projective subspace", 
+InstallMethod( Meet, "for the empty subspace and a projective subspace",
    [ IsEmptySubspace, IsProjectiveSpace ],
   function( x, y )
     return x;
   end );
 
-InstallMethod( Meet, "for the empty subspace and a projective subspace", 
+InstallMethod( Meet, "for the empty subspace and a projective subspace",
    [ IsProjectiveSpace, IsEmptySubspace ],
   function( x, y )
     return y;