JavaDoc and CalcGenerator-CalcMatrix advancement