- is >> tmp.name >> tmp.inset;
- if (isFontName(tmp.inset))
- is >> charid >> fallbackid >> tmp.extra >> tmp.xmlname;
- else
+ docstring help;
+ is >> tmp.name >> help;
+ tmp.inset = to_ascii(help);
+ if (isFontName(tmp.inset)) {
+ is >> help >> fallbackid >> tmp.extra >> tmp.htmlname >> tmp.xmlname;
+ docstring cid, dsp_cid;
+ idocstringstream is2(subst(help, '|', ' '));
+ is2 >> charid >> dsp_charid;
+ } else