diff options
| -rw-r--r-- | Changelog | 7 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | NOTICE | 2 | ||||
| -rwxr-xr-x | bin/BBlog | 13 | ||||
| -rw-r--r-- | man/man1/BBlog.1 | 6 | ||||
| -rw-r--r-- | man/man7/BBlog-sqlite.7 | 4 |
6 files changed, 24 insertions, 10 deletions
@@ -1,3 +1,10 @@ +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 @@ -1,4 +1,4 @@ -## Copyright Ian Jauslin 2015-2018 +## Copyright Ian Jauslin 2015-2019 ## ## 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-2018 +Copyright Ian Jauslin 2015-2019 @@ -1,6 +1,6 @@ #!/bin/bash -## Copyright Ian Jauslin 2015-2018 +## Copyright Ian Jauslin 2015-2019 ## ## Licensed under the Apache License, Version 2.0 (the "License"); ## you may not use this file except in compliance with the License. @@ -15,10 +15,10 @@ ## limitations under the License. # directory containing the engine files -enginedir= +enginedir=/home/ian/Programs/BBlog2/src/engines # version -version=2.1.2 +version=2.1.3 function print_config { echo "engine: $engine" @@ -227,10 +227,17 @@ function replace_format { else replacement=$(eval "echo \$$field") fi + + # escape '%' in replacement + replacement="${replacement//\%/::iansays:percent::}" + out="${out//\%$command\%/$replacement}" done + # un-escape '%' in replacement + out="${out//::iansays:percent::/\%}" + # finish replacing newlines out="${out//\\n/%}" out=$(echo "$out" | tr "%" "\n") diff --git a/man/man1/BBlog.1 b/man/man1/BBlog.1 index 15f27c8..a37b75d 100644 --- a/man/man1/BBlog.1 +++ b/man/man1/BBlog.1 @@ -1,5 +1,5 @@ -.Dd $Mdocdate: June 29 2018 $ -.Dt BBLOG 2.1.2 +.Dd $Mdocdate: November 5 2019 $ +.Dt BBLOG 2.1.3 .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-2018 +copyright Ian Jauslin 2015-2019 .Sh SEE ALSO .Sx BBlog-sqlite Ns (7) diff --git a/man/man7/BBlog-sqlite.7 b/man/man7/BBlog-sqlite.7 index a099fcd..8423b2e 100644 --- a/man/man7/BBlog-sqlite.7 +++ b/man/man7/BBlog-sqlite.7 @@ -1,4 +1,4 @@ -.Dd $Mdocdate: June 29 2018 $ +.Dd $Mdocdate: Novermber 5 2019 $ .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-2018 +copyright Ian Jauslin 2015-2019 .Sh SEE ALSO .Sx BBlog Ns (1) , .Sx sqlite3 Ns (1) |