2 Commits

Author SHA1 Message Date
9eafbe43eb Update to v2.1.3:
Fixed: entries that contain a '%' do not cause a failure.

  New: access 'bibtex' entry in sqlite databases
2019-11-05 18:40:15 -05:00
4a8e51c3c9 Update to v2.1.2:
Fixed: 'extra' entries would override database entries if they shared the
         same token
2018-06-29 16:39:15 +00:00
7 changed files with 30 additions and 12 deletions

12
Changelog Normal file
View File

@ -0,0 +1,12 @@
2.1.3:
* Fixed: entries that contain a '%' do not cause a failure.
* New: access 'bibtex' entry in sqlite databases
2.1.2:
* Fixed: 'extra' entries would override database entries if they shared the
same token

View File

@ -1,4 +1,4 @@
## Copyright Ian Jauslin 2015-2017 ## Copyright Ian Jauslin 2015-2019
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.

2
NOTICE
View File

@ -1,2 +1,2 @@
BBlog BBlog
Copyright Ian Jauslin 2015-2017 Copyright Ian Jauslin 2015-2019

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
## Copyright Ian Jauslin 2015-2017 ## Copyright Ian Jauslin 2015-2019
## ##
## Licensed under the Apache License, Version 2.0 (the "License"); ## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License. ## you may not use this file except in compliance with the License.
@ -15,11 +15,10 @@
## limitations under the License. ## limitations under the License.
# directory containing the engine files # directory containing the engine files
enginedir=/usr/share/BBlog/engines enginedir=/home/ian/Programs/BBlog2/src/engines
enginedir=/home/ian/Programs/BBlog2/engines
# version # version
version=2.1 version=2.1.3
function print_config { function print_config {
echo "engine: $engine" echo "engine: $engine"
@ -229,9 +228,16 @@ function replace_format {
replacement=$(eval "echo \$$field") replacement=$(eval "echo \$$field")
fi fi
# escape '%' in replacement
replacement="${replacement//\%/::iansays:percent::}"
out="${out//\%$command\%/$replacement}" out="${out//\%$command\%/$replacement}"
done done
# un-escape '%' in replacement
out="${out//::iansays:percent::/\%}"
# finish replacing newlines # finish replacing newlines
out="${out//\\n/%}" out="${out//\\n/%}"
out=$(echo "$out" | tr "%" "\n") out=$(echo "$out" | tr "%" "\n")

View File

@ -36,7 +36,7 @@ function generate_SQL_alpha {
foundit=0 foundit=0
if [ ${#extra} -gt 0 ]; then if [ ${#extra} -gt 0 ]; then
for entry in "${extra[@]}"; do for entry in "${extra[@]}"; do
ref="${entry#*:*:}" ref="${entry#*:}"
ref="${ref%%:*}" ref="${ref%%:*}"
if [ "$ref" = "$citeref" ]; then if [ "$ref" = "$citeref" ]; then
foundit=1 foundit=1

View File

@ -1,5 +1,5 @@
.Dd $Mdocdate: May 2 2017 $ .Dd $Mdocdate: November 5 2019 $
.Dt BBLOG 2.1 .Dt BBLOG 2.1.3
.Os .Os
.Sh NAME .Sh NAME
.Nm BBlog .Nm BBlog
@ -194,6 +194,6 @@ automatically adds a letter (from 'b' to 'z') at the end of non-unique tokens, i
.Nm .Nm
was written by Ian Jauslin. was written by Ian Jauslin.
.Sh COPYRIGHT .Sh COPYRIGHT
copyright Ian Jauslin 2015-2017 copyright Ian Jauslin 2015-2019
.Sh SEE ALSO .Sh SEE ALSO
.Sx BBlog-sqlite Ns (7) .Sx BBlog-sqlite Ns (7)

View File

@ -1,4 +1,4 @@
.Dd $Mdocdate: May 2 2017 $ .Dd $Mdocdate: Novermber 5 2019 $
.Dt BBLOG-sqlite .Dt BBLOG-sqlite
.Os .Os
.Sh DESCRIPTION .Sh DESCRIPTION
@ -32,7 +32,7 @@ label of the reference
.Sh AUTHORS .Sh AUTHORS
The sqlite BBlog engine was written by Ian Jauslin. The sqlite BBlog engine was written by Ian Jauslin.
.Sh COPYRIGHT .Sh COPYRIGHT
copyright Ian Jauslin 2015-2017 copyright Ian Jauslin 2015-2019
.Sh SEE ALSO .Sh SEE ALSO
.Sx BBlog Ns (1) , .Sx BBlog Ns (1) ,
.Sx sqlite3 Ns (1) .Sx sqlite3 Ns (1)