• R/O
  • SSH
  • HTTPS

tsukurimashou: Commit


Commit MetaInfo

Revision500 (tree)
Time2014-03-02 16:18:25
Authormskala

Log Message

some "two-branch tree" kanji, and FontAnvil preparedness

Change Summary

Incremental Difference

--- trunk/ocr/configure.ac (revision 499)
+++ trunk/ocr/configure.ac (revision 500)
@@ -194,7 +194,7 @@
194194 parallel-tests silent-rules])
195195 AC_CONFIG_SRCDIR([msk-ocra.mp])
196196 AC_CONFIG_MACRO_DIR([m4])
197-AC_REVISION([$Id: configure.ac 2019 2013-03-09 21:44:02Z mskala $])
197+AC_REVISION([$Id: configure.ac 2831 2014-03-02 07:18:54Z mskala $])
198198 AC_COPYRIGHT([public domain])
199199 AC_SUBST([release_date],["March 7, 2013"])
200200 AM_SILENT_RULES
@@ -213,8 +213,8 @@
213213 AC_ARG_VAR([EXPECT],[Expect])
214214 AC_PATH_PROG([EXPECT],[expect])
215215 AM_CONDITIONAL([COND_EXPECT],[test '!' "x$EXPECT" = "x"])
216-AC_ARG_VAR([FONTFORGE],[Fontforge])
217-AC_PATH_PROG([FONTFORGE],[fontforge])
216+AC_ARG_VAR([FONTANVIL],[FontAnvil])
217+AC_PATH_PROGS([FONTANVIL],[fontanvil fontforge])
218218 AX_CHECK_GNU_MAKE
219219 AC_ARG_VAR([KLEKNEV],[Kleknev])
220220 AC_PATH_PROG([KLEKNEV],[kleknev],[/bin/sh],[$PATH:$PWD/../kleknev])
@@ -287,10 +287,10 @@
287287 [enable_silent_rules=yes
288288 AM_DEFAULT_VERBOSITY=0])
289289 #
290-AC_MSG_CHECKING([whether FontForge accepts AddExtrema(1)])
291-echo '#!/usr/local/bin/fontforge' > ffaetest.pe
290+AC_MSG_CHECKING([whether FontAnvil accepts AddExtrema(1)])
291+echo '#!/usr/local/bin/fontanvil' > ffaetest.pe
292292 echo 'New();AddExtrema(1);' >> ffaetest.pe
293-AS_IF([$FONTFORGE ffaetest.pe >& /dev/null],
293+AS_IF([$FONTANVIL ffaetest.pe >& /dev/null],
294294 [ae_arg_okay=yes],[ae_arg_okay=no])
295295 rm ffaetest.pe
296296 AC_SUBST([ae_arg_okay])
--- trunk/ocr/Makefile.am (revision 499)
+++ trunk/ocr/Makefile.am (revision 500)
@@ -221,7 +221,8 @@
221221 msk-ocrb10xbg.pfb: msk-ocrb10xbg.mp msk-ocrbdef.mp msk-ocrbmac.mp
222222
223223 %.rmo: %.pfb rmo.pe
224- $(AM_V_at)$(TSU_V_RMO)$(FONTFORGE) $(mvp)/rmo.pe $*.pfb $(TSU_V_REDIR)
224+ $(AM_V_at)$(TSU_V_RMO)$(FONTANVIL) -lang=ff -script \
225+ $(mvp)/rmo.pe $*.pfb $(TSU_V_REDIR)
225226 $(AM_V_at)touch $*.rmo
226227
227228 msk-ocra10.rmo: msk-ocra10.pfb
@@ -250,13 +251,13 @@
250251
251252 OCRA.pfb OCRA.afm OCRA.ttf OCRA.otf: msk-ocra10.rmo \
252253 ocra-@ae_arg_okay@.pe ocra.fea
253- $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
254+ $(AM_V_at)$(TSU_V_OTF)$(FONTANVIL) -lang=ff -script \
254255 $(mvp)/ocra-@ae_arg_okay@.pe \
255256 $(mvp)/ocra.fea $(TSU_V_REDIR)
256257
257258 OCRB.pfb OCRB.afm OCRB.ttf OCRB.otf: \
258259 msk-ocrb10.rmo ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
259- $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
260+ $(AM_V_at)$(TSU_V_OTF)$(FONTANVIL) -lang=ff -script \
260261 $(mvp)/ocrb-@ae_arg_okay@.pe '' '' "Regular" 0 \
261262 $(mvp)/ocrb.fea $(TSU_V_REDIR)
262263
@@ -263,7 +264,7 @@
263264 OCRBE.pfb OCRBE.afm OCRBE.ttf OCRBE.otf: \
264265 msk-ocrb10efg.rmo msk-ocrb10ebg.rmo \
265266 ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
266- $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
267+ $(AM_V_at)$(TSU_V_OTF)$(FONTANVIL) -lang=ff -script \
267268 $(mvp)/ocrb-@ae_arg_okay@.pe 'e' 'E' "Inverted Sharp" 1 \
268269 $(mvp)/ocrb.fea $(TSU_V_REDIR)
269270
@@ -270,25 +271,25 @@
270271 OCRBF.pfb OCRBF.afm OCRBF.ttf OCRBF.otf: \
271272 msk-ocrb10ffg.rmo msk-ocrb10fbg.rmo \
272273 ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
273- $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
274+ $(AM_V_at)$(TSU_V_OTF)$(FONTANVIL) -lang=ff -script \
274275 $(mvp)/ocrb-@ae_arg_okay@.pe 'f' 'F' "Outline" 1 \
275276 $(mvp)/ocrb.fea $(TSU_V_REDIR)
276277
277278 OCRBG.pfb OCRBG.afm OCRBG.ttf OCRBG.otf: \
278279 msk-ocrb10g.rmo ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
279- $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
280+ $(AM_V_at)$(TSU_V_OTF)$(FONTANVIL) -lang=ff -script \
280281 $(mvp)/ocrb-@ae_arg_okay@.pe 'g' 'G' "Slanted Outline" 0 \
281282 $(mvp)/ocrb.fea $(TSU_V_REDIR)
282283
283284 OCRBL.pfb OCRBL.afm OCRBL.ttf OCRBL.otf: \
284285 msk-ocrb10l.rmo ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
285- $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
286+ $(AM_V_at)$(TSU_V_OTF)$(FONTANVIL) -lang=ff -script \
286287 $(mvp)/ocrb-@ae_arg_okay@.pe 'l' 'L' "Slanted" 0 \
287288 $(mvp)/ocrb.fea $(TSU_V_REDIR)
288289
289290 OCRBS.pfb OCRBS.afm OCRBS.ttf OCRBS.otf: \
290291 msk-ocrb10s.rmo ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
291- $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
292+ $(AM_V_at)$(TSU_V_OTF)$(FONTANVIL) -lang=ff -script \
292293 $(mvp)/ocrb-@ae_arg_okay@.pe 's' 'S' "Sharp" 0 \
293294 $(mvp)/ocrb.fea $(TSU_V_REDIR)
294295
@@ -295,7 +296,7 @@
295296 OCRBX.pfb OCRBX.afm OCRBX.ttf OCRBX.otf: \
296297 msk-ocrb10xfg.rmo msk-ocrb10xbg.rmo \
297298 ocrb-@ae_arg_okay@.pe ocrbnames.pe ocrb.fea
298- $(AM_V_at)$(TSU_V_OTF)$(FONTFORGE) \
299+ $(AM_V_at)$(TSU_V_OTF)$(FONTANVIL) -lang=ff -script \
299300 $(mvp)/ocrb-@ae_arg_okay@.pe 'x' 'X' "Inverted" 1 \
300301 $(mvp)/ocrb.fea $(TSU_V_REDIR)
301302
@@ -311,7 +312,7 @@
311312 # TESTING
312313
313314 TESTS = $(dist_otf_DATA) $(dist_ttf_DATA) $(dist_type1_DATA)
314-LOG_COMPILER = $(FONTFORGE) fontlint.pe
315+LOG_COMPILER = $(FONTANVIL) -lang=ff -script fontlint.pe
315316
316317 ############################################################################
317318
--- trunk/kerner/kerner.c (revision 499)
+++ trunk/kerner/kerner.c (revision 500)
@@ -557,7 +557,7 @@
557557 exit(9);
558558
559559 fprintf(pe,
560- "#!/usr/local/bin/fontforge\n\n"
560+ "#!/usr/local/bin/fontanvil\n\n"
561561 "# GENERATED FILE - DO NOT EDIT\n"
562562 "# Edit the kerner program that generates this, "
563563 "or its input, instead.\n\n"
--- trunk/beikaitoru/configure.ac (revision 499)
+++ trunk/beikaitoru/configure.ac (revision 500)
@@ -208,7 +208,7 @@
208208 parallel-tests silent-rules])
209209 AC_CONFIG_SRCDIR([subfont.mp])
210210 AC_CONFIG_MACRO_DIR([m4])
211-AC_REVISION([$Id: configure.ac 2019 2013-03-09 21:44:02Z mskala $])
211+AC_REVISION([$Id: configure.ac 2831 2014-03-02 07:18:54Z mskala $])
212212 AC_COPYRIGHT([Copyright (C) 2013 Matthew Skala])
213213 AC_SUBST([release_date],["March 7, 2013"])
214214 AM_SILENT_RULES
@@ -227,8 +227,8 @@
227227 AC_ARG_VAR([EXPECT],[Expect])
228228 AC_PATH_PROG([EXPECT],[expect])
229229 AM_CONDITIONAL([COND_EXPECT],[test '!' "x$EXPECT" = "x"])
230-AC_ARG_VAR([FONTFORGE],[Fontforge])
231-AC_PATH_PROG([FONTFORGE],[fontforge])
230+AC_ARG_VAR([FONTANVIL],[FontAnvil])
231+AC_PATH_PROGS([FONTANVIL],[fontanvil fontforge])
232232 AX_CHECK_GNU_MAKE
233233 AC_ARG_VAR([KLEKNEV],[Kleknev])
234234 AC_PATH_PROG([KLEKNEV],[kleknev],[/bin/sh],[$PATH:$PWD/../kleknev])
@@ -301,10 +301,10 @@
301301 [enable_silent_rules=yes
302302 AM_DEFAULT_VERBOSITY=0])
303303 #
304-AC_MSG_CHECKING([whether FontForge accepts AddExtrema(1)])
305-echo '#!/usr/local/bin/fontforge' > ffaetest.pe
304+AC_MSG_CHECKING([whether FontAnvil accepts AddExtrema(1)])
305+echo '#!/usr/local/bin/fontanvil' > ffaetest.pe
306306 echo 'New();AddExtrema(1);' >> ffaetest.pe
307-AS_IF([$FONTFORGE ffaetest.pe >& /dev/null],
307+AS_IF([$FONTANVIL ffaetest.pe >& /dev/null],
308308 [ae_arg_okay=yes],[ae_arg_okay=no])
309309 rm ffaetest.pe
310310 AC_SUBST([ae_arg_okay])
--- trunk/beikaitoru/Makefile.am (revision 499)
+++ trunk/beikaitoru/Makefile.am (revision 500)
@@ -247,7 +247,8 @@
247247
248248 pfb/$(1).pfb: pfbtmp/$(1).pfb pfb/.dirstamp pe/rmo.pe
249249 $$(AM_V_at)$$(TSU_V_RMO) \
250- $$(FONTFORGE) $$(mvp)/pe/rmo.pe pfbtmp/$(1).pfb pfb/$(1).pfb \
250+ $$(FONTANVIL) -lang=ff -script \
251+ $$(mvp)/pe/rmo.pe pfbtmp/$(1).pfb pfb/$(1).pfb \
251252 $$(TSU_V_REDIR)
252253 endef
253254
@@ -269,7 +270,8 @@
269270 pfb/$(1).4.pfb pfb/$(1).5.pfb pfb/$(1).6.pfb pfb/$(1).7.pfb \
270271 pfb/$(1).8.pfb pfb/$(1).9.pfb
271272 $(AM_V_at)$$(TSU_V_SFD) \
272- $(FONTFORGE) $(mvp)/pe/merge.pe $(1) @ae_arg_okay@ \
273+ $(FONTANVIL) -lang=ff -script \
274+ $(mvp)/pe/merge.pe $(1) @ae_arg_okay@ \
273275 $(TSU_V_REDIR)
274276 endef
275277
@@ -282,52 +284,52 @@
282284 define OTF_RECIPES
283285 otf/Beikaitoru$(1)0$(2).otf: otf/.dirstamp merged/$(2).sfd pe/otf-$(1)00.pe
284286 $(AM_V_at)$$(TSU_V_OTF) \
285- $(FONTFORGE) $(mvp)/pe/otf-$(1)00.pe $(2) \
287+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)00.pe $(2) \
286288 $(TSU_V_REDIR)
287289
288290 otf/Beikaitoru$(1)1$(2).otf: otf/.dirstamp merged/1$(2).sfd pe/otf-$(1)00.pe
289291 $(AM_V_at)$$(TSU_V_OTF) \
290- $(FONTFORGE) $(mvp)/pe/otf-$(1)00.pe 1$(2) \
292+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)00.pe 1$(2) \
291293 $(TSU_V_REDIR)
292294
293295 otf/Beikaitoru$(1)2$(2).otf: otf/.dirstamp merged/2$(2).sfd pe/otf-$(1)00.pe
294296 $(AM_V_at)$$(TSU_V_OTF) \
295- $(FONTFORGE) $(mvp)/pe/otf-$(1)00.pe 2$(2) \
297+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)00.pe 2$(2) \
296298 $(TSU_V_REDIR)
297299
298300 otf/Beikaitoru$(1)3$(2).otf: otf/.dirstamp merged/3$(2).sfd pe/otf-$(1)00.pe
299301 $(AM_V_at)$$(TSU_V_OTF) \
300- $(FONTFORGE) $(mvp)/pe/otf-$(1)00.pe 3$(2) \
302+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)00.pe 3$(2) \
301303 $(TSU_V_REDIR)
302304
303305 otf/Beikaitoru$(1)4$(2).otf: otf/.dirstamp merged/4$(2).sfd pe/otf-$(1)00.pe
304306 $(AM_V_at)$$(TSU_V_OTF) \
305- $(FONTFORGE) $(mvp)/pe/otf-$(1)00.pe 4$(2) \
307+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)00.pe 4$(2) \
306308 $(TSU_V_REDIR)
307309
308310 otf/Beikaitoru$(1)5$(2).otf: otf/.dirstamp merged/$(2).sfd pe/otf-$(1)50.pe
309311 $(AM_V_at)$$(TSU_V_OTF) \
310- $(FONTFORGE) $(mvp)/pe/otf-$(1)50.pe $(2) \
312+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)50.pe $(2) \
311313 $(TSU_V_REDIR)
312314
313315 otf/Beikaitoru$(1)6$(2).otf: otf/.dirstamp merged/1$(2).sfd pe/otf-$(1)50.pe
314316 $(AM_V_at)$$(TSU_V_OTF) \
315- $(FONTFORGE) $(mvp)/pe/otf-$(1)50.pe 1$(2) \
317+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)50.pe 1$(2) \
316318 $(TSU_V_REDIR)
317319
318320 otf/Beikaitoru$(1)7$(2).otf: otf/.dirstamp merged/2$(2).sfd pe/otf-$(1)50.pe
319321 $(AM_V_at)$$(TSU_V_OTF) \
320- $(FONTFORGE) $(mvp)/pe/otf-$(1)50.pe 2$(2) \
322+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)50.pe 2$(2) \
321323 $(TSU_V_REDIR)
322324
323325 otf/Beikaitoru$(1)8$(2).otf: otf/.dirstamp merged/3$(2).sfd pe/otf-$(1)50.pe
324326 $(AM_V_at)$$(TSU_V_OTF) \
325- $(FONTFORGE) $(mvp)/pe/otf-$(1)50.pe 3$(2) \
327+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)50.pe 3$(2) \
326328 $(TSU_V_REDIR)
327329
328330 otf/Beikaitoru$(1)9$(2).otf: otf/.dirstamp merged/4$(2).sfd pe/otf-$(1)50.pe
329331 $(AM_V_at)$$(TSU_V_OTF) \
330- $(FONTFORGE) $(mvp)/pe/otf-$(1)50.pe 4$(2) \
332+ $(FONTANVIL) -lang=ff -script $(mvp)/pe/otf-$(1)50.pe 4$(2) \
331333 $(TSU_V_REDIR)
332334
333335 endef
@@ -350,7 +352,7 @@
350352 # TESTING
351353
352354 TESTS = $(dist_otf_DATA) $(dist_ttf_DATA) $(dist_type1_DATA)
353-LOG_COMPILER = $(FONTFORGE) pe/fontlint.pe
355+LOG_COMPILER = $(FONTANVIL) -lang=ff -script pe/fontlint.pe
354356
355357 ############################################################################
356358
--- trunk/configure.ac (revision 499)
+++ trunk/configure.ac (revision 500)
@@ -200,7 +200,7 @@
200200 AC_CONFIG_SRCDIR([hamlog/hamlog])
201201 AC_CONFIG_HEADERS([config.h])
202202 AC_CONFIG_MACRO_DIR([m4])
203-AC_REVISION([$Id: configure.ac 2421 2013-08-25 01:41:59Z mskala $])
203+AC_REVISION([$Id: configure.ac 2831 2014-03-02 07:18:54Z mskala $])
204204 AC_COPYRIGHT([Copyright (C) 2011, 2012, 2013 Matthew Skala])
205205 AC_SUBST([release_date],["August 26, 2013"])
206206 AM_SILENT_RULES
@@ -223,8 +223,8 @@
223223 AC_ARG_VAR([EXPECT],[Expect])
224224 AC_PATH_PROG([EXPECT],[expect])
225225 AM_CONDITIONAL([COND_EXPECT],[test '!' "x$EXPECT" = "x"])
226-AC_ARG_VAR([FONTFORGE],[Fontforge])
227-AC_PATH_PROG([FONTFORGE],[fontforge])
226+AC_ARG_VAR([FONTANVIL],[FontAnvil])
227+AC_PATH_PROGS([FONTANVIL],[fontanvil fontforge])
228228 AC_ARG_VAR([FONTLINT_FLAGS],[Flags for fontlint])
229229 AC_PATH_TOOL([GDB],[gdb])
230230 AX_CHECK_GNU_MAKE
@@ -330,7 +330,7 @@
330330 [enable_docs=yes])
331331 AC_ARG_ENABLE([ff-debug],
332332 [AS_HELP_STRING([--disable-ff-debug],
333- [turn off Fontforge debuggery warning])],
333+ [turn off FontAnvil debuggery warning])],
334334 [],
335335 [enable_ff_debug="test "])
336336 AC_ARG_ENABLE([kanji-chart],
@@ -498,8 +498,8 @@
498498
499499 AC_MSG_CHECKING([core prerequisites])
500500 can_core=yes
501-AS_IF([test "x$FONTFORGE" = "x" || test '!' -r "$FONTFORGE"],
502- [missing_fontforge=yes
501+AS_IF([test "x$FONTANVIL" = "x" || test '!' -r "$FONTANVIL"],
502+ [missing_fontanvil=yes
503503 can_core=no])
504504 AS_IF([test "x$_cv_gnu_make_command" = "x"],
505505 [missing_gmake=yes
@@ -609,10 +609,10 @@
609609 can_silent_rules=no])
610610 AC_MSG_RESULT([$can_silent_rules])
611611
612-AC_MSG_CHECKING([Fontforge debuggery])
612+AC_MSG_CHECKING([FontAnvil debuggery])
613613 can_ffdebug=yes
614-AS_IF([test "x$FONTFORGE" = "x" || test '!' -r "$FONTFORGE"],
615- [missing_fontforge=yes
614+AS_IF([test "x$FONTANVIL" = "x" || test '!' -r "$FONTANVIL"],
615+ [missing_fontanvil=yes
616616 can_ffdebug=no])
617617 AS_IF([test "x$CC" = "x"],
618618 [missing_cc=yes
@@ -624,7 +624,7 @@
624624 [missing_gdb=yes
625625 can_ffdebug=no])
626626 AS_IF([test "$can_ffdebug" = "yes"],
627- [gdb_result=`echo q | $GDB -q -n -s $FONTFORGE | $GREP 'no debug'`
627+ [gdb_result=`echo q | $GDB -q -n -s $FONTANVIL | $GREP 'no debug'`
628628 AS_IF([test "x$gdb_result" = "x"],[],
629629 [missing_ff_debugsymbols=yes
630630 can_ffdebug=no])])
@@ -650,9 +650,9 @@
650650 AC_MSG_RESULT([$can_bshack])
651651
652652 AC_MSG_CHECKING([whether FontForge accepts AddExtrema(1)])
653-echo '#!/usr/local/bin/fontforge' > ffaetest.pe
653+echo '#!/usr/local/bin/fontanvil' > ffaetest.pe
654654 echo 'New();AddExtrema(1);' >> ffaetest.pe
655-AS_IF([$FONTFORGE ffaetest.pe >& /dev/null],
655+AS_IF([$FONTANVIL ffaetest.pe >& /dev/null],
656656 [ae_arg_okay=yes],[ae_arg_okay=no])
657657 rm ffaetest.pe
658658 AC_SUBST([ae_arg_okay])
@@ -705,7 +705,7 @@
705705 [yes])])
706706 TSU_TABLE_LINE([silent build rules ],[$enable_silent_rules],
707707 [$enable_silent_rules],[$can_silent_rules])
708-TSU_TABLE_LINE([fontforge debugging ],[$enable_ff_debug],
708+TSU_TABLE_LINE([fontanvil debugging ],[$enable_ff_debug],
709709 [no],[$can_ffdebug])
710710 TSU_TABLE_LINE([build-system hacking ],[$enable_build_hacking],
711711 [no],[$can_bshack])
@@ -726,8 +726,8 @@
726726 AS_IF([test "$can_core" = "no"],
727727 [AS_ECHO([])
728728 AS_ECHO(["One or more prerequisites for the Tsukurimashou core are missing:"])
729- AS_IF([test "$missing_fontforge" = "yes"],
730- [AS_ECHO([" Fontforge http://fontforge.sourceforge.net/"])])
729+ AS_IF([test "$missing_fontanvil" = "yes"],
730+ [AS_ECHO([" FontAnvil http://fontforge.sourceforge.net/"])])
731731 AS_IF([test "$missing_gmake" = "yes"],
732732 [AS_ECHO([" GNU Make >=3.82 http://www.gnu.org/software/make/"])])
733733 AS_IF([test "$missing_mpost" = "yes"],
@@ -844,9 +844,9 @@
844844
845845 AS_IF([test '!' "x$enable_ff_debug" = "xno" && test "$can_ffdebug" = "no"],
846846 [AS_ECHO([])
847- AS_ECHO(["One or more prerequisites for debugging Fontforge are missing:"])
848- AS_IF([test "$missing_fontforge" = "yes"],
849- [AS_ECHO([" Fontforge itself!"])])
847+ AS_ECHO(["One or more prerequisites for debugging FontAnvil are missing:"])
848+ AS_IF([test "$missing_fontanvil" = "yes"],
849+ [AS_ECHO([" FontAnvil itself!"])])
850850 AS_IF([test "$missing_cc" = "yes"],
851851 [AS_ECHO([" a C compiler of some description"])])
852852 AS_IF([test "$missing_grep" = "yes"],
@@ -854,8 +854,8 @@
854854 AS_IF([test "$missing_gdb" = "yes"],
855855 [AS_ECHO([" gdb http://www.gnu.org/software/gdb/"])])
856856 AS_IF([test "$missing_ff_debugsymbols" = "yes"],
857- [AS_ECHO([" Fontforge was compiled without debug symbols"])])
858- AS_ECHO(["When Fontforge inevitably breaks, you'll be sorry. Use --disable-ff-debug"])
857+ [AS_ECHO([" FontAnvil was compiled without debug symbols"])])
858+ AS_ECHO(["When FontAnvil inevitably breaks, you'll be sorry. Use --disable-ff-debug"])
859859 AS_ECHO(["to turn off this message without solving the problem."])
860860 ])
861861
--- trunk/doc/proofs.tex (revision 499)
+++ trunk/doc/proofs.tex (revision 500)
@@ -97,7 +97,7 @@
9797 \newcommand{\mandeDemoFonts}{\let\KDF\dodumdemo\let\MDF\batangdemo\relax}
9898 \newcommand{\tsuitaDemoFonts}{\let\KDF\atamademo\let\MDF\sokudemo\relax}
9999 \newcommand{\bllDemoFonts}{\let\KDF\cosettedemo\let\MDF\cosettedemo\relax}
100-\newcommand{\kazoeDemoFonts}{\let\KDF\seisuudemo\let\MDF\seiduudemo\relax}
100+\newcommand{\kazoeDemoFonts}{\let\KDF\seisuudemo\let\MDF\seisuudemo\relax}
101101
102102 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
103103
--- trunk/doc/bkstyle.tex (revision 499)
+++ trunk/doc/bkstyle.tex (revision 500)
@@ -104,7 +104,7 @@
104104 \newcommand{\mandeDemoFonts}{\let\KDF\dodumdemo\let\MDF\batangdemo\relax}
105105 \newcommand{\tsuitaDemoFonts}{\let\KDF\atamademo\let\MDF\sokudemo\relax}
106106 \newcommand{\bllDemoFonts}{\let\KDF\cosettedemo\let\MDF\cosettedemo\relax}
107-\newcommand{\kazoeDemoFonts}{\let\KDF\seisuudemo\let\MDF\seiduudemo\relax}
107+\newcommand{\kazoeDemoFonts}{\let\KDF\seisuudemo\let\MDF\seisuudemo\relax}
108108
109109 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
110110
--- trunk/genjimon/configure.ac (revision 499)
+++ trunk/genjimon/configure.ac (revision 500)
@@ -199,7 +199,7 @@
199199 parallel-tests silent-rules])
200200 AC_CONFIG_SRCDIR([genjimon-black.mp])
201201 AC_CONFIG_MACRO_DIR([m4])
202-AC_REVISION([$Id: configure.ac 2019 2013-03-09 21:44:02Z mskala $])
202+AC_REVISION([$Id: configure.ac 2831 2014-03-02 07:18:54Z mskala $])
203203 AC_COPYRIGHT([Copyright (C) 2011, 2012 Matthew Skala])
204204 AC_SUBST([release_date],["March 7, 2013"])
205205 AM_SILENT_RULES
@@ -218,8 +218,8 @@
218218 AC_ARG_VAR([EXPECT],[Expect])
219219 AC_PATH_PROG([EXPECT],[expect])
220220 AM_CONDITIONAL([COND_EXPECT],[test '!' "x$EXPECT" = "x"])
221-AC_ARG_VAR([FONTFORGE],[Fontforge])
222-AC_PATH_PROG([FONTFORGE],[fontforge])
221+AC_ARG_VAR([FONTANVIL],[FontAnvil])
222+AC_PATH_PROG([FONTANVIL],[fontanvil])
223223 AX_CHECK_GNU_MAKE
224224 AC_ARG_VAR([KLEKNEV],[Kleknev])
225225 AC_PATH_PROG([KLEKNEV],[kleknev],[/bin/sh],[$PATH:$PWD/../kleknev])
--- trunk/genjimon/Makefile.am (revision 499)
+++ trunk/genjimon/Makefile.am (revision 500)
@@ -220,27 +220,33 @@
220220
221221 GenjimonMedium.ttf: genjimon-medium.pfb makettf.pe
222222 $(AM_V_at)$(TSU_V_TTF) \
223- $(FONTFORGE) $(mvp)/makettf.pe medium Medium $(TSU_V_REDIR)
223+ $(FONTANVIL) -lang=ff -script \
224+ $(mvp)/makettf.pe medium Medium $(TSU_V_REDIR)
224225
225226 GenjimonReverse.ttf: genjimon-reverse.pfb makettf.pe
226227 $(AM_V_at)$(TSU_V_TTF) \
227- $(FONTFORGE) $(mvp)/makettf.pe reverse Reverse $(TSU_V_REDIR)
228+ $(FONTANVIL) -lang=ff -script \
229+ $(mvp)/makettf.pe reverse Reverse $(TSU_V_REDIR)
228230
229231 GenjimonWhite.ttf: genjimon-white.pfb makettf.pe
230232 $(AM_V_at)$(TSU_V_TTF) \
231- $(FONTFORGE) $(mvp)/makettf.pe white White $(TSU_V_REDIR)
233+ $(FONTANVIL) -lang=ff -script \
234+ $(mvp)/makettf.pe white White $(TSU_V_REDIR)
232235
233236 GenjimonBlack.ttf: genjimon-black.pfb makettf.pe
234237 $(AM_V_at)$(TSU_V_TTF) \
235- $(FONTFORGE) $(mvp)/makettf.pe black Black $(TSU_V_REDIR)
238+ $(FONTANVIL) -lang=ff -script \
239+ $(mvp)/makettf.pe black Black $(TSU_V_REDIR)
236240
237241 GenjimonRound.ttf: genjimon-round.pfb makettf.pe
238242 $(AM_V_at)$(TSU_V_TTF) \
239- $(FONTFORGE) $(mvp)/makettf.pe round Round $(TSU_V_REDIR)
243+ $(FONTANVIL) -lang=ff -script \
244+ $(mvp)/makettf.pe round Round $(TSU_V_REDIR)
240245
241246 GenjimonRoundOutline.ttf: genjimon-routline.pfb makettf.pe
242247 $(AM_V_at)$(TSU_V_TTF) \
243- $(FONTFORGE) $(mvp)/makettf.pe routline RoundOutline $(TSU_V_REDIR)
248+ $(FONTANVIL) -lang=ff -script \
249+ $(mvp)/makettf.pe routline RoundOutline $(TSU_V_REDIR)
244250
245251 ############################################################################
246252
@@ -257,7 +263,7 @@
257263
258264 TESTS = $(dist_ttf_DATA)
259265 TEST_EXTENSIONS = .ttf
260-TTF_LOG_COMPILER = $(FONTFORGE) fontlint.pe
266+TTF_LOG_COMPILER = $(FONTANVIL) -lang=ff -script fontlint.pe
261267
262268 ############################################################################
263269
--- trunk/Makefile.am (revision 499)
+++ trunk/Makefile.am (revision 500)
@@ -648,12 +648,13 @@
648648
649649 pe/make-empty.pe: pe/.dirstamp
650650 $(AM_V_GEN)
651- $(AM_V_at)echo '#!'$(FONTFORGE) > pe/make-empty.pe
651+ $(AM_V_at)echo '#!'$(FONTANVIL) > pe/make-empty.pe
652652 $(AM_V_at)echo 'New();Save("sfd/empty.sfd");' >> pe/make-empty.pe
653653
654654 sfd/empty.sfd: sfd/.dirstamp pe/make-empty.pe
655655 $(AM_V_GEN)
656- $(AM_V_at)$(FONTFORGE) pe/make-empty.pe $(TSU_V_REDIR)
656+ $(AM_V_at)$(FONTANVIL) -lang=ff -script \
657+ pe/make-empty.pe $(TSU_V_REDIR)
657658
658659 txt/fontlog.txt: txt/.dirstamp tools/make-flog \
659660 hamlog/config.hl makefile-vars.inc
@@ -733,7 +734,8 @@
733734 touch pfb/$*.pfb ; \
734735 else \
735736 $(TSU_V_RMO) \
736- $(FONTFORGE) $(mvp)/pe/rmo.pe pfbtmp/$*.pfb pfb/$*.pfb \
737+ $(FONTANVIL) -lang=ff -script \
738+ $(mvp)/pe/rmo.pe pfbtmp/$*.pfb pfb/$*.pfb \
737739 $(TSU_V_REDIR) ; \
738740 fi
739741
@@ -798,7 +800,7 @@
798800 fea/monospace.fea fea/$(subst _,-,$1)-name.fea \
799801 $(call PAGEFILES,pfb/,$(1),.pfb)
800802 $(TSU_V_OTF) otf/$(subst -,,$(subst $(space),,$(XLAT_$1))).otf
801- $(AM_V_at)$(FONTFORGE) pe/assemble-font.pe \
803+ $(AM_V_at)$(FONTANVIL) -lang=ff -script pe/assemble-font.pe \
802804 $(subst _,-,$1) \
803805 "$(XLAT_$(word 1,$(subst _,$(space),$1)))" \
804806 "$(XLAT_$1)" \
@@ -822,7 +824,7 @@
822824 fea/$(subst _,-,$1)-name.fea \
823825 $(call PAGEFILES,pfb/,$(1),.pfb)
824826 $(TSU_V_SFD) sfd/$(subst _,-,$1).sfd
825- $(AM_V_at)$(FONTFORGE) pe/assemble-font.pe \
827+ $(AM_V_at)$(FONTANVIL) -lang=ff -script pe/assemble-font.pe \
826828 $(subst _,-,$1) \
827829 "$(XLAT_$(word 1,$(subst _,$(space),$1)))" \
828830 "$(XLAT_$1)" \
@@ -835,7 +837,7 @@
835837 bdf/$(subst -,,$(subst $(space),,$(XLAT_$1))).bdf: \
836838 bdf/.dirstamp pe/bdf.pe sfd/$(subst _,-,$1).sfd
837839 $(TSU_V_BDF) bdf/$(subst -,,$(subst $(space),,$(XLAT_$1))).bdf
838- $(AM_V_at)$(FONTFORGE) $(mvp)/pe/bdf.pe \
840+ $(AM_V_at)$(FONTANVIL) -lang=ff -script $(mvp)/pe/bdf.pe \
839841 $(subst -,,$(subst $(space),,$(XLAT_$1))) $(subst _,-,$1) \
840842 $(TSU_V_REDIR)
841843 $(AM_V_at)mv -f \
@@ -860,7 +862,7 @@
860862 sfd/$(subst _,-,$1).sfd \
861863 pe/getbearings.pe tools/make-gpos
862864 $(TSU_V_KERN) fea/$(subst _,-,$1)-kern.fea
863- $(AM_V_at)$(FONTFORGE) $(mvp)/pe/getbearings.pe \
865+ $(AM_V_at)$(FONTANVIL) -lang=ff -script $(mvp)/pe/getbearings.pe \
864866 sfd/$(subst _,-,$1).sfd \
865867 $(TSU_V_REDIR) > $1.bearings
866868 $(AM_V_at)$(PERL) -CSD $(mvp)/tools/make-gpos "$(OT_FEATURES)" \
@@ -876,7 +878,7 @@
876878 pe/kern-font.pe sfd/$(subst _,-,$1).sfd
877879 $(TSU_V_OTF) \
878880 otf/$(subst -,,$(subst $(space),,$(XLAT_$1))).otf
879- $(AM_V_at)$(FONTFORGE) $(mvp)/pe/kern-font.pe \
881+ $(AM_V_at)$(FONTANVIL) -lang=ff -script $(mvp)/pe/kern-font.pe \
880882 $(subst _,-,$1) \
881883 "$(XLAT_$(word 1,$(subst _,$(space),$1)))" \
882884 "$(XLAT_$1)" \
@@ -1085,7 +1087,7 @@
10851087 $(AM_V_GEN)
10861088 $(AM_V_at)$(MKDIR_P) $*.tmp ; \
10871089 (cd $*.tmp ; \
1088- $(FONTFORGE) $(realpath $(mvp))/pe/makepngs.pe \
1090+ $(FONTANVIL) -lang=ff -script $(realpath $(mvp))/pe/makepngs.pe \
10891091 $(realpath .)/pfbtmp/$*.pfb $(TSU_V_REDIR) ; \
10901092 for f in *.png ; do echo -n "$$f" ; pngtopnm $$f | \
10911093 pgmtopbm -threshold | pgmhist | \
@@ -1102,7 +1104,7 @@
11021104 $(AM_V_GEN)
11031105 $(AM_V_at)$(MKDIR_P) $*.tmp ; \
11041106 (cd $*.tmp ; \
1105- $(FONTFORGE) $(realpath $(mvp))/pe/makepngs.pe \
1107+ $(FONTANVIL) -lang=ff -script $(realpath $(mvp))/pe/makepngs.pe \
11061108 $(realpath .)/sfd/$*.sfd $(TSU_V_REDIR) ; \
11071109 for f in *.png ; do echo -n "$$f" ; pngtopnm $$f | \
11081110 pgmtopbm -threshold | pgmhist | \
@@ -1137,7 +1139,8 @@
11371139
11381140 TESTS = $(dist_otf_DATA)
11391141 TEST_EXTENSIONS = .otf
1140-OTF_LOG_COMPILER = $(FONTFORGE) $(mvp)/pe/fontlint.pe $(FONTLINT_FLAGS)
1142+OTF_LOG_COMPILER = $(FONTANVIL) -lang=ff -script \
1143+ $(mvp)/pe/fontlint.pe $(FONTLINT_FLAGS)
11411144
11421145 ############################################################################
11431146
Show on old repository browser