fix gcc warnings

2 files changed, 788 insertions, 322 deletions

diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c
index a678c44d4bf..0bd30a69d05 100644
--- a/source/blender/blenlib/intern/noise.c
+++ b/source/blender/blenlib/intern/noise.c
@@ -387,55 +387,521 @@ static char p[512+2]= {
 
 
 float g[512+2][3]= {
-0.33783,0.715698,-0.611206,-0.944031,-0.326599,-0.045624,-0.101074,-0.416443,-0.903503,0.799286,0.49411,-0.341949,-0.854645,0.518036,0.033936,0.42514,-0.437866,-0.792114,-0.358948,0.597046,0.717377,-0.985413,0.144714,0.089294,-0.601776,-0.33728,-0.723907,-0.449921,0.594513,0.666382,0.208313,-0.10791,
-0.972076,0.575317,0.060425,0.815643,0.293365,-0.875702,-0.383453,0.293762,0.465759,0.834686,-0.846008,-0.233398,-0.47934,-0.115814,0.143036,-0.98291,0.204681,-0.949036,-0.239532,0.946716,-0.263947,0.184326,-0.235596,0.573822,0.784332,0.203705,-0.372253,-0.905487,0.756989,-0.651031,0.055298,0.497803,
-0.814697,-0.297363,-0.16214,0.063995,-0.98468,-0.329254,0.834381,0.441925,0.703827,-0.527039,-0.476227,0.956421,0.266113,0.119781,0.480133,0.482849,0.7323,-0.18631,0.961212,-0.203125,-0.748474,-0.656921,-0.090393,-0.085052,-0.165253,0.982544,-0.76947,0.628174,-0.115234,0.383148,0.537659,0.751068,
-0.616486,-0.668488,-0.415924,-0.259979,-0.630005,0.73175,0.570953,-0.087952,0.816223,-0.458008,0.023254,0.888611,-0.196167,0.976563,-0.088287,-0.263885,-0.69812,-0.665527,0.437134,-0.892273,-0.112793,-0.621674,-0.230438,0.748566,0.232422,0.900574,-0.367249,0.22229,-0.796143,0.562744,-0.665497,-0.73764,
-0.11377,0.670135,0.704803,0.232605,0.895599,0.429749,-0.114655,-0.11557,-0.474243,0.872742,0.621826,0.604004,-0.498444,-0.832214,0.012756,0.55426,-0.702484,0.705994,-0.089661,-0.692017,0.649292,0.315399,-0.175995,-0.977997,0.111877,0.096954,-0.04953,0.994019,0.635284,-0.606689,-0.477783,-0.261261,
--0.607422,-0.750153,0.983276,0.165436,0.075958,-0.29837,0.404083,-0.864655,-0.638672,0.507721,0.578156,0.388214,0.412079,0.824249,0.556183,-0.208832,0.804352,0.778442,0.562012,0.27951,-0.616577,0.781921,-0.091522,0.196289,0.051056,0.979187,-0.121216,0.207153,-0.970734,-0.173401,-0.384735,0.906555,
-0.161499,-0.723236,-0.671387,0.178497,-0.006226,-0.983887,-0.126038,0.15799,0.97934,0.830475,-0.024811,0.556458,-0.510132,-0.76944,0.384247,0.81424,0.200104,-0.544891,-0.112549,-0.393311,-0.912445,0.56189,0.152222,-0.813049,0.198914,-0.254517,-0.946381,-0.41217,0.690979,-0.593811,-0.407257,0.324524,
-0.853668,-0.690186,0.366119,-0.624115,-0.428345,0.844147,-0.322296,-0.21228,-0.297546,-0.930756,-0.273071,0.516113,0.811798,0.928314,0.371643,0.007233,0.785828,-0.479218,-0.390778,-0.704895,0.058929,0.706818,0.173248,0.203583,0.963562,0.422211,-0.904297,-0.062469,-0.363312,-0.182465,0.913605,0.254028,
--0.552307,-0.793945,-0.28891,-0.765747,-0.574554,0.058319,0.291382,0.954803,0.946136,-0.303925,0.111267,-0.078156,0.443695,-0.892731,0.182098,0.89389,0.409515,-0.680298,-0.213318,0.701141,0.062469,0.848389,-0.525635,-0.72879,-0.641846,0.238342,-0.88089,0.427673,0.202637,-0.532501,-0.21405,0.818878,
-0.948975,-0.305084,0.07962,0.925446,0.374664,0.055817,0.820923,0.565491,0.079102,0.25882,0.099792,-0.960724,-0.294617,0.910522,0.289978,0.137115,0.320038,-0.937408,-0.908386,0.345276,-0.235718,-0.936218,0.138763,0.322754,0.366577,0.925934,-0.090637,0.309296,-0.686829,-0.657684,0.66983,0.024445,
-0.742065,-0.917999,-0.059113,-0.392059,0.365509,0.462158,-0.807922,0.083374,0.996399,-0.014801,0.593842,0.253143,-0.763672,0.974976,-0.165466,0.148285,0.918976,0.137299,0.369537,0.294952,0.694977,0.655731,0.943085,0.152618,-0.295319,0.58783,-0.598236,0.544495,0.203796,0.678223,0.705994,-0.478821,
--0.661011,0.577667,0.719055,-0.1698,-0.673828,-0.132172,-0.965332,0.225006,-0.981873,-0.14502,0.121979,0.763458,0.579742,0.284546,-0.893188,0.079681,0.442474,-0.795776,-0.523804,0.303802,0.734955,0.67804,-0.007446,0.15506,0.986267,-0.056183,0.258026,0.571503,-0.778931,-0.681549,-0.702087,-0.206116,
--0.96286,-0.177185,0.203613,-0.470978,-0.515106,0.716095,-0.740326,0.57135,0.354095,-0.56012,-0.824982,-0.074982,-0.507874,0.753204,0.417969,-0.503113,0.038147,0.863342,0.594025,0.673553,-0.439758,-0.119873,-0.005524,-0.992737,0.098267,-0.213776,0.971893,-0.615631,0.643951,0.454163,0.896851,-0.441071,
-0.032166,-0.555023,0.750763,-0.358093,0.398773,0.304688,0.864929,-0.722961,0.303589,0.620544,-0.63559,-0.621948,-0.457306,-0.293243,0.072327,0.953278,-0.491638,0.661041,-0.566772,-0.304199,-0.572083,-0.761688,0.908081,-0.398956,0.127014,-0.523621,-0.549683,-0.650848,-0.932922,-0.19986,0.299408,0.099426,
-0.140869,0.984985,-0.020325,-0.999756,-0.002319,0.952667,0.280853,-0.11615,-0.971893,0.082581,0.220337,0.65921,0.705292,-0.260651,0.733063,-0.175537,0.657043,-0.555206,0.429504,-0.712189,0.400421,-0.89859,0.179352,0.750885,-0.19696,0.630341,0.785675,-0.569336,0.241821,-0.058899,-0.464111,0.883789,
-0.129608,-0.94519,0.299622,-0.357819,0.907654,0.219238,-0.842133,-0.439117,-0.312927,-0.313477,0.84433,0.434479,-0.241211,0.053253,0.968994,0.063873,0.823273,0.563965,0.476288,0.862152,-0.172516,0.620941,-0.298126,0.724915,0.25238,-0.749359,-0.612122,-0.577545,0.386566,0.718994,-0.406342,-0.737976,
-0.538696,0.04718,0.556305,0.82959,-0.802856,0.587463,0.101166,-0.707733,-0.705963,0.026428,0.374908,0.68457,0.625092,0.472137,0.208405,-0.856506,-0.703064,-0.581085,-0.409821,-0.417206,-0.736328,0.532623,-0.447876,-0.20285,-0.870728,0.086945,-0.990417,0.107086,0.183685,0.018341,-0.982788,0.560638,
--0.428864,0.708282,0.296722,-0.952576,-0.0672,0.135773,0.990265,0.030243,-0.068787,0.654724,0.752686,0.762604,-0.551758,0.337585,-0.819611,-0.407684,0.402466,-0.727844,-0.55072,-0.408539,-0.855774,-0.480011,0.19281,0.693176,-0.079285,0.716339,0.226013,0.650116,-0.725433,0.246704,0.953369,-0.173553,
--0.970398,-0.239227,-0.03244,0.136383,-0.394318,0.908752,0.813232,0.558167,0.164368,0.40451,0.549042,-0.731323,-0.380249,-0.566711,0.730865,0.022156,0.932739,0.359741,0.00824,0.996552,-0.082306,0.956635,-0.065338,-0.283722,-0.743561,0.008209,0.668579,-0.859589,-0.509674,0.035767,-0.852234,0.363678,
--0.375977,-0.201965,-0.970795,-0.12915,0.313477,0.947327,0.06546,-0.254028,-0.528259,0.81015,0.628052,0.601105,0.49411,-0.494385,0.868378,0.037933,0.275635,-0.086426,0.957336,-0.197937,0.468903,-0.860748,0.895599,0.399384,0.195801,0.560791,0.825012,-0.069214,0.304199,-0.849487,0.43103,0.096375,
-0.93576,0.339111,-0.051422,0.408966,-0.911072,0.330444,0.942841,-0.042389,-0.452362,-0.786407,0.420563,0.134308,-0.933472,-0.332489,0.80191,-0.566711,-0.188934,-0.987946,-0.105988,0.112518,-0.24408,0.892242,-0.379791,-0.920502,0.229095,-0.316376,0.7789,0.325958,0.535706,-0.912872,0.185211,-0.36377,
--0.184784,0.565369,-0.803833,-0.018463,0.119537,0.992615,-0.259247,-0.935608,0.239532,-0.82373,-0.449127,-0.345947,-0.433105,0.659515,0.614349,-0.822754,0.378845,-0.423676,0.687195,-0.674835,-0.26889,-0.246582,-0.800842,0.545715,-0.729187,-0.207794,0.651978,0.653534,-0.610443,-0.447388,0.492584,-0.023346,
-0.869934,0.609039,0.009094,-0.79306,0.962494,-0.271088,-0.00885,0.2659,-0.004913,0.963959,0.651245,0.553619,-0.518951,0.280548,-0.84314,0.458618,-0.175293,-0.983215,0.049805,0.035339,-0.979919,0.196045,-0.982941,0.164307,-0.082245,0.233734,-0.97226,-0.005005,-0.747253,-0.611328,0.260437,0.645599,
-0.592773,0.481384,0.117706,-0.949524,-0.29068,-0.535004,-0.791901,-0.294312,-0.627167,-0.214447,0.748718,-0.047974,-0.813477,-0.57959,-0.175537,0.477264,-0.860992,0.738556,-0.414246,-0.53183,0.562561,-0.704071,0.433289,-0.754944,0.64801,-0.100586,0.114716,0.044525,-0.992371,0.966003,0.244873,-0.082764,
-0.33783,0.715698,-0.611206,-0.944031,-0.326599,-0.045624,-0.101074,-0.416443,-0.903503,0.799286,0.49411,-0.341949,-0.854645,0.518036,0.033936,0.42514,-0.437866,-0.792114,-0.358948,0.597046,0.717377,-0.985413,0.144714,0.089294,-0.601776,-0.33728,-0.723907,-0.449921,0.594513,0.666382,0.208313,-0.10791,
-0.972076,0.575317,0.060425,0.815643,0.293365,-0.875702,-0.383453,0.293762,0.465759,0.834686,-0.846008,-0.233398,-0.47934,-0.115814,0.143036,-0.98291,0.204681,-0.949036,-0.239532,0.946716,-0.263947,0.184326,-0.235596,0.573822,0.784332,0.203705,-0.372253,-0.905487,0.756989,-0.651031,0.055298,0.497803,
-0.814697,-0.297363,-0.16214,0.063995,-0.98468,-0.329254,0.834381,0.441925,0.703827,-0.527039,-0.476227,0.956421,0.266113,0.119781,0.480133,0.482849,0.7323,-0.18631,0.961212,-0.203125,-0.748474,-0.656921,-0.090393,-0.085052,-0.165253,0.982544,-0.76947,0.628174,-0.115234,0.383148,0.537659,0.751068,
-0.616486,-0.668488,-0.415924,-0.259979,-0.630005,0.73175,0.570953,-0.087952,0.816223,-0.458008,0.023254,0.888611,-0.196167,0.976563,-0.088287,-0.263885,-0.69812,-0.665527,0.437134,-0.892273,-0.112793,-0.621674,-0.230438,0.748566,0.232422,0.900574,-0.367249,0.22229,-0.796143,0.562744,-0.665497,-0.73764,
-0.11377,0.670135,0.704803,0.232605,0.895599,0.429749,-0.114655,-0.11557,-0.474243,0.872742,0.621826,0.604004,-0.498444,-0.832214,0.012756,0.55426,-0.702484,0.705994,-0.089661,-0.692017,0.649292,0.315399,-0.175995,-0.977997,0.111877,0.096954,-0.04953,0.994019,0.635284,-0.606689,-0.477783,-0.261261,
--0.607422,-0.750153,0.983276,0.165436,0.075958,-0.29837,0.404083,-0.864655,-0.638672,0.507721,0.578156,0.388214,0.412079,0.824249,0.556183,-0.208832,0.804352,0.778442,0.562012,0.27951,-0.616577,0.781921,-0.091522,0.196289,0.051056,0.979187,-0.121216,0.207153,-0.970734,-0.173401,-0.384735,0.906555,
-0.161499,-0.723236,-0.671387,0.178497,-0.006226,-0.983887,-0.126038,0.15799,0.97934,0.830475,-0.024811,0.556458,-0.510132,-0.76944,0.384247,0.81424,0.200104,-0.544891,-0.112549,-0.393311,-0.912445,0.56189,0.152222,-0.813049,0.198914,-0.254517,-0.946381,-0.41217,0.690979,-0.593811,-0.407257,0.324524,
-0.853668,-0.690186,0.366119,-0.624115,-0.428345,0.844147,-0.322296,-0.21228,-0.297546,-0.930756,-0.273071,0.516113,0.811798,0.928314,0.371643,0.007233,0.785828,-0.479218,-0.390778,-0.704895,0.058929,0.706818,0.173248,0.203583,0.963562,0.422211,-0.904297,-0.062469,-0.363312,-0.182465,0.913605,0.254028,
--0.552307,-0.793945,-0.28891,-0.765747,-0.574554,0.058319,0.291382,0.954803,0.946136,-0.303925,0.111267,-0.078156,0.443695,-0.892731,0.182098,0.89389,0.409515,-0.680298,-0.213318,0.701141,0.062469,0.848389,-0.525635,-0.72879,-0.641846,0.238342,-0.88089,0.427673,0.202637,-0.532501,-0.21405,0.818878,
-0.948975,-0.305084,0.07962,0.925446,0.374664,0.055817,0.820923,0.565491,0.079102,0.25882,0.099792,-0.960724,-0.294617,0.910522,0.289978,0.137115,0.320038,-0.937408,-0.908386,0.345276,-0.235718,-0.936218,0.138763,0.322754,0.366577,0.925934,-0.090637,0.309296,-0.686829,-0.657684,0.66983,0.024445,
-0.742065,-0.917999,-0.059113,-0.392059,0.365509,0.462158,-0.807922,0.083374,0.996399,-0.014801,0.593842,0.253143,-0.763672,0.974976,-0.165466,0.148285,0.918976,0.137299,0.369537,0.294952,0.694977,0.655731,0.943085,0.152618,-0.295319,0.58783,-0.598236,0.544495,0.203796,0.678223,0.705994,-0.478821,
--0.661011,0.577667,0.719055,-0.1698,-0.673828,-0.132172,-0.965332,0.225006,-0.981873,-0.14502,0.121979,0.763458,0.579742,0.284546,-0.893188,0.079681,0.442474,-0.795776,-0.523804,0.303802,0.734955,0.67804,-0.007446,0.15506,0.986267,-0.056183,0.258026,0.571503,-0.778931,-0.681549,-0.702087,-0.206116,
--0.96286,-0.177185,0.203613,-0.470978,-0.515106,0.716095,-0.740326,0.57135,0.354095,-0.56012,-0.824982,-0.074982,-0.507874,0.753204,0.417969,-0.503113,0.038147,0.863342,0.594025,0.673553,-0.439758,-0.119873,-0.005524,-0.992737,0.098267,-0.213776,0.971893,-0.615631,0.643951,0.454163,0.896851,-0.441071,
-0.032166,-0.555023,0.750763,-0.358093,0.398773,0.304688,0.864929,-0.722961,0.303589,0.620544,-0.63559,-0.621948,-0.457306,-0.293243,0.072327,0.953278,-0.491638,0.661041,-0.566772,-0.304199,-0.572083,-0.761688,0.908081,-0.398956,0.127014,-0.523621,-0.549683,-0.650848,-0.932922,-0.19986,0.299408,0.099426,
-0.140869,0.984985,-0.020325,-0.999756,-0.002319,0.952667,0.280853,-0.11615,-0.971893,0.082581,0.220337,0.65921,0.705292,-0.260651,0.733063,-0.175537,0.657043,-0.555206,0.429504,-0.712189,0.400421,-0.89859,0.179352,0.750885,-0.19696,0.630341,0.785675,-0.569336,0.241821,-0.058899,-0.464111,0.883789,
-0.129608,-0.94519,0.299622,-0.357819,0.907654,0.219238,-0.842133,-0.439117,-0.312927,-0.313477,0.84433,0.434479,-0.241211,0.053253,0.968994,0.063873,0.823273,0.563965,0.476288,0.862152,-0.172516,0.620941,-0.298126,0.724915,0.25238,-0.749359,-0.612122,-0.577545,0.386566,0.718994,-0.406342,-0.737976,
-0.538696,0.04718,0.556305,0.82959,-0.802856,0.587463,0.101166,-0.707733,-0.705963,0.026428,0.374908,0.68457,0.625092,0.472137,0.208405,-0.856506,-0.703064,-0.581085,-0.409821,-0.417206,-0.736328,0.532623,-0.447876,-0.20285,-0.870728,0.086945,-0.990417,0.107086,0.183685,0.018341,-0.982788,0.560638,
--0.428864,0.708282,0.296722,-0.952576,-0.0672,0.135773,0.990265,0.030243,-0.068787,0.654724,0.752686,0.762604,-0.551758,0.337585,-0.819611,-0.407684,0.402466,-0.727844,-0.55072,-0.408539,-0.855774,-0.480011,0.19281,0.693176,-0.079285,0.716339,0.226013,0.650116,-0.725433,0.246704,0.953369,-0.173553,
--0.970398,-0.239227,-0.03244,0.136383,-0.394318,0.908752,0.813232,0.558167,0.164368,0.40451,0.549042,-0.731323,-0.380249,-0.566711,0.730865,0.022156,0.932739,0.359741,0.00824,0.996552,-0.082306,0.956635,-0.065338,-0.283722,-0.743561,0.008209,0.668579,-0.859589,-0.509674,0.035767,-0.852234,0.363678,
--0.375977,-0.201965,-0.970795,-0.12915,0.313477,0.947327,0.06546,-0.254028,-0.528259,0.81015,0.628052,0.601105,0.49411,-0.494385,0.868378,0.037933,0.275635,-0.086426,0.957336,-0.197937,0.468903,-0.860748,0.895599,0.399384,0.195801,0.560791,0.825012,-0.069214,0.304199,-0.849487,0.43103,0.096375,
-0.93576,0.339111,-0.051422,0.408966,-0.911072,0.330444,0.942841,-0.042389,-0.452362,-0.786407,0.420563,0.134308,-0.933472,-0.332489,0.80191,-0.566711,-0.188934,-0.987946,-0.105988,0.112518,-0.24408,0.892242,-0.379791,-0.920502,0.229095,-0.316376,0.7789,0.325958,0.535706,-0.912872,0.185211,-0.36377,
--0.184784,0.565369,-0.803833,-0.018463,0.119537,0.992615,-0.259247,-0.935608,0.239532,-0.82373,-0.449127,-0.345947,-0.433105,0.659515,0.614349,-0.822754,0.378845,-0.423676,0.687195,-0.674835,-0.26889,-0.246582,-0.800842,0.545715,-0.729187,-0.207794,0.651978,0.653534,-0.610443,-0.447388,0.492584,-0.023346,
-0.869934,0.609039,0.009094,-0.79306,0.962494,-0.271088,-0.00885,0.2659,-0.004913,0.963959,0.651245,0.553619,-0.518951,0.280548,-0.84314,0.458618,-0.175293,-0.983215,0.049805,0.035339,-0.979919,0.196045,-0.982941,0.164307,-0.082245,0.233734,-0.97226,-0.005005,-0.747253,-0.611328,0.260437,0.645599,
-0.592773,0.481384,0.117706,-0.949524,-0.29068,-0.535004,-0.791901,-0.294312,-0.627167,-0.214447,0.748718,-0.047974,-0.813477,-0.57959,-0.175537,0.477264,-0.860992,0.738556,-0.414246,-0.53183,0.562561,-0.704071,0.433289,-0.754944,0.64801,-0.100586,0.114716,0.044525,-0.992371,0.966003,0.244873,-0.082764,
-0.33783,0.715698,-0.611206,-0.944031,-0.326599,-0.045624};
+	{0.33783, 0.715698, -0.611206},
+	{-0.944031, -0.326599, -0.045624},
+	{-0.101074, -0.416443, -0.903503},
+	{0.799286, 0.49411, -0.341949},
+	{-0.854645, 0.518036, 0.033936},
+	{0.42514, -0.437866, -0.792114},
+	{-0.358948, 0.597046, 0.717377},
+	{-0.985413, 0.144714, 0.089294},
+	{-0.601776, -0.33728, -0.723907},
+	{-0.449921, 0.594513, 0.666382},
+	{0.208313, -0.10791, 0.972076},
+	{0.575317, 0.060425, 0.815643},
+	{0.293365, -0.875702, -0.383453},
+	{0.293762, 0.465759, 0.834686},
+	{-0.846008, -0.233398, -0.47934},
+	{-0.115814, 0.143036, -0.98291},
+	{0.204681, -0.949036, -0.239532},
+	{0.946716, -0.263947, 0.184326},
+	{-0.235596, 0.573822, 0.784332},
+	{0.203705, -0.372253, -0.905487},
+	{0.756989, -0.651031, 0.055298},
+	{0.497803, 0.814697, -0.297363},
+	{-0.16214, 0.063995, -0.98468},
+	{-0.329254, 0.834381, 0.441925},
+	{0.703827, -0.527039, -0.476227},
+	{0.956421, 0.266113, 0.119781},
+	{0.480133, 0.482849, 0.7323},
+	{-0.18631, 0.961212, -0.203125},
+	{-0.748474, -0.656921, -0.090393},
+	{-0.085052, -0.165253, 0.982544},
+	{-0.76947, 0.628174, -0.115234},
+	{0.383148, 0.537659, 0.751068},
+	{0.616486, -0.668488, -0.415924},
+	{-0.259979, -0.630005, 0.73175},
+	{0.570953, -0.087952, 0.816223},
+	{-0.458008, 0.023254, 0.888611},
+	{-0.196167, 0.976563, -0.088287},
+	{-0.263885, -0.69812, -0.665527},
+	{0.437134, -0.892273, -0.112793},
+	{-0.621674, -0.230438, 0.748566},
+	{0.232422, 0.900574, -0.367249},
+	{0.22229, -0.796143, 0.562744},
+	{-0.665497, -0.73764, 0.11377},
+	{0.670135, 0.704803, 0.232605},
+	{0.895599, 0.429749, -0.114655},
+	{-0.11557, -0.474243, 0.872742},
+	{0.621826, 0.604004, -0.498444},
+	{-0.832214, 0.012756, 0.55426},
+	{-0.702484, 0.705994, -0.089661},
+	{-0.692017, 0.649292, 0.315399},
+	{-0.175995, -0.977997, 0.111877},
+	{0.096954, -0.04953, 0.994019},
+	{0.635284, -0.606689, -0.477783},
+	{-0.261261, -0.607422, -0.750153},
+	{0.983276, 0.165436, 0.075958},
+	{-0.29837, 0.404083, -0.864655},
+	{-0.638672, 0.507721, 0.578156},
+	{0.388214, 0.412079, 0.824249},
+	{0.556183, -0.208832, 0.804352},
+	{0.778442, 0.562012, 0.27951},
+	{-0.616577, 0.781921, -0.091522},
+	{0.196289, 0.051056, 0.979187},
+	{-0.121216, 0.207153, -0.970734},
+	{-0.173401, -0.384735, 0.906555},
+	{0.161499, -0.723236, -0.671387},
+	{0.178497, -0.006226, -0.983887},
+	{-0.126038, 0.15799, 0.97934},
+	{0.830475, -0.024811, 0.556458},
+	{-0.510132, -0.76944, 0.384247},
+	{0.81424, 0.200104, -0.544891},
+	{-0.112549, -0.393311, -0.912445},
+	{0.56189, 0.152222, -0.813049},
+	{0.198914, -0.254517, -0.946381},
+	{-0.41217, 0.690979, -0.593811},
+	{-0.407257, 0.324524, 0.853668},
+	{-0.690186, 0.366119, -0.624115},
+	{-0.428345, 0.844147, -0.322296},
+	{-0.21228, -0.297546, -0.930756},
+	{-0.273071, 0.516113, 0.811798},
+	{0.928314, 0.371643, 0.007233},
+	{0.785828, -0.479218, -0.390778},
+	{-0.704895, 0.058929, 0.706818},
+	{0.173248, 0.203583, 0.963562},
+	{0.422211, -0.904297, -0.062469},
+	{-0.363312, -0.182465, 0.913605},
+	{0.254028, -0.552307, -0.793945},
+	{-0.28891, -0.765747, -0.574554},
+	{0.058319, 0.291382, 0.954803},
+	{0.946136, -0.303925, 0.111267},
+	{-0.078156, 0.443695, -0.892731},
+	{0.182098, 0.89389, 0.409515},
+	{-0.680298, -0.213318, 0.701141},
+	{0.062469, 0.848389, -0.525635},
+	{-0.72879, -0.641846, 0.238342},
+	{-0.88089, 0.427673, 0.202637},
+	{-0.532501, -0.21405, 0.818878},
+	{0.948975, -0.305084, 0.07962},
+	{0.925446, 0.374664, 0.055817},
+	{0.820923, 0.565491, 0.079102},
+	{0.25882, 0.099792, -0.960724},
+	{-0.294617, 0.910522, 0.289978},
+	{0.137115, 0.320038, -0.937408},
+	{-0.908386, 0.345276, -0.235718},
+	{-0.936218, 0.138763, 0.322754},
+	{0.366577, 0.925934, -0.090637},
+	{0.309296, -0.686829, -0.657684},
+	{0.66983, 0.024445, 0.742065},
+	{-0.917999, -0.059113, -0.392059},
+	{0.365509, 0.462158, -0.807922},
+	{0.083374, 0.996399, -0.014801},
+	{0.593842, 0.253143, -0.763672},
+	{0.974976, -0.165466, 0.148285},
+	{0.918976, 0.137299, 0.369537},
+	{0.294952, 0.694977, 0.655731},
+	{0.943085, 0.152618, -0.295319},
+	{0.58783, -0.598236, 0.544495},
+	{0.203796, 0.678223, 0.705994},
+	{-0.478821, -0.661011, 0.577667},
+	{0.719055, -0.1698, -0.673828},
+	{-0.132172, -0.965332, 0.225006},
+	{-0.981873, -0.14502, 0.121979},
+	{0.763458, 0.579742, 0.284546},
+	{-0.893188, 0.079681, 0.442474},
+	{-0.795776, -0.523804, 0.303802},
+	{0.734955, 0.67804, -0.007446},
+	{0.15506, 0.986267, -0.056183},
+	{0.258026, 0.571503, -0.778931},
+	{-0.681549, -0.702087, -0.206116},
+	{-0.96286, -0.177185, 0.203613},
+	{-0.470978, -0.515106, 0.716095},
+	{-0.740326, 0.57135, 0.354095},
+	{-0.56012, -0.824982, -0.074982},
+	{-0.507874, 0.753204, 0.417969},
+	{-0.503113, 0.038147, 0.863342},
+	{0.594025, 0.673553, -0.439758},
+	{-0.119873, -0.005524, -0.992737},
+	{0.098267, -0.213776, 0.971893},
+	{-0.615631, 0.643951, 0.454163},
+	{0.896851, -0.441071, 0.032166},
+	{-0.555023, 0.750763, -0.358093},
+	{0.398773, 0.304688, 0.864929},
+	{-0.722961, 0.303589, 0.620544},
+	{-0.63559, -0.621948, -0.457306},
+	{-0.293243, 0.072327, 0.953278},
+	{-0.491638, 0.661041, -0.566772},
+	{-0.304199, -0.572083, -0.761688},
+	{0.908081, -0.398956, 0.127014},
+	{-0.523621, -0.549683, -0.650848},
+	{-0.932922, -0.19986, 0.299408},
+	{0.099426, 0.140869, 0.984985},
+	{-0.020325, -0.999756, -0.002319},
+	{0.952667, 0.280853, -0.11615},
+	{-0.971893, 0.082581, 0.220337},
+	{0.65921, 0.705292, -0.260651},
+	{0.733063, -0.175537, 0.657043},
+	{-0.555206, 0.429504, -0.712189},
+	{0.400421, -0.89859, 0.179352},
+	{0.750885, -0.19696, 0.630341},
+	{0.785675, -0.569336, 0.241821},
+	{-0.058899, -0.464111, 0.883789},
+	{0.129608, -0.94519, 0.299622},
+	{-0.357819, 0.907654, 0.219238},
+	{-0.842133, -0.439117, -0.312927},
+	{-0.313477, 0.84433, 0.434479},
+	{-0.241211, 0.053253, 0.968994},
+	{0.063873, 0.823273, 0.563965},
+	{0.476288, 0.862152, -0.172516},
+	{0.620941, -0.298126, 0.724915},
+	{0.25238, -0.749359, -0.612122},
+	{-0.577545, 0.386566, 0.718994},
+	{-0.406342, -0.737976, 0.538696},
+	{0.04718, 0.556305, 0.82959},
+	{-0.802856, 0.587463, 0.101166},
+	{-0.707733, -0.705963, 0.026428},
+	{0.374908, 0.68457, 0.625092},
+	{0.472137, 0.208405, -0.856506},
+	{-0.703064, -0.581085, -0.409821},
+	{-0.417206, -0.736328, 0.532623},
+	{-0.447876, -0.20285, -0.870728},
+	{0.086945, -0.990417, 0.107086},
+	{0.183685, 0.018341, -0.982788},
+	{0.560638, -0.428864, 0.708282},
+	{0.296722, -0.952576, -0.0672},
+	{0.135773, 0.990265, 0.030243},
+	{-0.068787, 0.654724, 0.752686},
+	{0.762604, -0.551758, 0.337585},
+	{-0.819611, -0.407684, 0.402466},
+	{-0.727844, -0.55072, -0.408539},
+	{-0.855774, -0.480011, 0.19281},
+	{0.693176, -0.079285, 0.716339},
+	{0.226013, 0.650116, -0.725433},
+	{0.246704, 0.953369, -0.173553},
+	{-0.970398, -0.239227, -0.03244},
+	{0.136383, -0.394318, 0.908752},
+	{0.813232, 0.558167, 0.164368},
+	{0.40451, 0.549042, -0.731323},
+	{-0.380249, -0.566711, 0.730865},
+	{0.022156, 0.932739, 0.359741},
+	{0.00824, 0.996552, -0.082306},
+	{0.956635, -0.065338, -0.283722},
+	{-0.743561, 0.008209, 0.668579},
+	{-0.859589, -0.509674, 0.035767},
+	{-0.852234, 0.363678, -0.375977},
+	{-0.201965, -0.970795, -0.12915},
+	{0.313477, 0.947327, 0.06546},
+	{-0.254028, -0.528259, 0.81015},
+	{0.628052, 0.601105, 0.49411},
+	{-0.494385, 0.868378, 0.037933},
+	{0.275635, -0.086426, 0.957336},
+	{-0.197937, 0.468903, -0.860748},
+	{0.895599, 0.399384, 0.195801},
+	{0.560791, 0.825012, -0.069214},
+	{0.304199, -0.849487, 0.43103},
+	{0.096375, 0.93576, 0.339111},
+	{-0.051422, 0.408966, -0.911072},
+	{0.330444, 0.942841, -0.042389},
+	{-0.452362, -0.786407, 0.420563},
+	{0.134308, -0.933472, -0.332489},
+	{0.80191, -0.566711, -0.188934},
+	{-0.987946, -0.105988, 0.112518},
+	{-0.24408, 0.892242, -0.379791},
+	{-0.920502, 0.229095, -0.316376},
+	{0.7789, 0.325958, 0.535706},
+	{-0.912872, 0.185211, -0.36377},
+	{-0.184784, 0.565369, -0.803833},
+	{-0.018463, 0.119537, 0.992615},
+	{-0.259247, -0.935608, 0.239532},
+	{-0.82373, -0.449127, -0.345947},
+	{-0.433105, 0.659515, 0.614349},
+	{-0.822754, 0.378845, -0.423676},
+	{0.687195, -0.674835, -0.26889},
+	{-0.246582, -0.800842, 0.545715},
+	{-0.729187, -0.207794, 0.651978},
+	{0.653534, -0.610443, -0.447388},
+	{0.492584, -0.023346, 0.869934},
+	{0.609039, 0.009094, -0.79306},
+	{0.962494, -0.271088, -0.00885},
+	{0.2659, -0.004913, 0.963959},
+	{0.651245, 0.553619, -0.518951},
+	{0.280548, -0.84314, 0.458618},
+	{-0.175293, -0.983215, 0.049805},
+	{0.035339, -0.979919, 0.196045},
+	{-0.982941, 0.164307, -0.082245},
+	{0.233734, -0.97226, -0.005005},
+	{-0.747253, -0.611328, 0.260437},
+	{0.645599, 0.592773, 0.481384},
+	{0.117706, -0.949524, -0.29068},
+	{-0.535004, -0.791901, -0.294312},
+	{-0.627167, -0.214447, 0.748718},
+	{-0.047974, -0.813477, -0.57959},
+	{-0.175537, 0.477264, -0.860992},
+	{0.738556, -0.414246, -0.53183},
+	{0.562561, -0.704071, 0.433289},
+	{-0.754944, 0.64801, -0.100586},
+	{0.114716, 0.044525, -0.992371},
+	{0.966003, 0.244873, -0.082764},
+	{0.33783, 0.715698, -0.611206},
+	{-0.944031, -0.326599, -0.045624},
+	{-0.101074, -0.416443, -0.903503},
+	{0.799286, 0.49411, -0.341949},
+	{-0.854645, 0.518036, 0.033936},
+	{0.42514, -0.437866, -0.792114},
+	{-0.358948, 0.597046, 0.717377},
+	{-0.985413, 0.144714, 0.089294},
+	{-0.601776, -0.33728, -0.723907},
+	{-0.449921, 0.594513, 0.666382},
+	{0.208313, -0.10791, 0.972076},
+	{0.575317, 0.060425, 0.815643},
+	{0.293365, -0.875702, -0.383453},
+	{0.293762, 0.465759, 0.834686},
+	{-0.846008, -0.233398, -0.47934},
+	{-0.115814, 0.143036, -0.98291},
+	{0.204681, -0.949036, -0.239532},
+	{0.946716, -0.263947, 0.184326},
+	{-0.235596, 0.573822, 0.784332},
+	{0.203705, -0.372253, -0.905487},
+	{0.756989, -0.651031, 0.055298},
+	{0.497803, 0.814697, -0.297363},
+	{-0.16214, 0.063995, -0.98468},
+	{-0.329254, 0.834381, 0.441925},
+	{0.703827, -0.527039, -0.476227},
+	{0.956421, 0.266113, 0.119781},
+	{0.480133, 0.482849, 0.7323},
+	{-0.18631, 0.961212, -0.203125},
+	{-0.748474, -0.656921, -0.090393},
+	{-0.085052, -0.165253, 0.982544},
+	{-0.76947, 0.628174, -0.115234},
+	{0.383148, 0.537659, 0.751068},
+	{0.616486, -0.668488, -0.415924},
+	{-0.259979, -0.630005, 0.73175},
+	{0.570953, -0.087952, 0.816223},
+	{-0.458008, 0.023254, 0.888611},
+	{-0.196167, 0.976563, -0.088287},
+	{-0.263885, -0.69812, -0.665527},
+	{0.437134, -0.892273, -0.112793},
+	{-0.621674, -0.230438, 0.748566},
+	{0.232422, 0.900574, -0.367249},
+	{0.22229, -0.796143, 0.562744},
+	{-0.665497, -0.73764, 0.11377},
+	{0.670135, 0.704803, 0.232605},
+	{0.895599, 0.429749, -0.114655},
+	{-0.11557, -0.474243, 0.872742},
+	{0.621826, 0.604004, -0.498444},
+	{-0.832214, 0.012756, 0.55426},
+	{-0.702484, 0.705994, -0.089661},
+	{-0.692017, 0.649292, 0.315399},
+	{-0.175995, -0.977997, 0.111877},
+	{0.096954, -0.04953, 0.994019},
+	{0.635284, -0.606689, -0.477783},
+	{-0.261261, -0.607422, -0.750153},
+	{0.983276, 0.165436, 0.075958},
+	{-0.29837, 0.404083, -0.864655},
+	{-0.638672, 0.507721, 0.578156},
+	{0.388214, 0.412079, 0.824249},
+	{0.556183, -0.208832, 0.804352},
+	{0.778442, 0.562012, 0.27951},
+	{-0.616577, 0.781921, -0.091522},
+	{0.196289, 0.051056, 0.979187},
+	{-0.121216, 0.207153, -0.970734},
+	{-0.173401, -0.384735, 0.906555},
+	{0.161499, -0.723236, -0.671387},
+	{0.178497, -0.006226, -0.983887},
+	{-0.126038, 0.15799, 0.97934},
+	{0.830475, -0.024811, 0.556458},
+	{-0.510132, -0.76944, 0.384247},
+	{0.81424, 0.200104, -0.544891},
+	{-0.112549, -0.393311, -0.912445},
+	{0.56189, 0.152222, -0.813049},
+	{0.198914, -0.254517, -0.946381},
+	{-0.41217, 0.690979, -0.593811},
+	{-0.407257, 0.324524, 0.853668},
+	{-0.690186, 0.366119, -0.624115},
+	{-0.428345, 0.844147, -0.322296},
+	{-0.21228, -0.297546, -0.930756},
+	{-0.273071, 0.516113, 0.811798},
+	{0.928314, 0.371643, 0.007233},
+	{0.785828, -0.479218, -0.390778},
+	{-0.704895, 0.058929, 0.706818},
+	{0.173248, 0.203583, 0.963562},
+	{0.422211, -0.904297, -0.062469},
+	{-0.363312, -0.182465, 0.913605},
+	{0.254028, -0.552307, -0.793945},
+	{-0.28891, -0.765747, -0.574554},
+	{0.058319, 0.291382, 0.954803},
+	{0.946136, -0.303925, 0.111267},
+	{-0.078156, 0.443695, -0.892731},
+	{0.182098, 0.89389, 0.409515},
+	{-0.680298, -0.213318, 0.701141},
+	{0.062469, 0.848389, -0.525635},
+	{-0.72879, -0.641846, 0.238342},
+	{-0.88089, 0.427673, 0.202637},
+	{-0.532501, -0.21405, 0.818878},
+	{0.948975, -0.305084, 0.07962},
+	{0.925446, 0.374664, 0.055817},
+	{0.820923, 0.565491, 0.079102},
+	{0.25882, 0.099792, -0.960724},
+	{-0.294617, 0.910522, 0.289978},
+	{0.137115, 0.320038, -0.937408},
+	{-0.908386, 0.345276, -0.235718},
+	{-0.936218, 0.138763, 0.322754},
+	{0.366577, 0.925934, -0.090637},
+	{0.309296, -0.686829, -0.657684},
+	{0.66983, 0.024445, 0.742065},
+	{-0.917999, -0.059113, -0.392059},
+	{0.365509, 0.462158, -0.807922},
+	{0.083374, 0.996399, -0.014801},
+	{0.593842, 0.253143, -0.763672},
+	{0.974976, -0.165466, 0.148285},
+	{0.918976, 0.137299, 0.369537},
+	{0.294952, 0.694977, 0.655731},
+	{0.943085, 0.152618, -0.295319},
+	{0.58783, -0.598236, 0.544495},
+	{0.203796, 0.678223, 0.705994},
+	{-0.478821, -0.661011, 0.577667},
+	{0.719055, -0.1698, -0.673828},
+	{-0.132172, -0.965332, 0.225006},
+	{-0.981873, -0.14502, 0.121979},
+	{0.763458, 0.579742, 0.284546},
+	{-0.893188, 0.079681, 0.442474},
+	{-0.795776, -0.523804, 0.303802},
+	{0.734955, 0.67804, -0.007446},
+	{0.15506, 0.986267, -0.056183},
+	{0.258026, 0.571503, -0.778931},
+	{-0.681549, -0.702087, -0.206116},
+	{-0.96286, -0.177185, 0.203613},
+	{-0.470978, -0.515106, 0.716095},
+	{-0.740326, 0.57135, 0.354095},
+	{-0.56012, -0.824982, -0.074982},
+	{-0.507874, 0.753204, 0.417969},
+	{-0.503113, 0.038147, 0.863342},
+	{0.594025, 0.673553, -0.439758},
+	{-0.119873, -0.005524, -0.992737},
+	{0.098267, -0.213776, 0.971893},
+	{-0.615631, 0.643951, 0.454163},
+	{0.896851, -0.441071, 0.032166},
+	{-0.555023, 0.750763, -0.358093},
+	{0.398773, 0.304688, 0.864929},
+	{-0.722961, 0.303589, 0.620544},
+	{-0.63559, -0.621948, -0.457306},
+	{-0.293243, 0.072327, 0.953278},
+	{-0.491638, 0.661041, -0.566772},
+	{-0.304199, -0.572083, -0.761688},
+	{0.908081, -0.398956, 0.127014},
+	{-0.523621, -0.549683, -0.650848},
+	{-0.932922, -0.19986, 0.299408},
+	{0.099426, 0.140869, 0.984985},
+	{-0.020325, -0.999756, -0.002319},
+	{0.952667, 0.280853, -0.11615},
+	{-0.971893, 0.082581, 0.220337},
+	{0.65921, 0.705292, -0.260651},
+	{0.733063, -0.175537, 0.657043},
+	{-0.555206, 0.429504, -0.712189},
+	{0.400421, -0.89859, 0.179352},
+	{0.750885, -0.19696, 0.630341},
+	{0.785675, -0.569336, 0.241821},
+	{-0.058899, -0.464111, 0.883789},
+	{0.129608, -0.94519, 0.299622},
+	{-0.357819, 0.907654, 0.219238},
+	{-0.842133, -0.439117, -0.312927},
+	{-0.313477, 0.84433, 0.434479},
+	{-0.241211, 0.053253, 0.968994},
+	{0.063873, 0.823273, 0.563965},
+	{0.476288, 0.862152, -0.172516},
+	{0.620941, -0.298126, 0.724915},
+	{0.25238, -0.749359, -0.612122},
+	{-0.577545, 0.386566, 0.718994},
+	{-0.406342, -0.737976, 0.538696},
+	{0.04718, 0.556305, 0.82959},
+	{-0.802856, 0.587463, 0.101166},
+	{-0.707733, -0.705963, 0.026428},
+	{0.374908, 0.68457, 0.625092},
+	{0.472137, 0.208405, -0.856506},
+	{-0.703064, -0.581085, -0.409821},
+	{-0.417206, -0.736328, 0.532623},
+	{-0.447876, -0.20285, -0.870728},
+	{0.086945, -0.990417, 0.107086},
+	{0.183685, 0.018341, -0.982788},
+	{0.560638, -0.428864, 0.708282},
+	{0.296722, -0.952576, -0.0672},
+	{0.135773, 0.990265, 0.030243},
+	{-0.068787, 0.654724, 0.752686},
+	{0.762604, -0.551758, 0.337585},
+	{-0.819611, -0.407684, 0.402466},
+	{-0.727844, -0.55072, -0.408539},
+	{-0.855774, -0.480011, 0.19281},
+	{0.693176, -0.079285, 0.716339},
+	{0.226013, 0.650116, -0.725433},
+	{0.246704, 0.953369, -0.173553},
+	{-0.970398, -0.239227, -0.03244},
+	{0.136383, -0.394318, 0.908752},
+	{0.813232, 0.558167, 0.164368},
+	{0.40451, 0.549042, -0.731323},
+	{-0.380249, -0.566711, 0.730865},
+	{0.022156, 0.932739, 0.359741},
+	{0.00824, 0.996552, -0.082306},
+	{0.956635, -0.065338, -0.283722},
+	{-0.743561, 0.008209, 0.668579},
+	{-0.859589, -0.509674, 0.035767},
+	{-0.852234, 0.363678, -0.375977},
+	{-0.201965, -0.970795, -0.12915},
+	{0.313477, 0.947327, 0.06546},
+	{-0.254028, -0.528259, 0.81015},
+	{0.628052, 0.601105, 0.49411},
+	{-0.494385, 0.868378, 0.037933},
+	{0.275635, -0.086426, 0.957336},
+	{-0.197937, 0.468903, -0.860748},
+	{0.895599, 0.399384, 0.195801},
+	{0.560791, 0.825012, -0.069214},
+	{0.304199, -0.849487, 0.43103},
+	{0.096375, 0.93576, 0.339111},
+	{-0.051422, 0.408966, -0.911072},
+	{0.330444, 0.942841, -0.042389},
+	{-0.452362, -0.786407, 0.420563},
+	{0.134308, -0.933472, -0.332489},
+	{0.80191, -0.566711, -0.188934},
+	{-0.987946, -0.105988, 0.112518},
+	{-0.24408, 0.892242, -0.379791},
+	{-0.920502, 0.229095, -0.316376},
+	{0.7789, 0.325958, 0.535706},
+	{-0.912872, 0.185211, -0.36377},
+	{-0.184784, 0.565369, -0.803833},
+	{-0.018463, 0.119537, 0.992615},
+	{-0.259247, -0.935608, 0.239532},
+	{-0.82373, -0.449127, -0.345947},
+	{-0.433105, 0.659515, 0.614349},
+	{-0.822754, 0.378845, -0.423676},
+	{0.687195, -0.674835, -0.26889},
+	{-0.246582, -0.800842, 0.545715},
+	{-0.729187, -0.207794, 0.651978},
+	{0.653534, -0.610443, -0.447388},
+	{0.492584, -0.023346, 0.869934},
+	{0.609039, 0.009094, -0.79306},
+	{0.962494, -0.271088, -0.00885},
+	{0.2659, -0.004913, 0.963959},
+	{0.651245, 0.553619, -0.518951},
+	{0.280548, -0.84314, 0.458618},
+	{-0.175293, -0.983215, 0.049805},
+	{0.035339, -0.979919, 0.196045},
+	{-0.982941, 0.164307, -0.082245},
+	{0.233734, -0.97226, -0.005005},
+	{-0.747253, -0.611328, 0.260437},
+	{0.645599, 0.592773, 0.481384},
+	{0.117706, -0.949524, -0.29068},
+	{-0.535004, -0.791901, -0.294312},
+	{-0.627167, -0.214447, 0.748718},
+	{-0.047974, -0.813477, -0.57959},
+	{-0.175537, 0.477264, -0.860992},
+	{0.738556, -0.414246, -0.53183},
+	{0.562561, -0.704071, 0.433289},
+	{-0.754944, 0.64801, -0.100586},
+	{0.114716, 0.044525, -0.992371},
+	{0.966003, 0.244873, -0.082764},
+	{0.33783, 0.715698, -0.611206},
+	{-0.944031, -0.326599, -0.045624},
+};
 
 
 
diff --git a/source/blender/blenlib/intern/psfont.c b/source/blender/blenlib/intern/psfont.c
index 441484fc88b..8cdc0601c7e 100644
--- a/source/blender/blenlib/intern/psfont.c
+++ b/source/blender/blenlib/intern/psfont.c
@@ -256,290 +256,290 @@ static int sp;
 static int savesplines = 1;
 
 static pschar ISOcharlist[NASCII] = {
-	"/space", 		040,	0,
-	    "/exclam", 		041,	0,
-	    "/quotedbl", 	042,	0,
-	    "/numbersign", 	043,	0,
-	    "/dollar", 		044,	0,
-	    "/percent", 	045,	0,
-	    "/ampersand", 	046,	0,
-	    "/quoteright", 	047,	0,
-
-	    "/parenleft", 	050,	0,
-	    "/parenright", 	051,	0,
-	    "/asterisk", 	052,	0,
-	    "/plus", 		053,	0,
-	    "/comma", 		054,	0,
-	    "/hyphen", 		055,	0,
-	    "/period", 		056,	0,
-	    "/slash", 		057,	0,
-
-	    "/zero", 		060,	0,
-	    "/one", 		061,	0,
-	    "/two", 		062,	0,
-	    "/three", 		063,	0,
-	    "/four", 		064,	0,
-	    "/five", 		065,	0,
-	    "/six", 		066,	0,
-	    "/seven", 		067,	0,
-
-	    "/eight", 		070,	0,
-	    "/nine", 		071,	0,
-	    "/colon", 		072,	0,
-	    "/semicolon", 	073,	0,
-	    "/less",	 	074,	0,
-	    "/equal",	 	075,	0,
-	    "/greater",	 	076,	0,
-	    "/question", 	077,	0,
-
-	    "/at",	 	0100,	0,
-	    "/A",	 	0101,	0,
-	    "/B",	 	0102,	0,
-	    "/C",	 	0103,	0,
-	    "/D",	 	0104,	0,
-	    "/E",	 	0105,	0,
-	    "/F",	 	0106,	0,
-	    "/G",	 	0107,	0,
-
-	    "/H",	 	0110,	0,
-	    "/I",	 	0111,	0,
-	    "/J",	 	0112,	0,
-	    "/K",	 	0113,	0,
-	    "/L",	 	0114,	0,
-	    "/M",	 	0115,	0,
-	    "/N",	 	0116,	0,
-	    "/O",	 	0117,	0,
-
-	    "/P",	 	0120,	0,
-	    "/Q",	 	0121,	0,
-	    "/R",	 	0122,	0,
-	    "/S",	 	0123,	0,
-	    "/T",	 	0124,	0,
-	    "/U",	 	0125,	0,
-	    "/V",	 	0126,	0,
-	    "/W",	 	0127,	0,
-
-	    "/X",	 	0130,	0,
-	    "/Y",	 	0131,	0,
-	    "/Z",	 	0132,	0,
-	    "/bracketleft", 	0133,	0,
-	    "/backslash",	0134,	0,
-	    "/bracketright", 	0135,	0,
-	    "/asciicircum",	0136,	0,
-	    "/underscore", 	0137,	0,
-
-	    "/quoteleft", 	0140,	0,
-	    "/a",	 	0141,	0,
-	    "/b",	 	0142,	0,
-	    "/c", 		0143,	0,
-	    "/d",		0144,	0,
-	    "/e", 		0145,	0,
-	    "/f",		0146,	0,
-	    "/g",	 	0147,	0,
-
-	    "/h",	 	0150,	0,
-	    "/i",	 	0151,	0,
-	    "/j",	 	0152,	0,
-	    "/k", 		0153,	0,
-	    "/l",		0154,	0,
-	    "/m", 		0155,	0,
-	    "/n",		0156,	0,
-	    "/o",	 	0157,	0,
-
-	    "/p",	 	0160,	0,
-	    "/q",	 	0161,	0,
-	    "/r",	 	0162,	0,
-	    "/s", 		0163,	0,
-	    "/t",		0164,	0,
-	    "/u",		0165,	0,
-	    "/v", 		0166,	0,
-	    "/w",		0167,	0,
-
-	    "/x",	 	0170,	0,
-	    "/y",	 	0171,	0,
-	    "/z",	 	0172,	0,
-	    "/braceleft", 	0173,	0,
-	    "/bar",		0174,	0,
-	    "/braceright",	0175,	0,
-	    "/asciitilde", 	0176,	0,
-	    "/",		0177,	0,
+	{"/space", 			040,	0},
+	    {"/exclam", 	041,	0},
+	    {"/quotedbl", 	042,	0},
+	    {"/numbersign", 043,	0},
+	    {"/dollar", 	044,	0},
+	    {"/percent", 	045,	0},
+	    {"/ampersand", 	046,	0},
+	    {"/quoteright", 047,	0},
+
+	    {"/parenleft", 	050,	0},
+	    {"/parenright", 051,	0},
+	    {"/asterisk", 	052,	0},
+	    {"/plus", 		053,	0},
+	    {"/comma", 		054,	0},
+	    {"/hyphen", 	055,	0},
+	    {"/period", 	056,	0},
+	    {"/slash", 		057,	0},
+
+	    {"/zero", 		060,	0},
+	    {"/one", 		061,	0},
+	    {"/two", 		062,	0},
+	    {"/three", 		063,	0},
+	    {"/four", 		064,	0},
+	    {"/five", 		065,	0},
+	    {"/six", 		066,	0},
+	    {"/seven", 		067,	0},
+
+	    {"/eight", 		070,	0},
+	    {"/nine", 		071,	0},
+	    {"/colon", 		072,	0},
+	    {"/semicolon", 	073,	0},
+	    {"/less",	 	074,	0},
+	    {"/equal",	 	075,	0},
+	    {"/greater",	076,	0},
+	    {"/question", 	077,	0},
+
+	    {"/at",	 	0100,	0},
+	    {"/A",	 	0101,	0},
+	    {"/B",	 	0102,	0},
+	    {"/C",	 	0103,	0},
+	    {"/D",	 	0104,	0},
+	    {"/E",	 	0105,	0},
+	    {"/F",	 	0106,	0},
+	    {"/G",	 	0107,	0},
+
+	    {"/H",	 	0110,	0},
+	    {"/I",	 	0111,	0},
+	    {"/J",	 	0112,	0},
+	    {"/K",	 	0113,	0},
+	    {"/L",	 	0114,	0},
+	    {"/M",	 	0115,	0},
+	    {"/N",	 	0116,	0},
+	    {"/O",	 	0117,	0},
+
+	    {"/P",	 	0120,	0},
+	    {"/Q",	 	0121,	0},
+	    {"/R",	 	0122,	0},
+	    {"/S",	 	0123,	0},
+	    {"/T",	 	0124,	0},
+	    {"/U",	 	0125,	0},
+	    {"/V",	 	0126,	0},
+	    {"/W",	 	0127,	0},
+
+	    {"/X",	 			0130,	0},
+	    {"/Y",	 			0131,	0},
+	    {"/Z",	 			0132,	0},
+	    {"/bracketleft", 	0133,	0},
+	    {"/backslash",		0134,	0},
+	    {"/bracketright", 	0135,	0},
+	    {"/asciicircum",	0136,	0},
+	    {"/underscore", 	0137,	0},
+
+	    {"/quoteleft", 	0140,	0},
+	    {"/a",	 		0141,	0},
+	    {"/b",	 		0142,	0},
+	    {"/c", 			0143,	0},
+	    {"/d",			0144,	0},
+	    {"/e", 			0145,	0},
+	    {"/f",			0146,	0},
+	    {"/g",	 		0147,	0},
+
+	    {"/h",	 	0150,	0},
+	    {"/i",	 	0151,	0},
+	    {"/j",	 	0152,	0},
+	    {"/k", 		0153,	0},
+	    {"/l",		0154,	0},
+	    {"/m", 		0155,	0},
+	    {"/n",		0156,	0},
+	    {"/o",	 	0157,	0},
+
+	    {"/p",	 	0160,	0},
+	    {"/q",	 	0161,	0},
+	    {"/r",	 	0162,	0},
+	    {"/s", 		0163,	0},
+	    {"/t",		0164,	0},
+	    {"/u",		0165,	0},
+	    {"/v", 		0166,	0},
+	    {"/w",		0167,	0},
+
+	    {"/x",	 		0170,	0},
+	    {"/y",		 	0171,	0},
+	    {"/z",	 		0172,	0},
+	    {"/braceleft", 	0173,	0},
+	    {"/bar",		0174,	0},
+	    {"/braceright",	0175,	0},
+	    {"/asciitilde", 0176,	0},
+	    {"/",			0177,	0},
 
 
 	    /* nonstandard defs */
 
-	"/quotedblleft",	0200,	0,
-	    "/quotedblright",	0201,	0,
-	    "/quotedblbase",	0202,	0,
-	    "/quotesinglbase",	0203,	0,
-	    "/guilsinglleft",	0204,	0,
-	    "/guilsinglright",	0205,	0,
-	    "/endash",		0206,	0,
-	    "/dagger",		0207,	0,
-
-	    "/daggerdbl",	0210,	0,
-	    "/trademark",	0211,	0,
-	    "/bullet",		0212,	0,
-	    "/perthousand",	0213,	0,
-	    "/Lslash",		0214,	0,
-	    "/OE",		0215,	0,
-	    "/lslash",		0216,	0,
-	    "/oe",		0217,	0,
+	{"/quotedblleft",		0200,	0},
+	    {"/quotedblright",	0201,	0},
+	    {"/quotedblbase",	0202,	0},
+	    {"/quotesinglbase",	0203,	0},
+	    {"/guilsinglleft",	0204,	0},
+	    {"/guilsinglright",	0205,	0},
+	    {"/endash",			0206,	0},
+	    {"/dagger",			0207,	0},
+
+	    {"/daggerdbl",		0210,	0},
+	    {"/trademark",		0211,	0},
+	    {"/bullet",			0212,	0},
+	    {"/perthousand",	0213,	0},
+	    {"/Lslash",			0214,	0},
+	    {"/OE",				0215,	0},
+	    {"/lslash",			0216,	0},
+	    {"/oe",				0217,	0},
 
 	    /* endnonstandard defs */
 
-	"/dotlessi",	0220,	0,
-	    "/grave",		0221,	0,
-	    "/acute",		0222,	0,
-	    "/circumflex",	0223,	0,
-	    "/tilde",		0224,	0,
-	    "/",		0225,	0,
-	    "/breve",		0226,	0,
-	    "/dotaccent",	0227,	0,
-
-	    "/",		0230,	0,
-	    "/",		0231,	0,
-	    "/ring",		0232,	0,
-	    "/",		0233,	0,
-	    "/",		0234,	0,
-	    "/hungarumlaut",	0235,	0,
-	    "/ogonek",		0236,	0,
-	    "/caron",		0237,	0,
-
-	    "/",		0240,	0,
-	    "/exclamdown",	0241,	0,
-	    "/cent",		0242,	0,
-	    "/sterling",	0243,	0,
-	    "/florin",		0244,	0,
-	    "/yen",		0245,	0,
-	    "/brokenbar",	0246,	0,
-	    "/section",		0247,	0,
-
-	    "/dieresis",	0250,	0,
-	    "/copyright",	0251,	0,
-	    "/ordfeminine",	0252,	0,
-	    "/guillemotleft",	0253,	0,
-	    "/logicalnot",	0254,	0,
-	    "/hyphen",		0255,	0,
-	    "/registered",	0256,	0,
-	    "/macron",		0257,	0,
-
-	    "/degree",		0260,	0,
-	    "/plusminus",	0261,	0,
-	    "/twosuperior",	0262,	0,
-	    "/threesuperior",	0263,	0,
-	    "/acute",		0264,	0,
-	    "/mu",		0265,	0,
-	    "/paragraph",	0266,	0,
-	    "/periodcentered",	0267,	0,
-
-	    "/cedilla",		0270,	0,
-	    "/onesuperior",	0271,	0,
-	    "/ordmasculine",	0272,	0,
-	    "/guillemotright",	0273,	0,
-	    "/onequarter",	0274,	0,
-	    "/onehalf",		0275,	0,
-	    "/threequarters",	0276,	0,
-	    "/questiondown",	0277,	0,
-
-	    "/Agrave",		0300,	0,
-	    "/Aacute",		0301,	0,
-	    "/Acircumflex",	0302,	0,
-	    "/Atilde",		0303,	0,
-	    "/Adieresis",	0304,	0,
-	    "/Aring",		0305,	0,
-	    "/AE",		0306,	0,
-	    "/Ccedilla",	0307,	0,
-
-	    "/Egrave",		0310,	0,
-	    "/Eacute",		0311,	0,
-	    "/Ecircumflex",	0312,	0,
-	    "/Edieresis",	0313,	0,
-	    "/Igrave",		0314,	0,
-	    "/Iacute",		0315,	0,
-	    "/Icircumflex",	0316,	0,
-	    "/Idieresis",	0317,	0,
-
-	    "/Eth",		0320,	0,
-	    "/Ntilde",		0321,	0,
-	    "/Ograve",		0322,	0,
-	    "/Oacute",		0323,	0,
-	    "/Ocircumflex",	0324,	0,
-	    "/Otilde",		0325,	0,
-	    "/Odieresis",	0326,	0,
-	    "/multiply",	0327,	0,
-
-	    "/Oslash",		0330,	0,
-	    "/Ugrave",		0331,	0,
-	    "/Uacute",		0332,	0,
-	    "/Ucircumflex",	0333,	0,
-	    "/Udieresis",	0334,	0,
-	    "/Yacute",		0335,	0,
-	    "/Thorn",		0336,	0,
-	    "/germandbls",	0337,	0,
-
-	    "/agrave",		0340,	0,
-	    "/aacute",		0341,	0,
-	    "/acircumflex",	0342,	0,
-	    "/atilde",		0343,	0,
-	    "/adieresis",	0344,	0,
-	    "/aring",		0345,	0,
-	    "/ae",		0346,	0,
-	    "/ccedilla",	0347,	0,
-
-	    "/egrave",		0350,	0,
-	    "/eacute",		0351,	0,
-	    "/ecircumflex",	0352,	0,
-	    "/edieresis",	0353,	0,
-	    "/igrave",		0354,	0,
-	    "/iacute",		0355,	0,
-	    "/icircumflex",	0356,	0,
-	    "/idieresis",	0357,	0,
-
-	    "/eth",		0360,	0,
-	    "/ntilde",		0361,	0,
-	    "/ograve",		0362,	0,
-	    "/oacute",		0363,	0,
-	    "/ocircumflex",	0364,	0,
-	    "/otilde",		0365,	0,
-	    "/odieresis",	0366,	0,
-	    "/divide",		0367,	0,
-
-	    "/oslash",		0370,	0,
-	    "/ugrave",		0371,	0,
-	    "/uacute",		0372,	0,
-	    "/ucircumflex",	0373,	0,
-	    "/udieresis",	0374,	0,
-	    "/yacute",		0375,	0,
-	    "/thorn",		0376,	0,
-	    "/ydieresis",	0377,	0,
+	{"/dotlessi",		0220,	0},
+	    {"/grave",		0221,	0},
+	    {"/acute",		0222,	0},
+	    {"/circumflex",	0223,	0},
+	    {"/tilde",		0224,	0},
+	    {"/",			0225,	0},
+	    {"/breve",		0226,	0},
+	    {"/dotaccent",	0227,	0},
+
+	    {"/",				0230,	0},
+	    {"/",				0231,	0},
+	    {"/ring",			0232,	0},
+	    {"/",				0233,	0},
+	    {"/",				0234,	0},
+	    {"/hungarumlaut",	0235,	0},
+	    {"/ogonek",			0236,	0},
+	    {"/caron",			0237,	0},
+
+	    {"/",			0240,	0},
+	    {"/exclamdown",	0241,	0},
+	    {"/cent",		0242,	0},
+	    {"/sterling",	0243,	0},
+	    {"/florin",		0244,	0},
+	    {"/yen",		0245,	0},
+	    {"/brokenbar",	0246,	0},
+	    {"/section",	0247,	0},
+
+	    {"/dieresis",		0250,	0},
+	    {"/copyright",		0251,	0},
+	    {"/ordfeminine",	0252,	0},
+	    {"/guillemotleft",	0253,	0},
+	    {"/logicalnot",		0254,	0},
+	    {"/hyphen",			0255,	0},
+	    {"/registered",		0256,	0},
+	    {"/macron",			0257,	0},
+
+	    {"/degree",			0260,	0},
+	    {"/plusminus",		0261,	0},
+	    {"/twosuperior",	0262,	0},
+	    {"/threesuperior",	0263,	0},
+	    {"/acute",			0264,	0},
+	    {"/mu",				0265,	0},
+	    {"/paragraph",		0266,	0},
+	    {"/periodcentered",	0267,	0},
+
+	    {"/cedilla",		0270,	0},
+	    {"/onesuperior",	0271,	0},
+	    {"/ordmasculine",	0272,	0},
+	    {"/guillemotright",	0273,	0},
+	    {"/onequarter",		0274,	0},
+	    {"/onehalf",		0275,	0},
+	    {"/threequarters",	0276,	0},
+	    {"/questiondown",	0277,	0},
+
+	    {"/Agrave",			0300,	0},
+	    {"/Aacute",			0301,	0},
+	    {"/Acircumflex",	0302,	0},
+	    {"/Atilde",			0303,	0},
+	    {"/Adieresis",		0304,	0},
+	    {"/Aring",			0305,	0},
+	    {"/AE",				0306,	0},
+	    {"/Ccedilla",		0307,	0},
+
+	    {"/Egrave",			0310,	0},
+	    {"/Eacute",			0311,	0},
+	    {"/Ecircumflex",	0312,	0},
+	    {"/Edieresis",		0313,	0},
+	    {"/Igrave",			0314,	0},
+	    {"/Iacute",			0315,	0},
+	    {"/Icircumflex",	0316,	0},
+	    {"/Idieresis",		0317,	0},
+
+	    {"/Eth",			0320,	0},
+	    {"/Ntilde",			0321,	0},
+	    {"/Ograve",			0322,	0},
+	    {"/Oacute",			0323,	0},
+	    {"/Ocircumflex",	0324,	0},
+	    {"/Otilde",			0325,	0},
+	    {"/Odieresis",		0326,	0},
+	    {"/multiply",		0327,	0},
+
+	    {"/Oslash",		0330,	0},
+	    {"/Ugrave",		0331,	0},
+	    {"/Uacute",		0332,	0},
+	    {"/Ucircumflex",0333,	0},
+	    {"/Udieresis",	0334,	0},
+	    {"/Yacute",		0335,	0},
+	    {"/Thorn",		0336,	0},
+	    {"/germandbls",	0337,	0},
+
+	    {"/agrave",		0340,	0},
+	    {"/aacute",		0341,	0},
+	    {"/acircumflex",0342,	0},
+	    {"/atilde",		0343,	0},
+	    {"/adieresis",	0344,	0},
+	    {"/aring",		0345,	0},
+	    {"/ae",			0346,	0},
+	    {"/ccedilla",	0347,	0},
+
+	    {"/egrave",			0350,	0},
+	    {"/eacute",			0351,	0},
+	    {"/ecircumflex",	0352,	0},
+	    {"/edieresis",		0353,	0},
+	    {"/igrave",			0354,	0},
+	    {"/iacute",			0355,	0},
+	    {"/icircumflex",	0356,	0},
+	    {"/idieresis",		0357,	0},
+
+	    {"/eth",		0360,	0},
+	    {"/ntilde",		0361,	0},
+	    {"/ograve",		0362,	0},
+	    {"/oacute",		0363,	0},
+	    {"/ocircumflex",0364,	0},
+	    {"/otilde",		0365,	0},
+	    {"/odieresis",	0366,	0},
+	    {"/divide",		0367,	0},
+
+	    {"/oslash",		0370,	0},
+	    {"/ugrave",		0371,	0},
+	    {"/uacute",		0372,	0},
+	    {"/ucircumflex",0373,	0},
+	    {"/udieresis",	0374,	0},
+	    {"/yacute",		0375,	0},
+	    {"/thorn",		0376,	0},
+	    {"/ydieresis",	0377,	0},
 };
 
 
 static short STDvsISO [][2] = {
-	0341, 0306, /* AE */
-	0351, 0330, /* Oslash */
-	0302, 0222, /* acute */
-	0361, 0346, /* ae */
-	0306, 0226, /* breve */
-	0317, 0237, /* caron */
-	0313, 0270, /* cedilla */
-	0303, 0223, /* circumflex */
-	0250, 0244, /* currency */
-	0310, 0250, /* dieresis */
-	0307, 0227, /* dotaccent */
-	0365, 0220, /* dotlessi */
-	0373, 0337, /* germandbls */
-	0301, 0221, /* grave */
-	0315, 0235, /* hungarumlaut */
-	0055, 0255, /* hyphen */
-	0305, 0257, /* macron */
-	0316, 0236, /* ogenek */
-	0343, 0252, /* ordfeminine */
-	0353, 0272, /* ordmasculine */
-	0371, 0370, /* oslash */
-	0264, 0267, /* periodcentered */
-	0312, 0232, /* ring */
-	0304, 0224, /* tilde */
+	{0341, 0306}, /* AE */
+	{0351, 0330}, /* Oslash */
+	{0302, 0222}, /* acute */
+	{0361, 0346}, /* ae */
+	{0306, 0226}, /* breve */
+	{0317, 0237}, /* caron */
+	{0313, 0270}, /* cedilla */
+	{0303, 0223}, /* circumflex */
+	{0250, 0244}, /* currency */
+	{0310, 0250}, /* dieresis */
+	{0307, 0227}, /* dotaccent */
+	{0365, 0220}, /* dotlessi */
+	{0373, 0337}, /* germandbls */
+	{0301, 0221}, /* grave */
+	{0315, 0235}, /* hungarumlaut */
+	{0055, 0255}, /* hyphen */
+	{0305, 0257}, /* macron */
+	{0316, 0236}, /* ogenek */
+	{0343, 0252}, /* ordfeminine */
+	{0353, 0272}, /* ordmasculine */
+	{0371, 0370}, /* oslash */
+	{0264, 0267}, /* periodcentered */
+	{0312, 0232}, /* ring */
+	{0304, 0224}, /* tilde */
 };
 
 /* from objfont.c, rest is in lfm_s !!*/