patch 68440ec1e72b256a7d24dbf7bf90a3478231abe5
Author: "Karl O. Pinc" <kop@meme.com>
Date: Tue Aug 28 09:45:27 EDT 2018
* wwwdiff: Better formatting of cmp output
hunk ./www/html/programs/wwwdiff/index.php 278
- $line = current($result);
+ $line = substr(current($result), 5); // Skip over "cmp: "
patch a8caf91f39999fab61c781af108461b84bc8a91d
Author: "Karl O. Pinc" <kop@meme.com>
Date: Tue Aug 28 09:42:43 EDT 2018
* wwwdiff: Capture and report cmp stderr output
hunk ./www/html/programs/wwwdiff/index.php 245
- exec("$command $tmpa $tmpb", $result, $err);
+ $command = "$command $tmpa $tmpb";
+ if ($dtype == D_FILE) {
+ $command .= ' 2>&1';
+ }
+ exec($command, $result, $err);
patch feb75cb53019fb34333b2cff715bf96e9b5a3093
Author: "Karl O. Pinc" <kop@meme.com>
Date: Tue Aug 28 09:29:47 EDT 2018
* wwwdiff: Update from re to pcre for PHP 7
hunk ./www/html/programs/wwwdiff/index.php 2
-/* Copyright (C) 2012 The Meme Factory, Inc. http://www.meme.com/
+/* Copyright (C) 2012, 2018 The Meme Factory, Inc. http://www.meme.com/
hunk ./www/html/programs/wwwdiff/index.php 309
- $words = split('[[:space:]]'
- , htmlentities($line, ENT_QUOTES));
+ $words = preg_split('/[[:space:]]/'
+ , htmlentities($line, ENT_QUOTES));
patch dd27888a7743a1714eccf360249c094e9f810a61
Author: "Karl O. Pinc" <kop@meme.com>
Date: Sat Aug 25 13:44:35 EDT 2018
* Make xlink namespace work
hunk ./doc/fdlv13-db50_1.xml 23
-<appendix xml:id="fdl" xmlns="http://docbook.org/ns/docbook" version="5.0">
+<appendix xml:id="fdl" xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
hunk ./doc/gplv3-db50_1.xml 28
-<appendix xml:id="gpl" xmlns="http://docbook.org/ns/docbook" version="5.0">
+<appendix xml:id="gpl" xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
patch 08a18d5617f582ec4078c22dab077b3fa971d611
Author: "Karl O. Pinc" <kop@meme.com>
Date: Sat Aug 25 13:17:44 EDT 2018
* Use convert to make eps files, remove dependency on a2ping and sam2p
hunk ./doc/Makefile 215
- a2ping images/lion.png images/lion.eps
+ convert images/lion.png images/lion.eps
hunk ./doc/Makefile 218
- a2ping images/pointy.png images/pointy.eps
+ convert images/pointy.png images/pointy.eps
patch 4bc4ab7abe612dcbb9c0baa0b3572e6f15189772
Author: "Karl O. Pinc" <kop@meme.com>
Date: Sat Aug 25 13:16:27 EDT 2018
* Clean up the generated eps files
hunk ./doc/Makefile 29
- $(TRANSPARENT_PNG_TARGETS) $(EPS_TARGETS)
+ $(TRANSPARENT_PNG_TARGETS) $(EPS_TARGETS) \
+ $(PDF_IMAGES)
patch 81d18a593ec7a6dd2798ef61aa0b859318100310
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 22:31:28 EDT 2018
* db/test/run_test.sh: Adjust PGPORT used by server
hunk ./db/test/run_test.sh 36
-export PSQL="./psql --host /var/run/postgresql -p 5434"
+export PSQL="./psql --host /var/run/postgresql"
patch 7f5aee9e2e7d3543f5b7d0b700f8030671898fc4
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 22:27:45 EDT 2018
* db/INSTALL: Add parallel execution settings
hunk ./db/INSTALL 29
+#
+# Parallelism: As of PG 10 this does not really matter because we're
+# using serializable transactions by default.
+# Current box has 8 cpus.
+# Allow 4 workers per core: max_worker_processes=32
+# Use lots of parallelism, maxing out the cores
+# on any pararallel query: max_parallel_workers_per_gather=8
+# Allow 4 workers per core, per "user": max_parallel_workers=32
+
hunk ./db/INSTALL 49
+ -o max_worker_processes=32 \
+ -o max_parallel_workers_per_gather=8 \
+ -o max_parallel_workers=32 \
patch 5db77239908259b2142c6ea88150f179a6e572d2
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 20:51:45 EDT 2018
* bin/gombemi_postgres_backup_cron: Dump meta-information about the databases
hunk ./bin/gombemi_postgres_backup_cron 137
+# Backup the meta-information about the databases.
+secure_file $PGB_DATA_DIR/metadata.txt
+accessdb "psql -U $PG_ADMIN --echo-queries" > $PGB_DATA_DIR/metadata.txt <<EOF
+select pg_database.*
+ , pg_authid.rolname as owner
+ , pg_tablespace.spcname
+ from pg_database
+ join pg_authid
+ on (pg_authid.oid = pg_database.datdba)
+ join pg_tablespace
+ on (pg_tablespace.oid = pg_database.dattablespace)
+ order by pg_database.datname;
+
+select pg_tablespace.* pg_authid, rolname as owner
+ from pg_tablespace
+ join pg_authid on (pg_authid.oid = pg_tablespace.spcowner)
+ order by pg_tablespace.spcname;
+EOF
+if [ "$?" != "0" ] ; then
+ syslog crit 'CRITICAL Failed to backup metadata.txt (db metadata).'
+else
+ syslog debug 'Backed up roles.sql (users and groups).'
+fi
+
patch 56190cd0505ab2a78e264ea1c8c314a4509ebb04
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 20:51:18 EDT 2018
* bin/gombemi_postgres_backup_cron: Use rsync instead of cp to dereference symlinks
hunk ./bin/gombemi_postgres_backup_cron 119
- cp -Lrp $PG_DATA/$f $PGB_CONF_DIR
+ rsync -Lrpogt $PG_DATA/$f $PGB_CONF_DIR
patch 1f3795c62b3de72813adf4dc46b1163e74359033
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 20:50:28 EDT 2018
* bin/gombemi_postgres_backup_cron: Update copyright date
hunk ./bin/gombemi_postgres_backup_cron 4
-# Copyright (C) 2012 The Meme Factory, Inc., http://www.meme.com/
+# Copyright (C) 2012, 2015, 2018 The Meme Factory, Inc., http://www.meme.com/
patch 533c499e6f07d3639f15213a2316fd3efa55b08b
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 20:49:59 EDT 2018
* bin/gombemi_postgres_backup_cron: Update restore hints
hunk ./bin/gombemi_postgres_backup_cron 21
-# PG_DATA=/srv/etc/postgresql/9.1/gombemi
+# PG_DATA=/srv/root/var/lib/postgresql/10/gombemi
hunk ./bin/gombemi_postgres_backup_cron 26
-# # and pg 9.1.
+# # and pg 9.1. You are probably better off looking at db/INSTALL.
patch 09b6ac17594f587851b951de9485eb75612adcfc
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 20:48:41 EDT 2018
* bin/gombemi_postgres_backup_cron: Take path to config dir on command line
hunk ./bin/gombemi_postgres_backup_cron 9
-
+#
+# Syntax: gombemi_postgres_restore pg_config_path
+#
+# Args:
+# pg_config_path Path to the direcory containing the config directory
+# of the pg database cluster.
+# Something like '/etc/postgresql/10/gombemi'.
+#
hunk ./bin/gombemi_postgres_backup_cron 58
-PG_DATA=/usr/local/etc/postgresql/9.2/gombemi
hunk ./bin/gombemi_postgres_backup_cron 68
+# Parse command line
+PG_DATA="$1"
+
patch a94118972ecd21a8529f7b51823addaf0782de65
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 13:41:50 EDT 2018
* db/test/results/riq_bad_iqname: New output with newer (9.2<=10) PG
hunk ./db/test/results/riq_bad_iqname 7
+Additional diagnostic information: PL/pgSQL function run_integrity_queries(text) line 51 at RAISE
patch 657ac1310f3533d63c780b2bfdd3ba52b3079a2a
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 13:40:21 EDT 2018
* db/tests/results/:Remove context from output, it is no longer produced
hunk ./db/test/results/adoptions_ua_afterkid 10
-CONTEXT: SQL statement "update adoptions
- set adate = new_date
- where chimpid = 'KI2'"
-PL/pgSQL function inline_code_block line 12 at SQL statement
hunk ./db/test/results/adoptions_ua_afterparent 5
-CONTEXT: SQL statement "update adoptions
- set adate = new_date
- where aparent = 'MA3'"
-PL/pgSQL function inline_code_block line 12 at SQL statement
hunk ./db/test/results/adoptions_ua_toosoon 5
-CONTEXT: SQL statement "update adoptions
- set adate = new_date - 1
- where chimpid = 'KI2'"
-PL/pgSQL function inline_code_block line 12 at SQL statement
hunk ./db/test/results/fi_error 2
-CONTEXT: SQL statement "SELECT _error_immutable('Date')"
-PL/pgSQL function follow_intervals_update_func() line 26 at SQL statement
hunk ./db/test/results/followparts_uf_ktooold 3
-CONTEXT: SQL statement "update follows
- set date = this_date
- where followid = (select followparts.followid
- from followparts
- , followroles
- , follows as f
- where followparts.chimpid = 'FE6'
- and followroles.role = followparts.role
- and followroles.function <> 'M'
- and f.followid = followparts.followid
- order by f.date desc
- limit 1)"
-PL/pgSQL function inline_code_block line 12 at SQL statement
hunk ./db/test/results/groups_a_n_s_intervals_d 6
-CONTEXT: SQL statement "update intervals
- set gid = foo.gid
- from foo
- where intervals.followid = 4
- and intervals.time = foo.time"
-PL/pgSQL function inline_code_block line 14 at SQL statement
hunk ./db/test/results/groups_a_n_s_intervals_e 6
-CONTEXT: SQL statement "update intervals
- set gid = foo.gid
- from foo
- where intervals.followid = 2
- and intervals.time = foo.time"
-PL/pgSQL function inline_code_block line 14 at SQL statement
hunk ./db/test/results/riq_bad_squery 20
-CONTEXT: PL/pgSQL function run_integrity_queries() line 19 at RETURN QUERY
hunk ./db/test/results/swelling_nma_intervals 3
-CONTEXT: SQL statement "update intervals
- set gid = this_gid
- where intervals.gid is null
- and intervals.followid = 1"
-PL/pgSQL function inline_code_block line 21 at SQL statement
patch 09b93cc1f3dc91d6dbbd4f4a8c3552b725ab5151
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 13:39:20 EDT 2018
* db/test/test.mk: Improve comment
hunk ./db/test/test.mk 2002
-# Needs filter: pid, participant, part
+# Needs filter: pid (except pid is not displayed), participant, part
patch 338ec6cbbaa0da1eafae8134f33a1675f9bbba27
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 12:29:10 EDT 2018
* db/test/run.test.sh: Adjust port etc. for gombemi cluster connection
hunk ./db/test/run_test.sh 36
-export PSQL="./psql -p 5435"
+export PSQL="./psql --host /var/run/postgresql -p 5434"
patch 821045a6151c3cc44cd1f48be7902804eec45cbb
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 12:28:09 EDT 2018
* db/test/run.test.sh: Do not show error context (for pg 9.2<=10)
hunk ./db/test/run_test.sh 80
-# Capture the error stream.
-printf '\\pset estream query\n' | exec_sql
+# Initialize psql environment.
+# Capture the error stream, never show context for errors.
+printf '\\pset estream query\n\\set SHOW_CONTEXT never\n' | exec_sql
patch ba1d267e4f6d15e6a8862c5e2ceab005d25e2d53
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 12:26:52 EDT 2018
* db/test/run.test.sh: Line wrap to 78 chars
hunk ./db/test/run_test.sh 68
-#socat -u UNIX-RECV:$RUN_TEST_SOCK,mode=0600 EXEC:"'psql $psql_args'",stderr > $tfile &
-socat -u UNIX-RECV:$RUN_TEST_SOCK,mode=0600 EXEC:"'$PSQL $psql_args'" > $tfile &
+socat -u UNIX-RECV:$RUN_TEST_SOCK,mode=0600 \
+ EXEC:"'$PSQL $psql_args'" \
+ > $tfile &
patch 179daed1bd5d7c632eda2c2f41faf05932b26e6d
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Aug 15 12:26:37 EDT 2018
* db/test/run.test.sh: Update copyright date
hunk ./db/test/run_test.sh 1
-# Copyright (C) 2012 The Meme Factory, Inc. http://www.meme.com/
+# Copyright (C) 2012, 2018 The Meme Factory, Inc. http://www.meme.com/
patch 28d49d60af27d438e0d2404b1ca493a12531ad40
Author: "Karl O. Pinc" <kop@meme.com>
Date: Mon Aug 13 15:31:37 EDT 2018
* db/INSTALL: New file to explain cluster installation
addfile ./db/INSTALL
hunk ./db/INSTALL 1
+Cluster installation on Debian/Ubuntu as as follows:
+
+# For Ubuntu 16/fb-gombemi-dev-1:
+#
+# Note that after creating the cluster it would not hurt to add
+# the following comments into postgresql.conf as appropriate.
+#
+# Checksum because data integrity is very important
+# Likewise, the serializable transaction isolation level provides the
+# highest data integrity.
+# Use scram-sha-256 by default for passwords, although there's a lot of
+# md5 at present. (md5 in pg_hba.conf accepts scram-sha-256 also.)
+# Set work_mem fairly high because we don't anticipate a lot of concurrent
+# queries.
+# Likewise, there will be idle time. Set maintenance_work_mem high
+# and use more RAM during maintenance to finish quickly.
+# Set max_stack_depth high to allow for complexity. (The current max
+# seems to be 8M. This could be frobbed via pam_limits -- I think.)
+# Pretend effective_io_concurrency is 8, we don't really know.
+# Set effective_cache_size high and do more index scanning because we've
+# got 4G of ram.
+# Tables are not updated a lot so it's safe to collect fine-grained statistics
+# because we don't collect statistics often. We want good stats because
+# of all the table querying done.
+# Collect status on pl/pgsql functions with track_functions.
+# Current box has 4G of ram, use 40% for shared memory
+# (Docs recommend starting at 25% of ram and sharing up to 40%. Go
+# straight to 40%.)
+
+pg_createcluster -o password_encryption=scram-sha-256 \
+ -o default_transaction_isolation=serializable \
+ -o shared_buffers=1600MB \
+ -o work_mem=128MB \
+ -o maintenance_work_mem=200MB \
+ -o max_stack_depth=5MB \
+ -o effective_io_concurrency=8 \
+ -o effective_cache_size=800MB \
+ -o default_statistics_target=1000 \
+ -o track_functions=pl \
+ 10 gombemi -- \
+ --locale=C --encoding SQL_ASCII --auth peer --data-checksums
patch 1e02b166f96caac4ed8797756508ed9efd311ce0
Author: "Karl O. Pinc" <kop@meme.com>
Date: Mon Aug 13 15:29:12 EDT 2018
* db/views/views.xsl: Import namespaced docbook stylesheet
hunk ./db/views/views.xsl 6
- <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/> [_$_]
+ <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/xhtml/chunk.xsl"/> [_$_]
patch 2c0741458fc082a5b54b5382a95d99662042a211
Author: "Karl O. Pinc" <kop@meme.com>
Date: Mon Aug 13 15:03:11 EDT 2018
* db/makedatabases: It is easier to upgrade with PGPASSWORD unset
hunk ./db/makedatabases 2
-# Copyright (C) 2011, 2012, 2015 The Meme Factory, Inc., http://www.meme.com/
+# Copyright (C) 2011, 2012, 2015, 2018 The Meme Factory, Inc., http://www.meme.com/
hunk ./db/makedatabases 226
-export PGPASSWORD=foo
+#export PGPASSWORD=foo
patch 85195f3762937b4360f7524692d07f43be32da46
Author: "Karl O. Pinc" <kop@meme.com>
Date: Fri Aug 3 18:09:27 EDT 2018
* Docs: Use PUBLIC doctype instead of SYSTEM doctype for views
hunk ./doc/views/actor_actees.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/actor_actees.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/actor_actees_w_baboons.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/actor_actees_w_baboons.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/asocial_events.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/asocial_events.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/biography.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/biography.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/biography_upload.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/biography_upload.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/chimps.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/chimps.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/community_membership_upload.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/community_membership_upload.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/datasheet_events.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/datasheet_events.xml 10
-<!-- Copyright (C) 2013, 2014 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2013, 2014, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/datasheet_events.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/datasheets.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/datasheets.xml 10
-<!-- Copyright (C) 2013, 2014 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2013, 2014, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/datasheets.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/dists.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/dists.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/event_bout_aggs.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/event_bout_aggs.xml 10
-<!-- Copyright (C) 2014 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2014, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/event_bout_aggs.xml 13
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/event_bouts.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/event_bouts.xml 10
-<!-- Copyright (C) 2014 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2014, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/event_bouts.xml 13
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/family_dists.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/family_dists.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/family_events.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/family_events.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/focal_events.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/focal_events.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/focal_follows.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/focal_follows.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/focal_social_events.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/focal_social_events.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/follow_durations.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/follow_durations.xml 12
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/follow_intervals.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/follow_intervals.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/noobs.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/noobs.xml 13
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/social_bout_aggs.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/social_bout_aggs.xml 10
-<!-- Copyright (C) 2014 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2014, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/social_bout_aggs.xml 13
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/social_bouts.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/social_bouts.xml 10
-<!-- Copyright (C) 2014 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2014, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/social_bouts.xml 13
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/social_events.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/social_events.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/social_events_w_baboons.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/social_events_w_baboons.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
hunk ./doc/views/upload_behaviors.xml 2
-<!DOCTYPE para SYSTEM "/usr/share/xml/docbook/schema/dtd/5.0/docbook.dtd" [
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
+ "http://www.oasis-open.org/docbook/xml/5.0/dtd/docbook.dtd" [
hunk ./doc/views/upload_behaviors.xml 10
-<!-- Copyright (C) 2013 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2013, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/upload_behaviors.xml 14
-<!-- Shouldn't have to use a SYSTEM doctype -->
-<!--
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook V5.0//EN"
- "http://www.oasis-open.org/docbook/xml/5.0/docbook.dtd" [
- < ! - - Use symbols for repeating text. - - >
- <!ENTITY % entities SYSTEM "../entities">
- %entities;
- <!ENTITY % constants SYSTEM "../constants">
- %constants;
-]>
--->
-
patch 2f27930be70594b4aebb3bb80aee80d56c1e3139
Author: "Karl O. Pinc" <kop@meme.com>
Date: Fri Aug 3 17:49:57 EDT 2018
* Docs: Fix so view diagrams appear in pdf output
dblatex still produces "Image" errors in its output.
hunk ./doc/views/actor_actees.xml 9
-<!-- Copyright (C) 2013 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2013, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/actor_actees.xml 77
- fileref="diagrams/actor_actees.eps" format="EPS" />
+ fileref="/diagrams/actor_actees.eps" format="EPS" />
hunk ./doc/views/actor_actees_w_baboons.xml 127
- fileref="diagrams/actor_actees_w_baboons.eps" format="EPS" />
+ fileref="/diagrams/actor_actees_w_baboons.eps" format="EPS" />
hunk ./doc/views/asocial_events.xml 78
- fileref="diagrams/asocial_events.eps" format="EPS" />
+ fileref="/diagrams/asocial_events.eps" format="EPS" />
hunk ./doc/views/biography.xml 80
- fileref="diagrams/biography.eps" format="EPS" />
+ fileref="/diagrams/biography.eps" format="EPS" />
hunk ./doc/views/biography_upload.xml 81
- fileref="diagrams/biography_upload.eps" format="EPS" />
+ fileref="/diagrams/biography_upload.eps" format="EPS" />
hunk ./doc/views/chimps.xml 82
- fileref="diagrams/chimps.eps" format="EPS" />
+ fileref="/diagrams/chimps.eps" format="EPS" />
hunk ./doc/views/community_membership_upload.xml 64
- fileref="diagrams/community_membership_upload.eps" format="EPS" />
+ fileref="/diagrams/community_membership_upload.eps" format="EPS" />
hunk ./doc/views/dists.xml 72
- fileref="diagrams/dists.eps" format="EPS" />
+ fileref="/diagrams/dists.eps" format="EPS" />
hunk ./doc/views/family_dists.xml 163
- fileref="diagrams/family_dists.eps" format="EPS" />
+ fileref="/diagrams/family_dists.eps" format="EPS" />
hunk ./doc/views/family_events.xml 210
- fileref="diagrams/family_events.eps" format="EPS" />
+ fileref="/diagrams/family_events.eps" format="EPS" />
hunk ./doc/views/focal_events.xml 9
-<!-- Copyright (C) 2013 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2013, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/focal_events.xml 103
- fileref="diagrams/focal_events.eps" format="EPS" />
+ fileref="/diagrams/focal_events.eps" format="EPS" />
hunk ./doc/views/focal_follows.xml 125
- fileref="diagrams/focal_follows.eps" format="EPS" />
+ fileref="/diagrams/focal_follows.eps" format="EPS" />
hunk ./doc/views/focal_social_events.xml 9
-<!-- Copyright (C) 2013 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2013, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/focal_social_events.xml 85
- fileref="diagrams/focal_social_events.eps" format="EPS" />
+ fileref="/diagrams/focal_social_events.eps" format="EPS" />
hunk ./doc/views/follow_durations.xml 9
-<!-- Copyright (C) 2014 The Meme Factory, Inc. http://www.meme.com -->
+<!-- Copyright (C) 2014, 2018 The Meme Factory, Inc. http://www.meme.com -->
hunk ./doc/views/follow_durations.xml 75
- fileref="diagrams/follow_durations.eps" format="EPS" />
+ fileref="/diagrams/follow_durations.eps" format="EPS" />
hunk ./doc/views/follow_intervals.xml 9
-<!-- Copyright (C) 2013, 2014 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2013, 2014, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/follow_intervals.xml 81
- fileref="diagrams/follow_intervals.eps" format="EPS" />
+ fileref="/diagrams/follow_intervals.eps" format="EPS" />
hunk ./doc/views/noobs.xml 9
-<!-- Copyright (C) 2014 The Meme Factory, Inc. http://www.meme.com
+<!-- Copyright (C) 2014, 2018 The Meme Factory, Inc. http://www.meme.com
hunk ./doc/views/noobs.xml 79
- fileref="diagrams/noobs.eps" format="EPS" />
+ fileref="/diagrams/noobs.eps" format="EPS" />
hunk ./doc/views/social_events.xml 78
- fileref="diagrams/social_events.eps" format="EPS" />
+ fileref="/diagrams/social_events.eps" format="EPS" />
hunk ./doc/views/social_events_w_baboons.xml 148
- fileref="diagrams/social_events_w_baboons.eps" format="EPS" />
+ fileref="/diagrams/social_events_w_baboons.eps" format="EPS" />
patch 3a2dddd1380250240f5daf4f514c1117a4042c50
Author: "Karl O. Pinc" <kop@meme.com>
Date: Sat Nov 14 15:40:24 EST 2015
* Docs: gmi_pdf_paper_style.sty: Switch from Computer Mondern font to New Century Schoolbook.
hunk ./doc/gmi_pdf_paper_style.sty 25
+%% Change the font from Computer Modern to New Century Schoolbook
+%% See psnfss2e.pdf included with your tex distribution.
+\usepackage{newcent}
+\usepackage[T1]{fontenc}
+\usepackage{pxfonts}
+%% helvetica for sans-serif ?
+%%\usepackage[scaled=.50]{helvet}
+\linespread{1.06}
+
patch ce0c1e2fdb4cd18b8669302a25212830d4cedce9
Author: "Karl O. Pinc" <kop@meme.com>
Date: Sat Nov 14 12:29:43 EST 2015
* Docs: gombemi_system.xml: the warning system now exists.
hunk ./doc/gombemi_system.xml 638
+ <?dblatex list-presentation="table"?>
hunk ./doc/gombemi_system.xml 1212
- <para>Generated by the warning system that does not yet
- exist.</para>
+ <para>Generated by the warning system.</para>
patch 7fcbb683cddafc6a75150490be8b41ebbfae20de
Author: "Karl O. Pinc" <kop@meme.com>
Date: Wed Oct 28 23:52:45 EDT 2015
* Docs: gombemi_system.xml: Note that copyright notices can include a range of years.
hunk ./doc/gombemi_system.xml 258
+ <para>All declarations of copyright within the files of this
+ project may, in place of an explicit listing of all years for
+ which copyright is claimed, instead list a range of years in the
+ manner XXXX-YYYY to designate that copyright is claimed from
+ year XXXX through year YYYY, inclusive of both endpoints.</para>
+