aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--book.json8
-rw-r--r--docs/0-Doc-Revisions.md1
-rw-r--r--docs/cover.jpgbin291058 -> 288980 bytes
-rw-r--r--docs/cover_small.jpgbin18659 -> 18332 bytes
-rwxr-xr-xgendocs.sh8
5 files changed, 10 insertions, 7 deletions
diff --git a/book.json b/book.json
index dee1ed5..24d4c22 100644
--- a/book.json
+++ b/book.json
@@ -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
index 8c2f9b9..01e492b 100644
--- a/docs/cover.jpg
+++ b/docs/cover.jpg
Binary files differ
diff --git a/docs/cover_small.jpg b/docs/cover_small.jpg
index 531dcfd..b89f699 100644
--- a/docs/cover_small.jpg
+++ b/docs/cover_small.jpg
Binary files differ
diff --git a/gendocs.sh b/gendocs.sh
index d3ff4f5..83c5b93 100755
--- a/gendocs.sh
+++ b/gendocs.sh
@@ -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