Fix glyph selection for CID fonts that don't actually have CID font files.
Merge pull request #3187 from brendandahl/cid-glyph-selection

Fix glyph selection for CID fonts that don't actually have CID font files.