Add dokiel->hdoc, change add bibtex->optim, change regex