it looks to me as if magic hardcodes the symbols from the ISO calendar. which works as long as ISO is the default calendar.
magic should probably be reduced to what it needs to be. and _indices as well as the check check for magic[what] should be changed to handle magic+indices(defcal)
on further thought, it seems that magic is not needed at all.
shall i just make the changes in cvs for you to look at and revert or improve upon, or do you prefer to come to an agreement through discussion first?
greetings, martin.