Merge branch 'master' into reledmac_endnote

diff --cc TeX.gitignore
index f8b23151ba4dca7a1d5ff9c1e04a44e548c770e9,7bd0aa00c3a31480d92b3b96a4383bafd2fd8bde..8c9d916fc02dfed17d5a4d2b08752b3a0dd2d3e6
--- 1/TeX.gitignore
--- 2/TeX.gitignore
+++ b/TeX.gitignore
@@@ -49,8 -48,11 +48,12 @@@ acs-*.bi
  *.snm
  *.vrb
  
 -#(e)ledmac/(e)ledpar
+ # cprotect
+ *.cpt
+ 
 +#(r)(e)ledmac/(r)(e)ledpar
+ *.end
 +*.?end
  *.[1-9]
  *.[1-9][0-9]
  *.[1-9][0-9][0-9]