diff options
author | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-10-19 10:03:59 +0200 |
---|---|---|
committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-10-19 10:03:59 +0200 |
commit | 84641197edb9df3292c2b86d02f9dee898ae05c3 (patch) | |
tree | 7176646b57c3a3ea5ffd97e163431ec9ebfff804 | |
parent | a18116240fd36dfc173d8bd0274487b635b54f23 (diff) |
Bump to v0.2
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r-- | book.json | 8 | ||||
-rw-r--r-- | docs/0-Doc-Revisions.md | 1 | ||||
-rw-r--r-- | docs/cover.jpg | bin | 291058 -> 288980 bytes | |||
-rw-r--r-- | docs/cover_small.jpg | bin | 18659 -> 18332 bytes | |||
-rwxr-xr-x | gendocs.sh | 8 |
5 files changed, 10 insertions, 7 deletions
@@ -5,8 +5,8 @@ "keywords": "AGL, XDS, cross, Development, Iotbzh", "author": "Sebastien Douheret", "website": "http://iot.bzh", - "published": "September 2017", - "version": "0.1", + "published": "October 2017", + "version": "0.2", "gitbook": "3.2.2", "root": "docs", @@ -93,9 +93,9 @@ } }, { - "pattern": "<img ([^>]*)> {0,}{:: {0,}style=([^}]*)}", + "pattern": "<img ([^>]*)> {0,}{style {1,}([^}]*)}", "flags": "g", - "substitute": "<img $1 style=$2>", + "substitute": "<img $1 style=\"$2\">", "decode": true } ] diff --git a/docs/0-Doc-Revisions.md b/docs/0-Doc-Revisions.md index 44aac8b..f36b344 100644 --- a/docs/0-Doc-Revisions.md +++ b/docs/0-Doc-Revisions.md @@ -4,3 +4,4 @@ Document revisions | Date | Version | Designation | Author | |-------------|---------|--------------------------------------|-------------------------| | Sept 2017 | 0.1 | Initial release | S. Douheret [ Iot.bzh ] | +| Oct 2017 | 0.2 | Various update to match new behavior | S. Douheret [ Iot.bzh ] | diff --git a/docs/cover.jpg b/docs/cover.jpg Binary files differindex 8c2f9b9..01e492b 100644 --- a/docs/cover.jpg +++ b/docs/cover.jpg diff --git a/docs/cover_small.jpg b/docs/cover_small.jpg Binary files differindex 531dcfd..b89f699 100644 --- a/docs/cover_small.jpg +++ b/docs/cover_small.jpg @@ -4,6 +4,10 @@ OUTFILENAME="XDS_UsersGuide" SCRIPT=$(basename $BASH_SOURCE) +VERSION=$(grep '"version":' $(dirname $BASH_SOURCE)/book.json | cut -d'"' -f 4) +[ "$VERSION" != "" ] && OUTFILENAME="${OUTFILENAME}_v${VERSION}" + + function usage() { cat <<EOF >&2 Usage: $SCRIPT [options] [pdf|serve|doxygen] @@ -47,7 +51,6 @@ while [ $# -gt 0 ]; do shift done - cd $(dirname $0) ROOTDIR=`pwd -P` @@ -66,8 +69,7 @@ if [ "$DO_ACTION" = "pdf" -o "$DO_ACTION" = "serve" ]; then # Update cover when book.json has been changed [[ $ROOTDIR/book.json -nt $ROOTDIR/docs/cover.jpg ]] && { echo "Update cover files"; $ROOTDIR/docs/resources/make_cover.sh || exit 1; } - VERSION="_v$(grep '"version":' $ROOTDIR/book.json | cut -d'"' -f 4)" - OUTFILE=$OUT_DIR/$OUTFILENAME$VERSION.pdf + OUTFILE=$OUT_DIR/$OUTFILENAME.pdf $DRY $GITBOOK pdf $ROOTDIR $OUTFILE $DEBUG_FLAG $ARGS [ "$?" = "0" ] && echo "PDF has been successfully generated in $OUTFILE" else |