diff --git a/README b/README index 7c0da1e..cd43882 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ ThingDoc is a clever things comment parser. -It uses syntax similar to Javadoc and is able to generate: +It uses syntax similar to Javadoc and is able to generate from .tdoc and .scad files (output in docs folder): * BoM text file * HTML documentation diff --git a/requirements.txt b/requirements.txt index 97b683e..a897dab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -Jinja>=1.2 +Jinja2>=2.7 diff --git a/sample.tdoc b/sample.tdoc new file mode 100644 index 0000000..67346f4 --- /dev/null +++ b/sample.tdoc @@ -0,0 +1,31 @@ +/** + * Printer + * + * @root + * @id RepRap + * @name RepRap + * @using 2 frame + * @using 1 x-axis + * @step Make sure you have [frame] ready. + * @step Second you make the [x-axis]. + */ + +/** + * Printer base + * + * @id frame + * @name frame + * @assembled + * @step Do the side triangles. + * @step Connect triangles into frame. + */ + +/** + * x axis + * + * @id x-axis + * @name x-axis + * @step Prepare x-end-motor + * @step Prepare x-end-idler + * @step Put both together with rods. + */ diff --git a/thingdoc/data/facebox.js b/thingdoc/data/facebox.js index a5b626a..c929ea8 100755 --- a/thingdoc/data/facebox.js +++ b/thingdoc/data/facebox.js @@ -85,8 +85,8 @@ settings: { opacity : 0.2, overlay : false, - loadingImage : '/facebox/loading.gif', - closeImage : '/facebox/closelabel.png', + loadingImage : 'html_data/facebox/loading.gif', + closeImage : 'html_data/facebox/closelabel.png', imageTypes : [ 'png', 'jpg', 'jpeg', 'gif' ], faceboxHtml : '\