[1/2] tinkerpop git commit: Allow tabs in docs (replace them with 4 spaces prior pre-processing).

[dk...@apache.org]

Repository: tinkerpop
Updated Branches:
  refs/heads/hasStepFix 5e4d9dd89 -> 3623e82b9


Allow tabs in docs (replace them with 4 spaces prior pre-processing).


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7103394a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7103394a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7103394a

Branch: refs/heads/hasStepFix
Commit: 7103394a337339572e75ca7bfd66b14a25d9d60c
Parents: 5e4d9dd
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Sep 7 19:16:06 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Sep 7 19:16:06 2016 +0200

----------------------------------------------------------------------
 docs/preprocessor/preprocess-file.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7103394a/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index 9c9a095..1069928 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -131,7 +131,8 @@ if [ ! ${SKIP} ] && [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
     mv .ext/plugins.txt ext/
   fi
 
-  awk -f ${AWK_SCRIPTS}/prepare.awk ${input} |
+  sed 's/\t/    /g' ${input} |
+  awk -f ${AWK_SCRIPTS}/prepare.awk |
   awk -f ${AWK_SCRIPTS}/init-code-blocks.awk -v TP_HOME="${TP_HOME}" PYTHONPATH="." |
   awk -f ${AWK_SCRIPTS}/progressbar.awk -v tpl=${AWK_SCRIPTS}/progressbar.groovy.template |
   HADOOP_GREMLIN_LIBS="${CONSOLE_HOME}/ext/giraph-gremlin/lib:${CONSOLE_HOME}/ext/tinkergraph-gremlin/lib" bin/gremlin.sh |

[2/2] tinkerpop git commit: Simplified the pre-processor's prettify script.

[dk...@apache.org]

Simplified the pre-processor's prettify script.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3623e82b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3623e82b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3623e82b

Branch: refs/heads/hasStepFix
Commit: 3623e82b957586d8545af843385f5469b9e7ea43
Parents: 7103394
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Sep 7 23:54:50 2016 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Sep 7 23:54:50 2016 +0200

----------------------------------------------------------------------
 docs/preprocessor/awk/prettify.awk | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3623e82b/docs/preprocessor/awk/prettify.awk
----------------------------------------------------------------------
diff --git a/docs/preprocessor/awk/prettify.awk b/docs/preprocessor/awk/prettify.awk
index f115ec5..cbaa12f 100644
--- a/docs/preprocessor/awk/prettify.awk
+++ b/docs/preprocessor/awk/prettify.awk
@@ -21,14 +21,8 @@
 /^==>\/\/\/\/$/ { doPrint = 1 }
 
 {
-  lastLineStartedWithGremlin = lastLineStartedWithGremlin && inCodeSection
-  if (inCodeSection) {
-    if ($0 ~ /^gremlin> / && ($0 ~ /([.,({]|""")(\s*\/\/.*)?$/ || $0 ~ /^gremlin>  /)) {
-      if (lastLineStartedWithGremlin) gsub(/^gremlin> /, "         ")
-      lastLineStartedWithGremlin = 1
-    } else {
-      lastLineStartedWithGremlin = 0
-    }
+  if (inCodeSection && $0 ~ /^\.*[0-9]+> /) {
+    gsub(/^.{8}/, "        ")
   }
   if (doPrint) print
 }