Refactoring for cleaner file structure.

manual/src/bin/resources/dot/dot-filter.conf

 
 [dot-filter-style]
-dot-style=template="dot-block",subs=(),posattrs=("style","target","colorset"),filter='dot.sh "target/classes/images/{target}" {colorset?{colorset}}'
+dot-style=template="dot-block",subs=(),posattrs=("style","target","colorset"),filter='dot.sh "src/bin/fonts" "target/classes/images/{target}" {colorset?{colorset}}'
 
 [blockdef-listing]
 template::[dot-filter-style]

manual/src/bin/resources/dot/dot.sh

@@ -3,7 +3,11 @@
 nodefontsize=10
 edgefontsize=$nodefontsize
 
-if [[ "$2" == "meta" ]]
+fontpath=$1
+targetimage=$2
+colorset=$3
+
+if [[ "$colorset" == "meta" ]]
 then
   nodefillcolor=slategray1
   nodehighlight=darkseagreen1
@@ -11,7 +15,7 @@ then
   edgehighlight=mediumblue
   boxcolor=black
   nodeshape=box
-elif [[ "$2" == "neoviz" ]]
+elif [[ "$colorset" == "neoviz" ]]
 then
   nodefillcolor=ivory1
   nodehighlight=khaki1
@@ -30,7 +34,7 @@ else
   nodeshape=box
 fi
 
-maxsize="graph [size=\"7.0,9.0\"]"
+graphsettings="graph [size=\"7.0,9.0\" fontpath=\"${fontpath}\"]"
 
 nodestyle=filled,rounded
 #nodeheight=0.37
@@ -40,11 +44,6 @@ textnode=shape=plaintext,style=diagonals,height=0.2,margin=0.0,0.0
 arrowhead=vee
 arrowsize=0.75
 
-graphfont=Sans
-nodefont=$graphfont
-edgefont=$graphfont
-
-
 indata=$(cat);
 indata=${indata//NODEHIGHLIGHT/$nodehighlight}
 indata=${indata//NODE2HIGHLIGHT/$nodehighlight2}
@@ -52,10 +51,15 @@ indata=${indata//EDGEHIGHLIGHT/$edgehighlight}
 indata=${indata//BOXCOLOR/$boxcolor}
 indata=${indata//TEXTNODE/$textnode}
 
-svgfile=$1
+svgfile=$targetimage
 pngfile="${svgfile}.png"
 
-prepend="digraph g{ $maxsize\
+graphfont="FreeSans"
+nodefont=$graphfont
+edgefont=$graphfont
+
+
+prepend="digraph g{ $graphsettings\
   node [shape=\"$nodeshape\" fillcolor=\"$nodefillcolor\" style=\"$nodestyle\" \
     fontsize=$nodefontsize fontname=\"$nodefont\"]
   edge [arrowhead=\"$arrowhead\" arrowtail=\"$arrowhead\" arrowsize=$arrowsize fontsize=$edgefontsize fontname=\"$edgefont\"] \

manual/src/main/resources/community/docs.txt

@@ -284,13 +284,17 @@ Common attributes you can use in documents:
 These can substitute part of URLs that point to for example APIdocs or source code.
 Note that neo4j-git-tag also handles the case of snapshot/master.
 
+Sample Asciidoc attributes which can be used:
+
+* \{docdir} - root directory of the documents
+* \{nbsp} - non-breaking space
+
 == Comments ==
 
 There's a separate build including comments.
 The comments show up with a yellow background.
-It's located at http://docs.neo4j.org/annotated/.
-You can also use this page to search for content, as the full manual is on a single page.
-CAUTION: This version isn't intended for users in general, as the Disqus feature isn't available there.
+This build doesn't run by default, but after a normal build, you can use `make annotated` to build it.
+You can also use the resulting page to search for content, as the full manual is on a single page.
 
 Here's how to write a comment:
 

manual/src/main/resources/community/index.txt

+[[community]]
+Community
+=========
+
+[partintro]
+--
+The Neo4j project has a strong community around it.
+Read about how to get help from the community and how to contribute to it.
+--
 
 :leveloffset: 1
 
@@ -8,4 +17,3 @@ include::help.txt[]
 include::contributing.txt[]
 
 
-

manual/src/main/resources/introduction/index.txt

+[[introduction]]
+Introduction
+============
+
+[partintro]
+--
+This part gives a bird's eye view of what a graph database is, and then outlines some specifics of Neo4j.
+--
 
 :leveloffset: 1
 

manual/src/main/resources/neo4j-manual.txt

@@ -11,66 +11,11 @@ include::preface/preface.txt[]
 
 :leveloffset: 0
 
-[[introduction]]
-Introduction
-============
-
-[partintro]
---
-This part gives a bird's eye view of what a graph database is, and then outlines some specifics of Neo4j.
---
-
-:leveloffset: 1
-
 include::introduction/index.txt[]
 
 :leveloffset: 0
 
-[[tutorials]]
-Tutorials
-=========
-
-[partintro]
---
-The tutorial part describes how to set up your environment, and write programs using Neo4j.
-It takes you from Hello World to advanced usage of graphs.
---
-
-:leveloffset: 1
-
-include::{importdir}/neo4j-examples-docs-jar/dev/index.txt[]
-
-:leveloffset: 1
-
-include::{importdir}/neo4j-python-embedded-docs-jar/dev/tutorial/index.txt[]
-
-:leveloffset: 1
-
-include::{importdir}/neo4j-server-examples-docs-jar/dev/index.txt[]
-
-:leveloffset: 1
-
-include::{importdir}/neo4j-examples-docs-jar/dev/domain-modeling.txt[]
-
-:leveloffset: 1
-
-[[tutorials-rest]]
-Using the Neo4j REST API
-========================
-
-The included Java example shows a ``low-level'' approach to using the Neo4j REST API from Java.
-For other options, see below.
-
-include::community/rest-clients.txt[]
-
-
-:leveloffset: 2
-
-include::{importdir}/neo4j-server-examples-docs-jar/dev/server-java-rest-client.txt[]
-
-:leveloffset: 1
-
-include::{importdir}/neo4j-examples-docs-jar/dev/traversal-framework.txt[]
+include::tutorials/index.txt[]
 
 :leveloffset: 0
 
@@ -78,49 +23,14 @@ include::reference/index.txt[]
 
 :leveloffset: 0
 
-[[operations]]
-Operations
-==========
-
-[partintro]
---
-This part describes how to maintain a Neo4j installation.
-This includes topics such as backing up the database and monitoring the health of the database as well as diagnosing issues.
---
-
-:leveloffset: 1
-
 include::operations/index.txt[]
 
 :leveloffset: 0
 
-[[tools]]
-Tools
-=====
-
-[partintro]
---
-The Tools part describes available Neo4j tools and how to use them.
---
-
-:leveloffset: 1
-
 include::tools/index.txt[]
 
 :leveloffset: 0
 
-[[community]]
-Community
-=========
-
-[partintro]
---
-The Neo4j project has a strong community around it.
-Read about how to get help from the community and how to contribute to it.
---
-
-:leveloffset: 1
-
 include::community/index.txt[]
 
 :leveloffset: 0

manual/src/main/resources/operations/index.txt

+[[operations]]
+Operations
+==========
+
+[partintro]
+--
+This part describes how to maintain a Neo4j installation.
+This includes topics such as backing up the database and monitoring the health of the database as well as diagnosing issues.
+--
 
 :leveloffset: 1
 

manual/src/main/resources/tools/index.txt

+[[tools]]
+Tools
+=====
+
+[partintro]
+--
+The Tools part describes available Neo4j tools and how to use them.
+--
+
+:leveloffset: 1
 
 include::webadmin.txt[]
 

manual/src/main/resources/tutorials/index.txt

+[[tutorials]]
+Tutorials
+=========
+
+[partintro]
+--
+The tutorial part describes how to set up your environment, and write programs using Neo4j.
+It takes you from Hello World to advanced usage of graphs.
+--
+
+:leveloffset: 1
+
+include::{importdir}/neo4j-examples-docs-jar/dev/index.txt[]
+
+:leveloffset: 1
+
+include::{importdir}/neo4j-python-embedded-docs-jar/dev/tutorial/index.txt[]
+
+:leveloffset: 1
+
+include::{importdir}/neo4j-server-examples-docs-jar/dev/index.txt[]
+
+:leveloffset: 1
+
+include::{importdir}/neo4j-examples-docs-jar/dev/domain-modeling.txt[]
+
+:leveloffset: 1
+
+[[tutorials-rest]]
+Using the Neo4j REST API
+========================
+
+The included Java example shows a ``low-level'' approach to using the Neo4j REST API from Java.
+For other options, see below.
+
+include::{docdir}/community/rest-clients.txt[]
+
+:leveloffset: 2
+
+include::{importdir}/neo4j-server-examples-docs-jar/dev/server-java-rest-client.txt[]
+
+:leveloffset: 1
+
+include::{importdir}/neo4j-examples-docs-jar/dev/traversal-framework.txt[]
+