Fix bug in #1731; add .xml.fr and .html.fr

In #1700, I tried to add samples for `.xml.fr` and `.html.fr`.  However, #1731 doesn't accommodate this, although that was probably the intent.

This tries to fix the bug.  New extensions and samples serve as test cases, but would also be nice to add.