Merge branch 'stable-1.4'

Author: wilfwilson

.codecov.yml

@@ -12,4 +12,10 @@ comment:
   behavior: default
 
 ignore:
- - "extern"         # Do not check coverage on the extern directory
+ - "extern/"
+ - "gap/utils.gi"
+ - "PackageInfo.g"
+ - "init.g"
+ - "makedoc.g"
+ - "read.g"
+ - "tst/testall.g"

.gitignore

@@ -53,9 +53,9 @@ planarity
 src/.deps/*
 src/.libs/*
 src/_pkgconfig.h
-extern/edge-addition-planarity-suite-Version_3.0.0.5/.libs
-extern/edge-addition-planarity-suite-Version_3.0.0.5/c/.deps
-extern/edge-addition-planarity-suite-Version_3.0.0.5/m4
+extern/edge-addition-planarity-suite-Version_*/.libs
+extern/edge-addition-planarity-suite-Version_*/c/.deps
+extern/edge-addition-planarity-suite-Version_*/m4
 src/stamp-h1
 tags
 tst/out/*
@@ -74,3 +74,4 @@ coverage
 .ipynb_checkpoints
 bliss
 *.a
+*.dylib

configure.ac

@@ -114,8 +114,8 @@ AS_IF([test "x$enable_compile_warnings" != "xno"],
 AX_CHECK_PLANARITY()
 
 if test "x$with_external_planarity" = xno ; then
-  AC_CONFIG_SUBDIRS([extern/edge-addition-planarity-suite-Version_3.0.0.5])
-  PLANARITY_SUITE_DIR=extern/edge-addition-planarity-suite-Version_3.0.0.5
+  AC_CONFIG_SUBDIRS([extern/edge-addition-planarity-suite-Version_3.0.1.0])
+  PLANARITY_SUITE_DIR=extern/edge-addition-planarity-suite-Version_3.0.1.0
   AC_SUBST(PLANARITY_SUITE_DIR)
 fi
 

doc/digraphs.bib

@@ -1,7 +1,40 @@
 % Cite keys match the cite keys that are used in the compiled GAPDoc manual
 
+@article{B12,
+   author = {John M. Boyer},
+   title = {Subgraph Homeomorphism via the Edge Addition Planarity Algorithm},
+   journal = {Journal of Graph Algorithms and Applications},
+   year = {2012},
+   volume = {16},
+   number = {2},
+   pages = {381--410},
+   doi = {10.7155/jgaa.00268}
+}
+
+@article{BM04,
+   author = {John M. Boyer and Wendy J. Myrvold},
+   title = {On the Cutting Edge: Simplified O(n) Planarity by Edge Addition},
+   journal = {Journal of Graph Algorithms and Applications},
+   year = {2004},
+   volume = {8},
+   number = {3},
+   pages = {241--273},
+   doi = {10.7155/jgaa.00091}
+}
+
+@inproceedings{B06,
+  address = {Berlin, Heidelberg},
+  author = {John M. Boyer},
+  booktitle = {Graph Drawing},
+  editor = {Healy, Patrick and Nikolov, Nikola S.},
+  isbn = {978-3-540-31667-1},
+  pages = {508--511},
+  publisher = {Springer Berlin Heidelberg},
+  title = {A New Method for Efficiently Generating Planar Graph Visibility Representations},
+  year = {2006}}
+
 @incollection{BM06,
-  Author = {John M. Boyer and Wendy J. Myrvold},
+  author = {John M. Boyer and Wendy J. Myrvold},
   Booktitle = {Graph Algorithms and Applications 5},
   Doi = {10.1142/9789812773289_0014},
   Month = {Jun},

doc/z-chap0.xml

@@ -50,6 +50,14 @@
   <Ref Sect="Isomorphisms and canonical labellings"/> for more details.  
   <P/>
 
+  The &edge-addition-planarity-suite; is also included in &Digraphs;; see
+  <Cite Key="BM04"/>, <Cite Key="B06"/>, <Cite Key="BM06"/>, and <Cite
+  Key="B12"/> .  The &edge-addition-planarity-suite; is an open-source
+  implementation of the edge addition planar graph embedding algorithm and
+  related algorithms by John M. Boyer. See Section <Ref Sect="Planarity"/> for
+  more details.
+  <P/>
+
   From version 1.0.0 of this package, digraphs can be either mutable or immutable.
   Mutable digraphs can be changed in-place by many of the methods in the
   package, which avoids unnecessary copying. Immutable digraphs cannot be

doc/z-chap5.xml

@@ -42,7 +42,7 @@
     <#Include Label="IsCycleDigraph">
   </Section>
 
-  <Section><Heading>Planarity</Heading>
+  <Section Label="Planarity"><Heading>Planarity</Heading>
     <#Include Label="IsPlanarDigraph">
     <#Include Label="IsOuterPlanarDigraph">
   </Section>