Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[10898] trunk
|
From: <ai...@us...> - 2010-04-11 05:05:54
|
Revision: 10898
http://plplot.svn.sourceforge.net/plplot/?rev=10898&view=rev
Author: airwin
Date: 2010-04-11 05:05:48 +0000 (Sun, 11 Apr 2010)
Log Message:
-----------
Add some minimal documentation of buffer (subbuffer); findex (subindex); and
hersh (subhersh); that are used throughout fonts/font??. to define the
Hershey fonts and various indexing schemes for them that are used
by Plplot.
Add underscore glyph in Hershey fonts. Thanks to David MacMahon for
the implementation.
Move underscore position from 590 (which matched PGplot) to 795. This
changes the corresponding shortened index position of the underscore in the
standard fonts from 51 to 133. This change results in a much more logical
layout of the standard font that is displayed in first two pages of example
7. 795 is also a reasonable position for the underscore in the extended
Hershey font index which is displayed by the remaining pages of example 7
(see especially page 6 of that example).
Modified Paths:
--------------
trunk/data/plstnd5.fnt
trunk/data/plxtnd5.fnt
trunk/fonts/font01.c
trunk/fonts/font11.c
Modified: trunk/data/plstnd5.fnt
===================================================================
(Binary files differ)
Modified: trunk/data/plxtnd5.fnt
===================================================================
(Binary files differ)
Modified: trunk/fonts/font01.c
===================================================================
--- trunk/fonts/font01.c 2010-04-10 16:40:14 UTC (rev 10897)
+++ trunk/fonts/font01.c 2010-04-11 05:05:48 UTC (rev 10898)
@@ -5,6 +5,14 @@
*
*/
+// buffer (defined by subbuffer??) contains coordinates describing the
+// Hershey glyphs; findex (defined by subindex??) indexes those glyphs
+// by Hershey index position; and hersh (defined by subhersh?)
+// indexes the Hershey index by the plpoint "ascii" index that in the
+// range from 0 to 31 points to Hershey indices that point to useful
+// plotting symbols and from 32 to 126 indexes Hershey indices that
+// point to ascii printable characters.
+
/* short int findex[3000] */
/* short int buffer[27000] */
/* short int hersh[0:175,4] */
@@ -230,7 +238,7 @@
3499, 3541, 3573, 3621, 3656, 3688, 3722, 3757, 3798, 3829,
3857, 3893, 3928, 3956, 3995, 4036, 0, 0, 0, 0,
0, 0, 4079, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
short int subindex06[100] = {
4091, 4112, 4133, 4151, 4172, 4193, 4205, 4231, 4245, 4257,
@@ -254,7 +262,7 @@
6894, 6903, 6913, 6923, 6947, 6971, 7005, 7030, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 7063, 7069, 7075, 7081, 7087
+ 0, 0, 0, 0,26692, 7063, 7069, 7075, 7081, 7087
};
short int subindex08[100] = {
7093, 7099, 7105, 7111, 7117, 7123, 7129, 7135, 7141, 7147,
Modified: trunk/fonts/font11.c
===================================================================
--- trunk/fonts/font11.c 2010-04-10 16:40:14 UTC (rev 10897)
+++ trunk/fonts/font11.c 2010-04-11 05:05:48 UTC (rev 10898)
@@ -207,7 +207,7 @@
7362, 7361, 7487, 7870, 8766, 64, 7877, 7620, 7490, 7489,
7615, 7870, 64, 8510, 8125, 7996, 7736, 7607, 64, 8510,
8253, 8124, 7864, 7735, 7479, 7352, 7226, 64, 8375, 9271,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ 0, -16, 7116, 7114, 7093, 9397, 0, 0, 0, 0
};
short int subbuffer267[100] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -256,7 +256,7 @@
2241, 726, 2242, 715, 2273, 501, 502, 503, 504, 505,
506, 507, 508, 509, 510, 511, 512, 513, 514, 515,
516, 517, 518, 519, 520, 521, 522, 523, 524, 525,
- 526, 2223, 804, 2224, 832, 590, 2249, 601, 602, 603,
+ 526, 2223, 804, 2224, 832, 795, 2249, 601, 602, 603,
604, 605, 606, 607, 608, 609, 610, 611, 612, 613,
614, 615, 616, 617, 618, 619, 620, 621, 622, 623,
624, 625, 626, 2225, 723, 2226, 2246, 699, 527, 528,
@@ -276,7 +276,7 @@
2241, 2238, 2242, 2215, 2273, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025,
- 2026, 2223, 804, 2224, 832, 590, 2249, 2101, 2102, 2103,
+ 2026, 2223, 804, 2224, 832, 795, 2249, 2101, 2102, 2103,
2104, 2105, 2106, 2107, 2108, 2109, 2110, 2111, 2112, 2113,
2114, 2115, 2116, 2117, 2118, 2119, 2120, 2121, 2122, 2123,
2124, 2125, 2126, 2225, 2229, 2226, 2246, 2199, 2027, 2028,
@@ -296,7 +296,7 @@
2241, 2776, 2242, 2765, 2273, 2051, 2052, 2053, 2054, 2055,
2056, 2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065,
2066, 2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075,
- 2076, 2223, 804, 2224, 832, 590, 2249, 2151, 2152, 2153,
+ 2076, 2223, 804, 2224, 832, 795, 2249, 2151, 2152, 2153,
2154, 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163,
2164, 2165, 2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173,
2174, 2175, 2176, 2225, 2229, 2226, 2246, 2199, 2027, 2028,
@@ -316,7 +316,7 @@
2241, 2776, 2242, 2765, 2273, 2551, 2552, 2553, 2554, 2555,
2556, 2557, 2558, 2559, 2560, 2561, 2562, 2563, 2564, 2565,
2566, 2567, 2568, 2569, 2570, 2571, 2572, 2573, 2574, 2575,
- 2576, 2223, 804, 2224, 832, 590, 2249, 2651, 2652, 2653,
+ 2576, 2223, 804, 2224, 832, 795, 2249, 2651, 2652, 2653,
2654, 2655, 2656, 2657, 2658, 2659, 2660, 2661, 2662, 2663,
2664, 2665, 2666, 2667, 2668, 2669, 2670, 2671, 2672, 2673,
2674, 2675, 2676, 2225, 2229, 2226, 2246, 2199, 2027, 2028,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
