cpplearner
diff --git a/‎images/generate.sh‎
Lines changed: 14 additions & 8 deletions b/‎images/generate.sh‎
Lines changed: 14 additions & 8 deletions
diff --git a/‎images/settings-dot‎ ‎images/inheritance/settings-dot‎images/settings-dot renamed to images/inheritance/settings-dot b/‎images/settings-dot‎ ‎images/inheritance/settings-dot‎images/settings-dot renamed to images/inheritance/settings-dot
diff --git a/‎images/std-bad_alloc-inheritance.dot‎ ‎…nheritance/std-bad_alloc-inheritance.dot‎images/std-bad_alloc-inheritance.dot renamed to images/inheritance/std-bad_alloc-inheritance.dot b/‎images/std-bad_alloc-inheritance.dot‎ ‎…nheritance/std-bad_alloc-inheritance.dot‎images/std-bad_alloc-inheritance.dot renamed to images/inheritance/std-bad_alloc-inheritance.dot
diff --git a/‎…std-bad_array_new_length-inheritance.dot‎ ‎…std-bad_array_new_length-inheritance.dot‎images/std-bad_array_new_length-inheritance.dot renamed to images/inheritance/std-bad_array_new_length-inheritance.dot b/‎…std-bad_array_new_length-inheritance.dot‎ ‎…std-bad_array_new_length-inheritance.dot‎images/std-bad_array_new_length-inheritance.dot renamed to images/inheritance/std-bad_array_new_length-inheritance.dot
diff --git a/‎images/std-bad_cast-inheritance.dot‎ ‎…inheritance/std-bad_cast-inheritance.dot‎images/std-bad_cast-inheritance.dot renamed to images/inheritance/std-bad_cast-inheritance.dot b/‎images/std-bad_cast-inheritance.dot‎ ‎…inheritance/std-bad_cast-inheritance.dot‎images/std-bad_cast-inheritance.dot renamed to images/inheritance/std-bad_cast-inheritance.dot
diff --git a/‎images/std-bad_exception-inheritance.dot‎ ‎…itance/std-bad_exception-inheritance.dot‎images/std-bad_exception-inheritance.dot renamed to images/inheritance/std-bad_exception-inheritance.dot b/‎images/std-bad_exception-inheritance.dot‎ ‎…itance/std-bad_exception-inheritance.dot‎images/std-bad_exception-inheritance.dot renamed to images/inheritance/std-bad_exception-inheritance.dot
diff --git a/‎images/std-bad_typeid-inheritance.dot‎ ‎…heritance/std-bad_typeid-inheritance.dot‎images/std-bad_typeid-inheritance.dot renamed to images/inheritance/std-bad_typeid-inheritance.dot b/‎images/std-bad_typeid-inheritance.dot‎ ‎…heritance/std-bad_typeid-inheritance.dot‎images/std-bad_typeid-inheritance.dot renamed to images/inheritance/std-bad_typeid-inheritance.dot
diff --git a/‎images/std-bad_weak_ptr-inheritance.dot‎ ‎…ritance/std-bad_weak_ptr-inheritance.dot‎images/std-bad_weak_ptr-inheritance.dot renamed to images/inheritance/std-bad_weak_ptr-inheritance.dot b/‎images/std-bad_weak_ptr-inheritance.dot‎ ‎…ritance/std-bad_weak_ptr-inheritance.dot‎images/std-bad_weak_ptr-inheritance.dot renamed to images/inheritance/std-bad_weak_ptr-inheritance.dot
diff --git a/‎images/std-basic_fstream-inheritance.dot‎ ‎…itance/std-basic_fstream-inheritance.dot‎images/std-basic_fstream-inheritance.dot renamed to images/inheritance/std-basic_fstream-inheritance.dot b/‎images/std-basic_fstream-inheritance.dot‎ ‎…itance/std-basic_fstream-inheritance.dot‎images/std-basic_fstream-inheritance.dot renamed to images/inheritance/std-basic_fstream-inheritance.dot
diff --git a/‎images/std-basic_ifstream-inheritance.dot‎ ‎…tance/std-basic_ifstream-inheritance.dot‎images/std-basic_ifstream-inheritance.dot renamed to images/inheritance/std-basic_ifstream-inheritance.dot b/‎images/std-basic_ifstream-inheritance.dot‎ ‎…tance/std-basic_ifstream-inheritance.dot‎images/std-basic_ifstream-inheritance.dot renamed to images/inheritance/std-basic_ifstream-inheritance.dot
@@ -17,22 +17,28 @@
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
 mkdir -p "output"
+mkdir -p "output/inheritance"
 
-for i in $(find -iname "*.dot")
+for i in $(find inheritance -iname "*.dot")
 do
+
+    o=${i#*/}
+
+    outdir="output/inheritance/"
     infile="$i"
-    outfile="output/$i.svg"
-    mapfile="output/$i.map"
-    wikimapfile="output/$i.wikimap"
-    tmpsvgfile="output/$i.tmpsvg"
-    tmpdotfile="output/$i.tmpdot"
+    setfile="inheritance/settings-dot"
+    outfile="$outdir/$o.svg"
+    mapfile="$outdir/$o.map"
+    wikimapfile="$outdir/$o.wikimap"
+    tmpsvgfile="$outdir/$o.tmpsvg"
+    tmpdotfile="$outdir/$o.tmpdot"
 
-    python preprocess.py $infile $tmpdotfile
+    python preprocess.py $infile $setfile $tmpdotfile
     dot -Tsvg -o$tmpsvgfile $tmpdotfile
     xsltproc --novalid fix_svg-dot.xsl $tmpsvgfile > $outfile
     dot -Timap $tmpdotfile | sed 1d | awk '{sub(/,/, " ", $3); sub(/,/, " ", $4); print $1" "$3" "$4" [["$2"]]"; };' > $mapfile
 
-    wikiimage=$(echo $i | sed 's/\.\///' | sed 's/\.dot//')
+    wikiimage=$(echo $o | sed 's/\.\///' | sed 's/\.dot//')
     echo "{{inheritance diagram|image=$wikiimage.svg|notes={{{notes|}}}|map=" > $wikimapfile
     cat $mapfile >> $wikimapfile
     echo "}}" >> $wikimapfile