there is no need to construct the filename: x is just the filename
remove some invisible multibyte characters introduced by #293 (presumably copied from PDF)
Merge pull request #308 from yihui/cosmetic

A few trivial changes