Skip to content
This repository

2013mar26 authors #482

Merged
merged 6 commits into from about 1 year ago

3 participants

Joe Yi Yang Rajeesh K Nambiar
Joe
Collaborator

...eventually pull this in before prep+build, may add more authors if have time to check.

...currently stopped reading at git commit authors+comments 2002-02-14
...long-way yet to go.

and others added some commits
Joe Check if using older libuninameslist library or using newer version now 1cbb24c
Joe bitmapview.c backwards compatibility with older libuninameslist e5c065e
Rajeesh K Nambiar Opentype script tag for Malayalam v.2 is mlm2.
The interface still shows incorrect mly2. This complements
b13ee26 which fixed certain cases.
355d917
Joe fontview.c #ifdef cuts-out too much inside if (done) statements.
My error. This Corrects error in applying #ifdef conditional compilation
when no library is found or if ./configure. --without-libuni___ specified.
Popups were blank when no library present, and the elseif was not followed
because endif was applied to exclude entire "if (uni!=-1)" branch.
Problem appeared in Mac binary version with this example:
fontforge#401 (comment)
285b6e6
Joe Merge remote-tracking branch 'upstream/master' c363a11
Joe More credits, stopped reading at git 2002-02-14 for now...
..also include some very recent authors before making the next prep+build
727437f
Yi Yang
Collaborator

Did you mean "2012-02-14"? 2002 seems a bit too ancient...

Joe
Collaborator
Joe JoesCat merged commit 403d2e2 into from
Joe JoesCat closed this
Joe JoesCat deleted the branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 6 unique commits by 2 authors.

Mar 23, 2013
Joe Check if using older libuninameslist library or using newer version now 1cbb24c
Mar 24, 2013
Joe bitmapview.c backwards compatibility with older libuninameslist e5c065e
Rajeesh K Nambiar Opentype script tag for Malayalam v.2 is mlm2.
The interface still shows incorrect mly2. This complements
b13ee26 which fixed certain cases.
355d917
Mar 26, 2013
Joe fontview.c #ifdef cuts-out too much inside if (done) statements.
My error. This Corrects error in applying #ifdef conditional compilation
when no library is found or if ./configure. --without-libuni___ specified.
Popups were blank when no library present, and the elseif was not followed
because endif was applied to exclude entire "if (uni!=-1)" branch.
Problem appeared in Mac binary version with this example:
fontforge#401 (comment)
285b6e6
Joe Merge remote-tracking branch 'upstream/master' c363a11
Joe More credits, stopped reading at git 2002-02-14 for now...
..also include some very recent authors before making the next prep+build
727437f
This page is out of date. Refresh to see the latest.
10  AUTHORS
@@ -6,22 +6,27 @@ Arthaey Angosii
6 6
 Alexey Kryukov - nowakowskittfinstr.c
7 7
 Alexandre Prokoudine
8 8
 Barry Schwartz
9  
-Baruch Even - (debian upstream)
  9
+Baruch Even - (debian upstream) baruch
10 10
 Ben Martin - hotkeys.c, hotkeys.h
11 11
 Craig Lennox
  12
+Dave Crossland
12 13
 Deron Meranda
13 14
 Dave Levine
14 15
 Dong Yang
15 16
 Edward Lee
  17
+Frank Trampe
16 18
 Georg Duffner
17 19
 J. Jansen - gv - ANALYZE_MAP.COM
18 20
 Jason Pagura
19 21
 Johannes Plass - gv = ANALYZE_MAP.COM
  22
+Jon Banquer
20 23
 Jonathan Hanna
21 24
 Jonathan Hue
  25
+Jose Da Silva
22 26
 Joshua Richardson
23 27
 KANOU
24 28
 Kemie Guaida - Tango PixMaps
  29
+Kevin Fenzi
25 30
 Khaled Hosny
26 31
 Lu Wang
27 32
 Matthew Petroff
@@ -31,13 +36,16 @@ Michal Mazurek
31 36
 Michal Nowakowski - nowakowskittfinstr.c
32 37
 Qmpel
33 38
 R.L. Horn
  39
+Rajeesh K Nambiar
34 40
 Scott Pakin - Packaging
35 41
 serval2412
36 42
 Steve White - ASMO 708 codepage, & more
37 43
 Timothy O. Theisen - gv = ANALYZE_MAP.COM
38 44
 Tom Harvey - fontforge.1
  45
+Tom Lechner
39 46
 Ulrich Klauer
40 47
 Valek Filippov
  48
+Vernon Adams
41 49
 Ville Skytta
42 50
 Werner Lemberg
43 51
 yannis
19  fontforge/bitmapview.c
@@ -186,18 +186,33 @@ static char *BVMakeTitles(BitmapView *bv, BDFChar *bc,char *buf) {
186 186
 	    sc!=NULL ? sc->name : "<Nameless>", bv->enc, bdf->pixelsize, sc==NULL ? "" : sc->parent->fontname);
187 187
     title = copy(buf);
188 188
 #if _NO_LIBUNINAMESLIST && _NO_LIBUNICODENAMES
  189
+    /* no nameslist library code */
189 190
 #else
190 191
     const char *uniname;
191 192
 #ifndef _NO_LIBUNINAMESLIST
  193
+#ifndef _LIBUNINAMESLIST_FUN
  194
+    /* old libuninameslist library code */
  195
+    if ( sc->unicodeenc!=-1 && sc->unicodeenc<0x110000 && UnicodeNameAnnot!=NULL &&
  196
+	    UnicodeNameAnnot[sc->unicodeenc>>16][(sc->unicodeenc>>8)&0xff][sc->unicodeenc&0xff].name!=NULL ) {
  197
+	strcat(buf, " ");
  198
+	strcpy(buf+strlen(buf), UnicodeNameAnnot[sc->unicodeenc>>16][(sc->unicodeenc>>8)&0xff][sc->unicodeenc&0xff].name);
  199
+    }
  200
+#else
  201
+    /* new libuninameslist library code */
192 202
     if ( (uniname=uniNamesList_name(sc->unicodeenc))!=NULL ) {
  203
+	strcat(buf, " ");
  204
+	strcpy(buf+strlen(buf), uniname);
  205
+    }
  206
+#endif
193 207
 #else
  208
+    /* libunicodesnames library code */
194 209
     if ( sc->unicodeenc!=-1 && (uniname=uninm_name(names_db,(unsigned int) sc->unicodeenc))!= NULL) {
195  
-#endif
196 210
 	strcat(buf, " ");
197 211
 	strcpy(buf+strlen(buf), uniname);
198 212
     }
199 213
 #endif
200  
-return( title );
  214
+#endif
  215
+    return( title );
201 216
 }
202 217
 
203 218
 void BVChangeBC(BitmapView *bv, BDFChar *bc, int fitit ) {
23  fontforge/fontview.c
@@ -6220,12 +6220,9 @@ static void FVExpose(FontView *fv,GWindow pixmap, GEvent *event) {
6220 6220
     GDrawSetDither(NULL, true);
6221 6221
 }
6222 6222
 
6223  
-#if _NO_LIBUNINAMESLIST && _NO_LIBUNICODENAMES
6224  
-#else
6225 6223
 static char *chosung[] = { "G", "GG", "N", "D", "DD", "L", "M", "B", "BB", "S", "SS", "", "J", "JJ", "C", "K", "T", "P", "H", NULL };
6226 6224
 static char *jungsung[] = { "A", "AE", "YA", "YAE", "EO", "E", "YEO", "YE", "O", "WA", "WAE", "OE", "YO", "U", "WEO", "WE", "WI", "YU", "EU", "YI", "I", NULL };
6227 6225
 static char *jongsung[] = { "", "G", "GG", "GS", "N", "NJ", "NH", "D", "L", "LG", "LM", "LB", "LS", "LT", "LP", "LH", "M", "B", "BS", "S", "SS", "NG", "J", "C", "K", "T", "P", "H", NULL };
6228  
-#endif
6229 6226
 
6230 6227
 void FVDrawInfo(FontView *fv,GWindow pixmap, GEvent *event) {
6231 6228
     GRect old, r;
@@ -6301,10 +6298,10 @@ return;
6301 6298
 	fg = 0x707070;
6302 6299
     }
6303 6300
 
  6301
+    if (uni != -1) {
6304 6302
 #if _NO_LIBUNINAMESLIST && _NO_LIBUNICODENAMES
6305 6303
 #else
6306 6304
     /* Get unicode "Name" as defined in NameList.txt */
6307  
-    if (uni != -1) {
6308 6305
 	const char *uniname;
6309 6306
 #ifndef _NO_LIBUNINAMESLIST
6310 6307
 	if ( (uniname=uniNamesList_name(uni))!=NULL ) {
@@ -6312,9 +6309,9 @@ return;
6312 6309
         if ( (uniname=uninm_name(names_db,(unsigned int) uni))!= NULL ) {;
6313 6310
 #endif
6314 6311
 	    utf82u_strncpy(ubuffer+u_strlen(ubuffer),uniname,80);
6315  
-//	    strncat(buffer,uniname,80);
6316  
-	} else if ( uni>=0xAC00 && uni<=0xD7A3 ) {
6317  
-//	    sprintf( buffer+strlen(buffer), "Hangul Syllable %s%s%s",
  6312
+	} else
  6313
+#endif
  6314
+	if ( uni>=0xAC00 && uni<=0xD7A3 ) {
6318 6315
             sprintf( buffer, "Hangul Syllable %s%s%s",
6319 6316
 		    chosung[(uni-0xAC00)/(21*28)],
6320 6317
 		    jungsung[(uni-0xAC00)/28%21],
@@ -6322,10 +6319,8 @@ return;
6322 6319
             uc_strncat(ubuffer,buffer,80);
6323 6320
 	} else {
6324 6321
             uc_strncat(ubuffer, UnicodeRange(uni),80);
6325  
-//	    strncat(buffer, UnicodeRange(uni),80);
6326 6322
 	}
6327 6323
     }
6328  
-#endif
6329 6324
 
6330 6325
     tlen = GDrawDrawText(pixmap,10,fv->mbh+fv->lab_as,ubuffer,ulen,fvglyphinfocol);
6331 6326
     GDrawDrawText(pixmap,10+tlen,fv->mbh+fv->lab_as,ubuffer+ulen,-1,fg);
@@ -6588,11 +6583,10 @@ void SCPreparePopup(GWindow gw,SplineChar *sc,struct remap *remap, int localenc,
6588 6583
 	done = true;
6589 6584
     }
6590 6585
 
  6586
+    if ( !done ) {
6591 6587
 #if _NO_LIBUNINAMESLIST && _NO_LIBUNICODENAMES
6592 6588
 #else
6593 6589
     const char *uniname;
6594  
-    const char *uniannot;
6595  
-    if ( !done ) {
6596 6590
 #ifndef _NO_LIBUNINAMESLIST
6597 6591
 	if ( (uniname=uniNamesList_name(upos))!=NULL ) {
6598 6592
 #else
@@ -6607,7 +6601,9 @@ void SCPreparePopup(GWindow gw,SplineChar *sc,struct remap *remap, int localenc,
6607 6601
                       uniname);
6608 6602
 #endif
6609 6603
             utf82u_strcpy(space,cspace);
6610  
-        } else if ( upos>=0xAC00 && upos<=0xD7A3 ) {
  6604
+        } else
  6605
+#endif
  6606
+	if ( upos>=0xAC00 && upos<=0xD7A3 ) {
6611 6607
 #if defined( _NO_SNPRINTF )
6612 6608
             sprintf( cspace, "%u 0x%x U+%04x \"%.25s\" Hangul Syllable %s%s%s",
6613 6609
                      localenc, localenc, upos, sc->name==NULL?"":sc->name,
@@ -6633,6 +6629,9 @@ void SCPreparePopup(GWindow gw,SplineChar *sc,struct remap *remap, int localenc,
6633 6629
             utf82u_strcpy(space,cspace);
6634 6630
         }
6635 6631
     }
  6632
+#if _NO_LIBUNINAMESLIST && _NO_LIBUNICODENAMES
  6633
+#else
  6634
+    const char *uniannot;
6636 6635
 #ifndef _NO_LIBUNINAMESLIST
6637 6636
     if ( (uniannot=uniNamesList_name(upos))!=NULL ) {
6638 6637
 #else
2  fontforge/lookupui.c
@@ -236,7 +236,7 @@ GTextInfo scripts[] = {
236 236
     { (unichar_t *) N_("Script|Mandaean"), NULL, 0, 0, (void *) CHR('m','a','n','d'), NULL, 0, 0, 0, 0, 0, 0, 1, 0, 0, '\0'},
237 237
 /*  { (unichar_t *) N_("Mayan hieroglyphs"), NULL, 0, 0, (void *) CHR('m','a','y','a'), NULL, 0, 0, 0, 0, 0, 0, 1, 0, 0, '\0'},*/
238 238
     { (unichar_t *) NU_("Script|Malayālam"), NULL, 0, 0, (void *) CHR('m','l','y','m'), NULL, 0, 0, 0, 0, 0, 0, 1, 0, 0, '\0'},
239  
-    { (unichar_t *) NU_("Script|Malayālam2"), NULL, 0, 0, (void *) CHR('m','l','y','2'), NULL, 0, 0, 0, 0, 0, 0, 1, 0, 0, '\0'},
  239
+    { (unichar_t *) NU_("Script|Malayālam2"), NULL, 0, 0, (void *) CHR('m','l','m','2'), NULL, 0, 0, 0, 0, 0, 0, 1, 0, 0, '\0'},
240 240
     { (unichar_t *) NU_("Mathematical Alphanumeric Symbols"), NULL, 0, 0, (void *) CHR('m','a','t','h'), NULL, 0, 0, 0, 0, 0, 0, 1, 0, 0, '\0'},
241 241
     { (unichar_t *) N_("Script|Mongolian"), NULL, 0, 0, (void *) CHR('m','o','n','g'), NULL, 0, 0, 0, 0, 0, 0, 1, 0, 0, '\0'},
242 242
     { (unichar_t *) N_("Musical"), NULL, 0, 0, (void *) CHR('m','u','s','i'), NULL, 0, 0, 0, 0, 0, 0, 1, 0, 0, '\0'},
2  fontforge/tottfaat.c
@@ -2268,7 +2268,7 @@ int16 *PerGlyphDefBaseline(SplineFont *sf,int *def_baseline) {
2268 2268
 		    script == CHR('g','u','j','r' ) || script == CHR('g','j','r','2') ||
2269 2269
 		    script == CHR('g','u','r','u' ) || script == CHR('g','u','r','2') ||
2270 2270
 		    script == CHR('k','n','d','a' ) || script == CHR('k','n','d','2') ||
2271  
-		    script == CHR('m','l','y','m' ) || script == CHR('m','l','y','2') ||
  2271
+		    script == CHR('m','l','y','m' ) || script == CHR('m','l','m','2') ||
2272 2272
 		    script == CHR('o','r','y','a' ) || script == CHR('o','r','y','2') ||
2273 2273
 		    script == CHR('t','a','m','l' ) || script == CHR('t','m','l','2') ||
2274 2274
 		    script == CHR('t','e','l','u' ) || script == CHR('t','e','l','2'))
6  m4/fontforge_arg_with.m4
@@ -33,6 +33,7 @@ AC_DEFUN([FONTFORGE_ARG_WITH],
33 33
 
34 34
 dnl FONTFORGE_ARG_WITH_LIBNAMESLIST
35 35
 dnl -------------------------------
  36
+dnl Check if libuninameslist exists, and if yes, then also see if it has 2 newer functions in it
36 37
 AC_DEFUN([FONTFORGE_ARG_WITH_LIBUNINAMESLIST],
37 38
 [
38 39
    FONTFORGE_ARG_WITH_BASE([libuninameslist],
@@ -41,11 +42,12 @@ AC_DEFUN([FONTFORGE_ARG_WITH_LIBUNINAMESLIST],
41 42
       [FONTFORGE_WARN_PKG_NOT_FOUND([LIBUNINAMESLIST])],
42 43
       [_NO_LIBUNINAMESLIST],
43 44
       [
44  
-       FONTFORGE_SEARCH_LIBS([uniNamesList_name],[uninameslist],
  45
+       FONTFORGE_SEARCH_LIBS([UnicodeNameAnnot],[uninameslist],
45 46
          [i_do_have_libuninameslist=yes
46 47
           AC_SUBST([LIBUNINAMESLIST_CFLAGS],[""])
47 48
           AC_SUBST([LIBUNINAMESLIST_LIBS],["${found_lib}"])
48  
-          FONTFORGE_WARN_PKG_FALLBACK([LIBUNINAMESLIST])],
  49
+          AC_CHECK_FUNC([uniNamesList_name],[AC_DEFINE([_LIBUNINAMESLIST_FUN],
  50
+                        [1],[Libuninameslist library has 2 new functions.])])],
49 51
          [i_do_have_libuninameslist=no])
50 52
        ])
51 53
 ])
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.