outline-calc-regexp rewritten - much more generic.