diff options
| -rw-r--r-- | Changelog | 5 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | NOTICE | 2 | ||||
| -rwxr-xr-x | bin/BBlog | 7 | ||||
| -rw-r--r-- | engines/sqlite.sh | 2 | ||||
| -rw-r--r-- | man/man1/BBlog.1 | 6 | ||||
| -rw-r--r-- | man/man7/BBlog-sqlite.7 | 4 |
7 files changed, 16 insertions, 12 deletions
diff --git a/Changelog b/Changelog new file mode 100644 index 0000000..098770f --- /dev/null +++ b/Changelog @@ -0,0 +1,5 @@ +2.1.2: + + * Fixed: 'extra' entries would override database entries if they shared the + same token + @@ -1,4 +1,4 @@ -## Copyright Ian Jauslin 2015-2017 +## Copyright Ian Jauslin 2015-2018 ## ## Licensed under the Apache License, Version 2.0 (the "License"); ## you may not use this file except in compliance with the License. @@ -1,2 +1,2 @@ BBlog -Copyright Ian Jauslin 2015-2017 +Copyright Ian Jauslin 2015-2018 @@ -1,6 +1,6 @@ #!/bin/bash -## Copyright Ian Jauslin 2015-2017 +## Copyright Ian Jauslin 2015-2018 ## ## Licensed under the Apache License, Version 2.0 (the "License"); ## you may not use this file except in compliance with the License. @@ -15,11 +15,10 @@ ## limitations under the License. # directory containing the engine files -enginedir=/usr/share/BBlog/engines -enginedir=/home/ian/Programs/BBlog2/engines +enginedir= # version -version=2.1 +version=2.1.2 function print_config { echo "engine: $engine" diff --git a/engines/sqlite.sh b/engines/sqlite.sh index c14f30c..af7afdd 100644 --- a/engines/sqlite.sh +++ b/engines/sqlite.sh @@ -36,7 +36,7 @@ function generate_SQL_alpha { foundit=0 if [ ${#extra} -gt 0 ]; then for entry in "${extra[@]}"; do - ref="${entry#*:*:}" + ref="${entry#*:}" ref="${ref%%:*}" if [ "$ref" = "$citeref" ]; then foundit=1 diff --git a/man/man1/BBlog.1 b/man/man1/BBlog.1 index 9d3584b..15f27c8 100644 --- a/man/man1/BBlog.1 +++ b/man/man1/BBlog.1 @@ -1,5 +1,5 @@ -.Dd $Mdocdate: May 2 2017 $ -.Dt BBLOG 2.1 +.Dd $Mdocdate: June 29 2018 $ +.Dt BBLOG 2.1.2 .Os .Sh NAME .Nm BBlog @@ -194,6 +194,6 @@ automatically adds a letter (from 'b' to 'z') at the end of non-unique tokens, i .Nm was written by Ian Jauslin. .Sh COPYRIGHT -copyright Ian Jauslin 2015-2017 +copyright Ian Jauslin 2015-2018 .Sh SEE ALSO .Sx BBlog-sqlite Ns (7) diff --git a/man/man7/BBlog-sqlite.7 b/man/man7/BBlog-sqlite.7 index 68e77cf..a099fcd 100644 --- a/man/man7/BBlog-sqlite.7 +++ b/man/man7/BBlog-sqlite.7 @@ -1,4 +1,4 @@ -.Dd $Mdocdate: May 2 2017 $ +.Dd $Mdocdate: June 29 2018 $ .Dt BBLOG-sqlite .Os .Sh DESCRIPTION @@ -32,7 +32,7 @@ label of the reference .Sh AUTHORS The sqlite BBlog engine was written by Ian Jauslin. .Sh COPYRIGHT -copyright Ian Jauslin 2015-2017 +copyright Ian Jauslin 2015-2018 .Sh SEE ALSO .Sx BBlog Ns (1) , .Sx sqlite3 Ns (1) |