search

latex3 / unicode-math

XeLaTeX/LuaLaTeX package for using unicode/OpenType maths fonts
http://ctan.org/pkg/unicode-math
LaTeX Project Public License v1.3c
246 stars 29 forks source link

Simplify subscript-peeking, avoid expl3 internals (fixes #395) #397

Closed blefloch closed 7 years ago

blefloch commented 7 years ago

unicode-math abused \__peek_true:w and other internals of expl3 rather than just copying their definitions. When I changed implementation details in l3token.dtx this broke. Now fixed by avoiding any use of internals (at least in the functions I changed).

As a separate change I made the property lists \g_@@_subs_prop and \g_@@_supers_prop's keys be simply the characters themselves rather than their meaning: this needlessly forbade characters whose catcode had been changed for whatever reason.

wspr commented 7 years ago

Oh dear, of course this was all my fault! This code comes from early expl3 days and I'd forgotten it was still using peeking internals :( I'm very sorry to have taken up your time with this — thank you for taking this on.

blefloch commented 7 years ago

No problem! :) Thanks for merging so quickly.

wspr commented 7 years ago

I just realised I hadn’t pushed last time I bumped the version, so this will turn out a bit ugly when I have to merge later. Too many things on the go at once I’m afraid. Thanks again.

blefloch commented 7 years ago

Anything I can do to help? E.g. rebasing the pull-request? (I'd rather not reverse the expl3 improvements.)

wspr commented 7 years ago

No worries — apologies my message was a bit cryptic; just merging the code now. I don't have a good merging tool on my laptop and always seem to mess it up :)

blefloch commented 7 years ago

Ok, thanks. I was worried this would be a blocker for updating to CTAN.

wspr commented 7 years ago

Nope, I’ll send an update tonight.