Refactoring.
Merge branch 'latex_doc_felix'