Extend doc2

I will have to check if this still works with tikz 3.0, so I gues it will be best to wait with merging.