--- loncom/html/adm/jsMath/jsMath-fallback-mac.js 2005/02/25 04:57:49 1.1 +++ loncom/html/adm/jsMath/jsMath-fallback-mac.js 2005/12/07 18:57:44 1.2 @@ -594,140 +594,140 @@ jsMath.Add(jsMath.TeX,{ cmti10: [ // 00 - 0F - {c: 'Γ', tclass: 'greek', ic: 0.133}, + {c: 'Γ', ic: 0.133, tclass: 'greek'}, {c: 'Δ', tclass: 'greek'}, - {c: 'Θ', tclass: 'greek', ic: 0.094}, + {c: 'Θ', ic: 0.094, tclass: 'greek'}, {c: 'Λ', tclass: 'greek'}, - {c: 'Ξ', tclass: 'greek', ic: 0.153}, - {c: 'Π', tclass: 'greek', ic: 0.164}, - {c: 'Σ', tclass: 'greek', ic: 0.12}, - {c: 'Υ', tclass: 'greek', ic: 0.111}, - {c: 'Φ', tclass: 'greek', ic: 0.0599}, - {c: 'Ψ', tclass: 'greek', ic: 0.111}, - {c: 'Ω', tclass: 'greek', ic: 0.103}, - {c: 'ff', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 14, '108': 15}, tclass: 'normal', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 14, '108': 15}}, - {c: 'fi', tclass: 'normal', ic: 0.103}, - {c: 'fl', tclass: 'normal', ic: 0.103}, - {c: 'ffi', tclass: 'normal', ic: 0.103}, - {c: 'ffl', tclass: 'normal', ic: 0.103}, + {c: 'Ξ', ic: 0.153, tclass: 'greek'}, + {c: 'Π', ic: 0.164, tclass: 'greek'}, + {c: 'Σ', ic: 0.12, tclass: 'greek'}, + {c: 'Υ', ic: 0.111, tclass: 'greek'}, + {c: 'Φ', ic: 0.0599, tclass: 'greek'}, + {c: 'Ψ', ic: 0.111, tclass: 'greek'}, + {c: 'Ω', ic: 0.103, tclass: 'greek'}, + {c: 'ff', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 14, '108': 15}, tclass: 'normal'}, + {c: 'fi', ic: 0.103, tclass: 'normal'}, + {c: 'fl', ic: 0.103, tclass: 'normal'}, + {c: 'ffi', ic: 0.103, tclass: 'normal'}, + {c: 'ffl', ic: 0.103, tclass: 'normal'}, // 10 - 1F - {c: 'ı', a:0, tclass: 'normal', ic: 0.0767}, - {c: 'j', d:.2, tclass: 'normal', ic: 0.0374}, + {c: 'ı', a:0, ic: 0.0767, tclass: 'normal'}, + {c: 'j', d:.2, ic: 0.0374, tclass: 'normal'}, {c: '`', tclass: 'accent'}, - {c: '´', tclass: 'accent', ic: 0.0969}, - {c: 'ˇ', tclass: 'accent', ic: 0.083}, - {c: '˘', tclass: 'accent', ic: 0.108}, - {c: 'ˉ', tclass: 'accent', ic: 0.103}, + {c: '´', ic: 0.0969, tclass: 'accent'}, + {c: 'ˇ', ic: 0.083, tclass: 'accent'}, + {c: '˘', ic: 0.108, tclass: 'accent'}, + {c: 'ˉ', ic: 0.103, tclass: 'accent'}, {c: '˚', tclass: 'accent'}, - {c: '?', tclass: 'normal', d: 0.17, w: 0.46}, - {c: 'ß', tclass: 'normal', ic: 0.105}, - {c: 'æ', a:0, tclass: 'normal', ic: 0.0751}, - {c: 'œ', a:0, tclass: 'normal', ic: 0.0751}, - {c: 'ø', tclass: 'normal', ic: 0.0919}, - {c: 'Æ', tclass: 'normal', ic: 0.12}, - {c: 'Œ', tclass: 'normal', ic: 0.12}, - {c: 'Ø', tclass: 'normal', ic: 0.094}, + {c: '?', d: 0.17, w: 0.46, tclass: 'normal'}, + {c: 'ß', ic: 0.105, tclass: 'normal'}, + {c: 'æ', a:0, ic: 0.0751, tclass: 'normal'}, + {c: 'œ', a:0, ic: 0.0751, tclass: 'normal'}, + {c: 'ø', ic: 0.0919, tclass: 'normal'}, + {c: 'Æ', ic: 0.12, tclass: 'normal'}, + {c: 'Œ', ic: 0.12, tclass: 'normal'}, + {c: 'Ø', ic: 0.094, tclass: 'normal'}, // 20 - 2F - {c: '?', krn: {'108': -0.278, '76': -0.319}, tclass: 'normal', krn: {'108': -0.256, '76': -0.321}}, - {c: '!', lig: {'96': 60}, tclass: 'normal', ic: 0.124, lig: {'96': 60}}, - {c: '”', tclass: 'normal', ic: 0.0696}, - {c: '#', tclass: 'normal', ic: 0.0662}, + {c: '?', krn: {'108': -0.256, '76': -0.321}, tclass: 'normal'}, + {c: '!', ic: 0.124, lig: {'96': 60}, tclass: 'normal'}, + {c: '”', ic: 0.0696, tclass: 'normal'}, + {c: '#', ic: 0.0662, tclass: 'normal'}, {c: '$', tclass: 'normal'}, - {c: '%', tclass: 'normal', ic: 0.136}, - {c: '&', tclass: 'normal', ic: 0.0969}, - {c: '’', krn: {'63': 0.111, '33': 0.111}, lig: {'39': 34}, tclass: 'normal', ic: 0.124, krn: {'63': 0.102, '33': 0.102}, lig: {'39': 34}}, - {c: '(', d:.2, tclass: 'normal', ic: 0.162}, - {c: ')', d:.2, tclass: 'normal', ic: 0.0369}, - {c: '*', tclass: 'normal', ic: 0.149}, - {c: '+', a:.1, tclass: 'normal', ic: 0.0369}, + {c: '%', ic: 0.136, tclass: 'normal'}, + {c: '&', ic: 0.0969, tclass: 'normal'}, + {c: '’', ic: 0.124, krn: {'63': 0.102, '33': 0.102}, lig: {'39': 34}, tclass: 'normal'}, + {c: '(', d:.2, ic: 0.162, tclass: 'normal'}, + {c: ')', d:.2, ic: 0.0369, tclass: 'normal'}, + {c: '*', ic: 0.149, tclass: 'normal'}, + {c: '+', a:.1, ic: 0.0369, tclass: 'normal'}, {c: ',', a:-.3, d:.2, w: 0.278, tclass: 'normal'}, - {c: '-', a:0, lig: {'45': 123}, tclass: 'normal', ic: 0.0283, lig: {'45': 123}}, + {c: '-', a:0, ic: 0.0283, lig: {'45': 123}, tclass: 'normal'}, {c: '.', a:-.25, tclass: 'normal'}, - {c: '/', tclass: 'normal', ic: 0.162}, + {c: '/', ic: 0.162, tclass: 'normal'}, // 30 - 3F - {c: '0', tclass: 'normal', ic: 0.136}, - {c: '1', tclass: 'normal', ic: 0.136}, - {c: '2', tclass: 'normal', ic: 0.136}, - {c: '3', tclass: 'normal', ic: 0.136}, - {c: '4', tclass: 'normal', ic: 0.136}, - {c: '5', tclass: 'normal', ic: 0.136}, - {c: '6', tclass: 'normal', ic: 0.136}, - {c: '7', tclass: 'normal', ic: 0.136}, - {c: '8', tclass: 'normal', ic: 0.136}, - {c: '9', tclass: 'normal', ic: 0.136}, - {c: ':', tclass: 'normal', ic: 0.0582}, - {c: ';', tclass: 'normal', ic: 0.0582}, - {c: '¡', tclass: 'normal', ic: 0.0756}, - {c: '=', a:0, d:-.1, tclass: 'normal', ic: 0.0662}, + {c: '0', ic: 0.136, tclass: 'normal'}, + {c: '1', ic: 0.136, tclass: 'normal'}, + {c: '2', ic: 0.136, tclass: 'normal'}, + {c: '3', ic: 0.136, tclass: 'normal'}, + {c: '4', ic: 0.136, tclass: 'normal'}, + {c: '5', ic: 0.136, tclass: 'normal'}, + {c: '6', ic: 0.136, tclass: 'normal'}, + {c: '7', ic: 0.136, tclass: 'normal'}, + {c: '8', ic: 0.136, tclass: 'normal'}, + {c: '9', ic: 0.136, tclass: 'normal'}, + {c: ':', ic: 0.0582, tclass: 'normal'}, + {c: ';', ic: 0.0582, tclass: 'normal'}, + {c: '¡', ic: 0.0756, tclass: 'normal'}, + {c: '=', a:0, d:-.1, ic: 0.0662, tclass: 'normal'}, {c: '¿', tclass: 'normal'}, - {c: '?', lig: {'96': 62}, tclass: 'normal', ic: 0.122, lig: {'96': 62}}, + {c: '?', ic: 0.122, lig: {'96': 62}, tclass: 'normal'}, // 40 - 4F - {c: '@', tclass: 'normal', ic: 0.096}, - {c: 'A', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal', krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, - {c: 'B', tclass: 'normal', ic: 0.103}, - {c: 'C', tclass: 'normal', ic: 0.145}, - {c: 'D', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'normal', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}}, - {c: 'E', tclass: 'normal', ic: 0.12}, - {c: 'F', krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal', ic: 0.133, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}}, - {c: 'G', tclass: 'normal', ic: 0.0872}, - {c: 'H', tclass: 'normal', ic: 0.164}, - {c: 'I', krn: {'73': 0.0278}, tclass: 'normal', ic: 0.158}, - {c: 'J', tclass: 'normal', ic: 0.14}, - {c: 'K', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal', ic: 0.145, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}}, - {c: 'L', krn: {'84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal', krn: {'84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, - {c: 'M', tclass: 'normal', ic: 0.164}, - {c: 'N', tclass: 'normal', ic: 0.164}, - {c: 'O', krn: {'88': -0.0278, '87': -0.0278, '65': -0.0278, '86': -0.0278, '89': -0.0278}, tclass: 'normal', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}}, + {c: '@', ic: 0.096, tclass: 'normal'}, + {c: 'A', krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, + {c: 'B', ic: 0.103, tclass: 'normal'}, + {c: 'C', ic: 0.145, tclass: 'normal'}, + {c: 'D', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}, tclass: 'normal'}, + {c: 'E', ic: 0.12, tclass: 'normal'}, + {c: 'F', ic: 0.133, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'normal'}, + {c: 'G', ic: 0.0872, tclass: 'normal'}, + {c: 'H', ic: 0.164, tclass: 'normal'}, + {c: 'I', ic: 0.158, tclass: 'normal'}, + {c: 'J', ic: 0.14, tclass: 'normal'}, + {c: 'K', ic: 0.145, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'normal'}, + {c: 'L', krn: {'84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, + {c: 'M', ic: 0.164, tclass: 'normal'}, + {c: 'N', ic: 0.164, tclass: 'normal'}, + {c: 'O', ic: 0.094, krn: {'88': -0.0256, '87': -0.0256, '65': -0.0256, '86': -0.0256, '89': -0.0256}, tclass: 'normal'}, // 50 - 5F - {c: 'P', krn: {'65': -0.0833, '111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'normal', ic: 0.103, krn: {'65': -0.0767}}, - {c: 'Q', d: 1, tclass: 'normal', ic: 0.094}, - {c: 'R', krn: {'116': -0.0278, '67': -0.0278, '79': -0.0278, '71': -0.0278, '85': -0.0278, '81': -0.0278, '84': -0.0833, '89': -0.0833, '86': -0.111, '87': -0.111}, tclass: 'normal', ic: 0.0387, krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, - {c: 'S', tclass: 'normal', ic: 0.12}, - {c: 'T', krn: {'121': -0.0278, '101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'normal', ic: 0.133, krn: {'121': -0.0767, '101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}}, - {c: 'U', tclass: 'normal', ic: 0.164}, - {c: 'V', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal', ic: 0.184, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}}, - {c: 'W', ic: 0.0139, krn: {'111': -0.0833, '101': -0.0833, '117': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.111, '79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal', ic: 0.184, krn: {'65': -0.0767}}, - {c: 'X', krn: {'79': -0.0278, '67': -0.0278, '71': -0.0278, '81': -0.0278}, tclass: 'normal', ic: 0.158, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}}, - {c: 'Y', ic: 0.025, krn: {'101': -0.0833, '111': -0.0833, '114': -0.0833, '97': -0.0833, '65': -0.0833, '117': -0.0833}, tclass: 'normal', ic: 0.194, krn: {'101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}}, - {c: 'Z', tclass: 'normal', ic: 0.145}, - {c: '[', d:.1, tclass: 'normal', ic: 0.188}, - {c: '“', tclass: 'normal', ic: 0.169}, - {c: ']', d:.1, tclass: 'normal', ic: 0.105}, - {c: 'ˆ', tclass: 'accent', ic: 0.0665}, - {c: '˙', tclass: 'accent', ic: 0.118}, + {c: 'P', ic: 0.103, krn: {'65': -0.0767}, tclass: 'normal'}, + {c: 'Q', d: 1, ic: 0.094, tclass: 'normal'}, + {c: 'R', ic: 0.0387, krn: {'110': -0.0256, '108': -0.0256, '114': -0.0256, '117': -0.0256, '109': -0.0256, '116': -0.0256, '105': -0.0256, '67': -0.0256, '79': -0.0256, '71': -0.0256, '104': -0.0256, '98': -0.0256, '85': -0.0256, '107': -0.0256, '118': -0.0256, '119': -0.0256, '81': -0.0256, '84': -0.0767, '89': -0.0767, '86': -0.102, '87': -0.102, '101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, + {c: 'S', ic: 0.12, tclass: 'normal'}, + {c: 'T', ic: 0.133, krn: {'121': -0.0767, '101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}, tclass: 'normal'}, + {c: 'U', ic: 0.164, tclass: 'normal'}, + {c: 'V', ic: 0.184, krn: {'111': -0.0767, '101': -0.0767, '117': -0.0767, '114': -0.0767, '97': -0.0767, '65': -0.102, '79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'normal'}, + {c: 'W', ic: 0.184, krn: {'65': -0.0767}, tclass: 'normal'}, + {c: 'X', ic: 0.158, krn: {'79': -0.0256, '67': -0.0256, '71': -0.0256, '81': -0.0256}, tclass: 'normal'}, + {c: 'Y', ic: 0.194, krn: {'101': -0.0767, '111': -0.0767, '114': -0.0767, '97': -0.0767, '117': -0.0767, '65': -0.0767}, tclass: 'normal'}, + {c: 'Z', ic: 0.145, tclass: 'normal'}, + {c: '[', d:.1, ic: 0.188, tclass: 'normal'}, + {c: '“', ic: 0.169, tclass: 'normal'}, + {c: ']', d:.1, ic: 0.105, tclass: 'normal'}, + {c: 'ˆ', ic: 0.0665, tclass: 'accent'}, + {c: '˙', ic: 0.118, tclass: 'accent'}, // 60 - 6F - {c: '‘', lig: {'96': 92}, tclass: 'normal', ic: 0.124, lig: {'96': 92}}, - {c: 'a', a:0, krn: {'118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal', ic: 0.0767}, - {c: 'b', krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal', ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, - {c: 'c', a:0, krn: {'104': -0.0278, '107': -0.0278}, tclass: 'normal', ic: 0.0565, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, - {c: 'd', tclass: 'normal', ic: 0.103, krn: {'108': 0.0511}}, - {c: 'e', a:0, tclass: 'normal', ic: 0.0751, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, - {c: 'f', ic: 0.0778, krn: {'39': 0.0778, '63': 0.0778, '33': 0.0778, '41': 0.0778, '93': 0.0778}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'normal', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 12, '102': 11, '108': 13}}, - {c: 'g', a:0, d:1, ic: 0.0139, krn: {'106': 0.0278}, tclass: 'normal', ic: 0.0885}, - {c: 'h', krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal', ic: 0.0767}, - {c: 'i', tclass: 'normal', ic: 0.102}, - {c: 'j', d:1, tclass: 'normal', ic: 0.145}, - {c: 'k', krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal', ic: 0.108}, - {c: 'l', tclass: 'normal', ic: 0.103, krn: {'108': 0.0511}}, - {c: 'm', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal', ic: 0.0767}, - {c: 'n', a:0, krn: {'116': -0.0278, '117': -0.0278, '98': -0.0278, '121': -0.0278, '118': -0.0278, '119': -0.0278}, tclass: 'normal', ic: 0.0767, krn: {'39': -0.102}}, - {c: 'o', a:0, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal', ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, + {c: '‘', ic: 0.124, lig: {'96': 92}, tclass: 'normal'}, + {c: 'a', a:0, ic: 0.0767, tclass: 'normal'}, + {c: 'b', ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, + {c: 'c', a:0, ic: 0.0565, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, + {c: 'd', ic: 0.103, krn: {'108': 0.0511}, tclass: 'normal'}, + {c: 'e', a:0, ic: 0.0751, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, + {c: 'f', ic: 0.212, krn: {'39': 0.104, '63': 0.104, '33': 0.104, '41': 0.104, '93': 0.104}, lig: {'105': 12, '102': 11, '108': 13}, tclass: 'normal'}, + {c: 'g', a:0, d:1, ic: 0.0885, tclass: 'normal'}, + {c: 'h', ic: 0.0767, tclass: 'normal'}, + {c: 'i', ic: 0.102, tclass: 'normal'}, + {c: 'j', d:1, ic: 0.145, tclass: 'normal'}, + {c: 'k', ic: 0.108, tclass: 'normal'}, + {c: 'l', ic: 0.103, krn: {'108': 0.0511}, tclass: 'normal'}, + {c: 'm', a:0, ic: 0.0767, tclass: 'normal'}, + {c: 'n', a:0, ic: 0.0767, krn: {'39': -0.102}, tclass: 'normal'}, + {c: 'o', a:0, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, // 70 - 7F - {c: 'p', a:0, d:1, krn: {'101': 0.0278, '111': 0.0278, '120': -0.0278, '100': 0.0278, '99': 0.0278, '113': 0.0278, '118': -0.0278, '106': 0.0556, '121': -0.0278, '119': -0.0278}, tclass: 'normal', ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, - {c: 'q', a:0, d:1, tclass: 'normal', ic: 0.0885}, - {c: 'r', a:0, tclass: 'normal', ic: 0.108, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}}, - {c: 's', a:0, tclass: 'normal', ic: 0.0821}, - {c: 't', krn: {'121': -0.0278, '119': -0.0278}, tclass: 'normal', ic: 0.0949}, - {c: 'u', a:0, krn: {'119': -0.0278}, tclass: 'normal', ic: 0.0767}, - {c: 'v', a:0, ic: 0.0139, krn: {'97': -0.0556, '101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal', ic: 0.108}, - {c: 'w', a:0, ic: 0.0139, krn: {'101': -0.0278, '97': -0.0278, '111': -0.0278, '99': -0.0278}, tclass: 'normal', ic: 0.108, krn: {'108': 0.0511}}, - {c: 'x', a:0, tclass: 'normal', ic: 0.12}, - {c: 'y', a:0, d:1, ic: 0.0139, krn: {'111': -0.0278, '101': -0.0278, '97': -0.0278, '46': -0.0833, '44': -0.0833}, tclass: 'normal', ic: 0.0885}, - {c: 'z', a:0, tclass: 'normal', ic: 0.123}, - {c: '–', a:.1, ic: 0.0278, lig: {'45': 124}, tclass: 'normal', ic: 0.0921, lig: {'45': 124}}, - {c: '—', a:.1, ic: 0.0278, tclass: 'normal', ic: 0.0921}, - {c: '˝', tclass: 'accent', ic: 0.122}, - {c: '˜', tclass: 'accent', ic: 0.116}, + {c: 'p', a:0, d:1, ic: 0.0631, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, + {c: 'q', a:0, d:1, ic: 0.0885, tclass: 'normal'}, + {c: 'r', a:0, ic: 0.108, krn: {'101': -0.0511, '97': -0.0511, '111': -0.0511, '100': -0.0511, '99': -0.0511, '103': -0.0511, '113': -0.0511}, tclass: 'normal'}, + {c: 's', a:0, ic: 0.0821, tclass: 'normal'}, + {c: 't', ic: 0.0949, tclass: 'normal'}, + {c: 'u', a:0, ic: 0.0767, tclass: 'normal'}, + {c: 'v', a:0, ic: 0.108, tclass: 'normal'}, + {c: 'w', a:0, ic: 0.108, krn: {'108': 0.0511}, tclass: 'normal'}, + {c: 'x', a:0, ic: 0.12, tclass: 'normal'}, + {c: 'y', a:0, d:1, ic: 0.0885, tclass: 'normal'}, + {c: 'z', a:0, ic: 0.123, tclass: 'normal'}, + {c: '–', a:.1, ic: 0.0921, lig: {'45': 124}, tclass: 'normal'}, + {c: '—', a:.1, ic: 0.0921, tclass: 'normal'}, + {c: '˝', ic: 0.122, tclass: 'accent'}, + {c: '˜', ic: 0.116, tclass: 'accent'}, {c: '¨', tclass: 'accent'} ], @@ -874,14 +874,15 @@ jsMath.Add(jsMath.TeX,{ /* * We need to replace the jsMath.Box.TeX function in order to use the - * different font metrics in thie tables above, and to handle the + * different font metrics in the tables above, and to handle the * scaling better. */ jsMath.Add(jsMath.Box,{ - TeX: function (c,font,style,size) { - c = jsMath.TeX[font][c]; - if (c.h != null) {c.a = c.h-1.1*jsMath.TeX.x_height; if (c.d == 1) {c.d += .0001}} + TeX: function (C,font,style,size) { + c = jsMath.TeX[font][C]; if (!c.tclass) {c.tclass = font} + if (c.h != null && c.a == null) {c.a = c.h-1.1*jsMath.TeX.x_height} + if (c.img != null && c.c != '') this.TeXIMG(font,C,jsMath.Typeset.StyleSize(style,size)); var box = this.Text(c.c,c.tclass,style,size,c.a,c.d); var scale = jsMath.Typeset.TeX(style,size).scale; if (c.bh != null) { @@ -891,9 +892,9 @@ jsMath.Add(jsMath.Box,{ var h = box.bd+box.bh; var ph = Math.round(h*jsMath.em); if (h > jsMath.hd) { - box.bd = c.bd = jsMath.EmBoxFor(jsMath.HTML.Class(c.tclass,c.c) - + '').h - h; + box.bd = jsMath.EmBoxFor(jsMath.HTML.Class(c.tclass,c.c) + + '').h - h; box.bh = h - box.bd; } c.bh = box.bh/scale; @@ -909,54 +910,54 @@ jsMath.Add(jsMath.Box,{ } }); -jsMath.UpdateStyles({ - '.cmr10': 'font-family: serif', - '.lucida': 'font-family: Lucida Grande', - '.asymbol': 'font-family: Apple Symbols; font-size: 115%', - '.cal': 'font-family: Apple Chancery', - '.arrows': 'font-family: Hiragino Mincho Pro', - '.arrow1': 'font-family: Hiragino Mincho Pro; position: relative; top: .075em; margin: -1px', - '.arrow1a': 'font-family: Hiragino Mincho Pro; margin:-.3em', - '.arrow1b': 'font-family: AppleGothic; font-size: 50%', - '.arrow2': 'font-family: Symbol; font-size: 140%; position: relative; top: .1em; margin:-1px', - '.arrow2a': 'font-family: Symbol', - '.arrow2b': 'font-family: AppleGothic; font-size: 67%', - '.harpoon': 'font-family: AppleGothic; font-size: 90%', - '.symbol': 'font-family: Hiragino Mincho Pro', - '.symbol2': 'font-family: Hiragino Mincho Pro; margin:-.2em', - '.symbol3': 'font-family: AppleGothic', - '.delim1': 'font-family: Times; font-size: 133%; position:relative; top:.75em', - '.delim1b': 'font-family: Hiragino Mincho Pro; font-size: 133%; position:relative; top:.8em; margin: -.1em', - '.delim1c': 'font-family: Symbol; font-size: 120%; position:relative; top:.8em;', - '.delim2': 'font-family: Baskerville; font-size: 180%; position:relative; top:.75em', - '.delim2b': 'font-family: Hiragino Mincho Pro; font-size: 190%; position:relative; top:.8em; margin: -.1em', - '.delim2c': 'font-family: Symbol; font-size: 167%; position:relative; top:.8em;', - '.delim3': 'font-family: Baskerville; font-size: 250%; position:relative; top:.725em', - '.delim3b': 'font-family: Hiragino Mincho Pro; font-size: 250%; position:relative; top:.8em; margin: -.1em', - '.delim3c': 'font-family: symbol; font-size: 240%; position:relative; top:.775em;', - '.delim4': 'font-family: Baskerville; font-size: 325%; position:relative; top:.7em', - '.delim4b': 'font-family: Hiragino Mincho Pro; font-size: 325%; position:relative; top:.8em; margin: -.1em', - '.delim4c': 'font-family: Symbol; font-size: 300%; position:relative; top:.8em;', - '.vertical': 'font-family: Copperplate', - '.vertical1': 'font-family: Copperplate; font-size: 85%; margin: .15em;', - '.vertical2': 'font-family: Copperplate; font-size: 85%; margin: .17em;', - '.greek': 'font-family: Symbol', - '.bigop1': 'font-family: Hiragino Mincho Pro; font-size: 133%; position: relative; top: .85em; margin:-.05em', - '.bigop1a': 'font-family: Baskerville; font-size: 100%; position: relative; top: .775em;', - '.bigop1b': 'font-family: Hiragino Mincho Pro; font-size: 160%; position: relative; top: .7em; margin:-.1em', - '.bigop1c': 'font-family: Apple Symbols; font-size: 125%; position: relative; top: .75em; margin:-.1em;', - '.bigop2': 'font-family: Hiragino Mincho Pro; font-size: 200%; position: relative; top: .8em; margin:-.07em', - '.bigop2a': 'font-family: Baskerville; font-size: 175%; position: relative; top: .7em;', - '.bigop2b': 'font-family: Hiragino Mincho Pro; font-size: 270%; position: relative; top: .62em; margin:-.1em', - '.bigop2c': 'font-family: Apple Symbols; font-size: 250%; position: relative; top: .7em; margin:-.17em;', - '.wide1': 'font-size: 67%; position: relative; top:-.8em', - '.wide2': 'font-size: 110%; position: relative; top:-.5em', - '.wide3': 'font-size: 175%; position: relative; top:-.32em', - '.wide1a': 'font-size: 75%; position: relative; top:-.5em', - '.wide2a': 'font-size: 133%; position: relative; top: -.15em', - '.wide3a': 'font-size: 200%; position: relative; top: -.05em', - '.root': 'font-family: Baskerville;', - '.accent': 'position: relative; top: .02em' +jsMath.Update.Styles({ + '.cmr10': "font-family: serif", + '.lucida': "font-family: 'Lucida Grande'", + '.asymbol': "font-family: 'Apple Symbols'; font-size: 115%", + '.cal': "font-family: 'Apple Chancery'", + '.arrows': "font-family: 'Hiragino Mincho Pro'", + '.arrow1': "font-family: 'Hiragino Mincho Pro'; position: relative; top: .075em; margin: -1px", + '.arrow1a': "font-family: 'Hiragino Mincho Pro'; margin:-.3em", + '.arrow1b': "font-family: AppleGothic; font-size: 50%", + '.arrow2': "font-family: Symbol; font-size: 140%; position: relative; top: .1em; margin:-1px", + '.arrow2a': "font-family: Symbol", + '.arrow2b': "font-family: AppleGothic; font-size: 67%", + '.harpoon': "font-family: AppleGothic; font-size: 90%", + '.symbol': "font-family: 'Hiragino Mincho Pro'", + '.symbol2': "font-family: 'Hiragino Mincho Pro'; margin:-.2em", + '.symbol3': "font-family: AppleGothic", + '.delim1': "font-family: Times; font-size: 133%; position:relative; top:.75em", + '.delim1b': "font-family: 'Hiragino Mincho Pro'; font-size: 133%; position:relative; top:.8em; margin: -.1em", + '.delim1c': "font-family: Symbol; font-size: 120%; position:relative; top:.8em;", + '.delim2': "font-family: Baskerville; font-size: 180%; position:relative; top:.75em", + '.delim2b': "font-family: 'Hiragino Mincho Pro'; font-size: 190%; position:relative; top:.8em; margin: -.1em", + '.delim2c': "font-family: Symbol; font-size: 167%; position:relative; top:.8em;", + '.delim3': "font-family: Baskerville; font-size: 250%; position:relative; top:.725em", + '.delim3b': "font-family: 'Hiragino Mincho Pro'; font-size: 250%; position:relative; top:.8em; margin: -.1em", + '.delim3c': "font-family: symbol; font-size: 240%; position:relative; top:.775em;", + '.delim4': "font-family: Baskerville; font-size: 325%; position:relative; top:.7em", + '.delim4b': "font-family: 'Hiragino Mincho Pro'; font-size: 325%; position:relative; top:.8em; margin: -.1em", + '.delim4c': "font-family: Symbol; font-size: 300%; position:relative; top:.8em;", + '.vertical': "font-family: Copperplate", + '.vertical1': "font-family: Copperplate; font-size: 85%; margin: .15em;", + '.vertical2': "font-family: Copperplate; font-size: 85%; margin: .17em;", + '.greek': "font-family: serif", + '.bigop1': "font-family: 'Hiragino Mincho Pro'; font-size: 133%; position: relative; top: .85em; margin:-.05em", + '.bigop1a': "font-family: Baskerville; font-size: 100%; position: relative; top: .775em;", + '.bigop1b': "font-family: 'Hiragino Mincho Pro'; font-size: 160%; position: relative; top: .7em; margin:-.1em", + '.bigop1c': "font-family: Apple Symbols; font-size: 125%; position: relative; top: .75em; margin:-.1em;", + '.bigop2': "font-family: 'Hiragino Mincho Pro'; font-size: 200%; position: relative; top: .8em; margin:-.07em", + '.bigop2a': "font-family: Baskerville; font-size: 175%; position: relative; top: .7em;", + '.bigop2b': "font-family: 'Hiragino Mincho Pro'; font-size: 270%; position: relative; top: .62em; margin:-.1em", + '.bigop2c': "font-family: 'Apple Symbols'; font-size: 250%; position: relative; top: .7em; margin:-.17em;", + '.wide1': "font-size: 67%; position: relative; top:-.8em", + '.wide2': "font-size: 110%; position: relative; top:-.5em", + '.wide3': "font-size: 175%; position: relative; top:-.32em", + '.wide1a': "font-size: 75%; position: relative; top:-.5em", + '.wide2a': "font-size: 133%; position: relative; top: -.15em", + '.wide3a': "font-size: 200%; position: relative; top: -.05em", + '.root': "font-family: Baskerville;", + '.accent': "position: relative; top: .02em" }); /* @@ -967,7 +968,7 @@ jsMath.noAppleSymbols = (jsMath.BBoxFor jsMath.BBoxFor('∣').w); if (jsMath.noAppleSymbols) { - jsMath.UpdateTeXfonts({ + jsMath.Update.TeXfonts({ cmsy10: { '16': {c: '⌣⌢', tclass: 'normal'}, '22': {c: '≺—', tclass: 'normal'}, @@ -989,7 +990,7 @@ if (jsMath.noAppleSymbols) { jsMath.Macro('rightleftharpoons','\\unicode{x21CC}'); } else { - jsMath.UpdateStyles({ + jsMath.Update.Styles({ '.harpoon': 'font-family: Apple Symbols; font-size: 125%' }); @@ -1000,7 +1001,7 @@ if (jsMath.noAppleSymbols) { // Adjust for OmniWeb // if (navigator.accentColorName) { - jsMath.UpdateTeXfonts({ + jsMath.Update.TeXfonts({ cmsy10: { '55': {c: '˫'}, '104': {c: '〈'}, @@ -1008,12 +1009,12 @@ if (navigator.accentColorName) { } }); - jsMath.UpdateStyles({ + jsMath.Update.Styles({ '.arrow2': 'font-family: Symbol; font-size: 100%; position: relative; top: -.1em; margin:-1px' }); if (jsMath.noAppleSymbols) { - jsMath.UpdateTeXfonts({ + jsMath.Update.TeXfonts({ cmsy10: { '22': {c: '≺–', tclass: 'normal'}, '23': {c: '≻–', tclass: 'normal'}, @@ -1027,23 +1028,19 @@ if (navigator.accentColorName) { // // Check for Mozilla // -if (jsMath.hidden.ATTRIBUTE_NODE) { - document.writeln(''); -} +if (jsMath.hidden.ATTRIBUTE_NODE) {jsMath.Setup.Script('jsMath-fallback-mac-mozilla.js')} // // Check for MSIE // -if (jsMath.spanHeightVaries) { - document.writeln(''); -} +if (jsMath.spanHeightVaries) {jsMath.Setup.Script('jsMath-fallback-mac-msie.js')} /* * Reinstall Styles and fonts */ -jsMath.InitStyles(); -jsMath.InitTeXfonts(); +jsMath.Setup.Styles(); +jsMath.Setup.TeXfonts(); /* * No access to TeX "not" character, so fake this @@ -1053,4 +1050,5 @@ jsMath.Macro('not','\\mathrel{\\rlap{\\k jsMath.absoluteHeightVaries = 1; -jsMath.defaultH = 0.8; \ No newline at end of file +jsMath.defaultH = 0.8; +