[Tux4kids-commits] r444 - in tuxtype: . trunk trunk/tuxtype trunk/tuxtype/data/fonts trunk/tuxtype/data/images/menu trunk/tuxtype/data/themes trunk/tuxtype/data/themes/deutsch trunk/tuxtype/data/themes/nepali trunk/tuxtype/data/themes/nepali/words

dbruce-guest at alioth.debian.org dbruce-guest at alioth.debian.org
Sat Mar 29 14:43:57 UTC 2008


Author: dbruce-guest
Date: 2008-03-29 14:43:56 +0000 (Sat, 29 Mar 2008)
New Revision: 444

Added:
   tuxtype/branches/
   tuxtype/trunk/tuxtype/data/fonts/lohit_hi.ttf
   tuxtype/trunk/tuxtype/data/themes/nepali/
   tuxtype/trunk/tuxtype/data/themes/nepali/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/nepali/authors.txt
   tuxtype/trunk/tuxtype/data/themes/nepali/keyboard.lst
   tuxtype/trunk/tuxtype/data/themes/nepali/lang.po
   tuxtype/trunk/tuxtype/data/themes/nepali/settings.txt
   tuxtype/trunk/tuxtype/data/themes/nepali/words/
   tuxtype/trunk/tuxtype/data/themes/nepali/words/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/nepali/words/alphabet.txt
   tuxtype/trunk/tuxtype/data/themes/nepali/words/fingers.txt
   tuxtype/trunk/tuxtype/data/themes/nepali/words/plants.txt
   tuxtype/trunk/tuxtype/data/themes/nepali/words/words1.txt
   tuxtype/trunk/tuxtype/data/themes/nepali/words/words2.txt
   tuxtype/trunk/tuxtype/data/themes/nepali/words/words3.txt
Removed:
   tuxtype/branches/
   tuxtype/trunk/tuxtype/data/themes/Makefile.in
Modified:
   tuxtype/trunk/ChangeLog
   tuxtype/trunk/Makefile.am
   tuxtype/trunk/configure.ac
   tuxtype/trunk/tuxtype/Makefile.am
   tuxtype/trunk/tuxtype/data/fonts/Makefile.am
   tuxtype/trunk/tuxtype/data/images/menu/cascade0.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade1.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade10.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade2.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade3.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade4.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade5.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade6.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade7.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade8.png
   tuxtype/trunk/tuxtype/data/images/menu/cascade9.png
   tuxtype/trunk/tuxtype/data/images/menu/cascaded.png
   tuxtype/trunk/tuxtype/data/themes/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/deutsch/keyboard.lst
   tuxtype/trunk/tuxtype/loaders.c
   tuxtype/trunk/tuxtype/setup.c
Log:
tuxtype-reorg commit



Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/ChangeLog	2008-03-29 14:43:56 UTC (rev 444)
@@ -1,3 +1,7 @@
+23 Mar 2008
+[ David Bruce <dbruce at tampabay.rr.com> ]
+       - Nepali theme contributed by Vikal Acharya and Shakeel Shrestha
+
 22 Feb 2008
 [ David Bruce <dbruce at tampabay.rr.com> ]
        - replaced many of menu icon images with new shiny ones.

Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/Makefile.am	2008-03-29 14:43:56 UTC (rev 444)
@@ -66,7 +66,7 @@
 ## i.e. to make tarball to post for individual download - use 'make distcheck' for Debian.
 ## (thanks to Ralf Wildenhues <Ralf.Wildenhues at gmx.de> for automake help!)
 dist_with_fonts:
-	$(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) dist_fonts='AndikaDesRevG.ttf DoulosSILR.ttf Rachana_w01.ttf' dist
+	$(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) dist_fonts='AndikaDesRevG.ttf DoulosSILR.ttf lohit_hi.ttf Rachana_w01.ttf' dist
 
 install-nsi-am: install-nsi-local
 

Modified: tuxtype/trunk/configure.ac
===================================================================
--- tuxtype/trunk/configure.ac	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/configure.ac	2008-03-29 14:43:56 UTC (rev 444)
@@ -19,9 +19,6 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
-dnl Don't think we need C++:
-# AC_PROG_CPP
-# AC_PROG_CXX
 
 AC_PREFIX_DEFAULT(/usr/local)
 if test "x$prefix" = "xNONE"; then
@@ -159,6 +156,8 @@
 tuxtype/data/themes/malayalam/images/keyboard/Makefile
 tuxtype/data/themes/malayalam/scripts/Makefile
 tuxtype/data/themes/malayalam/words/Makefile
+tuxtype/data/themes/nepali/Makefile
+tuxtype/data/themes/nepali/words/Makefile
 tuxtype/data/themes/nederlands/Makefile
 tuxtype/data/themes/nederlands/words/Makefile
 tuxtype/data/themes/nynorsk/Makefile

Modified: tuxtype/trunk/tuxtype/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.am	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/tuxtype/Makefile.am	2008-03-29 14:43:56 UTC (rev 444)
@@ -1,3 +1,4 @@
+## Process with Automake to create Makefile.in
 
 bin_PROGRAMS = tuxtype
 

Modified: tuxtype/trunk/tuxtype/data/fonts/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/fonts/Makefile.am	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/tuxtype/data/fonts/Makefile.am	2008-03-29 14:43:56 UTC (rev 444)
@@ -11,9 +11,11 @@
 	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
 	-$(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
 	-$(INSTALL_DATA) $(srcdir)/DoulosSILR.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
+	-$(INSTALL_DATA) $(srcdir)/lohit_hi.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
 	-$(INSTALL_DATA) $(srcdir)/Rachana_w01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
 
 uninstall-local:
 	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/AndikaDesRevG.ttf
 	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/DoulosSILR.ttf
+	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/lohit_hi.ttf
 	-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/Rachana_w01.ttf

Added: tuxtype/trunk/tuxtype/data/fonts/lohit_hi.ttf
===================================================================
(Binary files differ)


Property changes on: tuxtype/trunk/tuxtype/data/fonts/lohit_hi.ttf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade0.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade1.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade10.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade2.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade3.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade4.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade5.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade6.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade7.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade8.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascade9.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/images/menu/cascaded.png
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/tuxtype/data/themes/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.am	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.am	2008-03-29 14:43:56 UTC (rev 444)
@@ -16,6 +16,7 @@
   jamaican \
   lithuanian \
   malayalam \
+  nepali \
   nederlands \
   nynorsk \
   russian \

Deleted: tuxtype/trunk/tuxtype/data/themes/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.in	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.in	2008-03-29 14:43:56 UTC (rev 444)
@@ -1,527 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = tuxtype/data/themes
-DIST_COMMON = $(dist_themes_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(themesdir)"
-dist_themesDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_themes_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NSIS = @NSIS@
-NSI_DLL_DIR = @NSI_DLL_DIR@
-NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = armenian \
-  bokmal \
-  brazilian-portuguese \
-  catalan \
-  czech \
-  dansk \
-  deutsch \
-  espanol \
-  euskara \
-  french \
-  greek \
-  italian \
-  jamaican \
-  lithuanian \
-  malayalam \
-  nederlands \
-  nynorsk \
-  russian \
-  svenska \
-  swahili \
-  wolof
-
-themesdir = $(pkgdatadir)/data/themes
-dist_themes_DATA = lang.po
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-dist_themesDATA: $(dist_themes_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(themesdir)" || $(MKDIR_P) "$(DESTDIR)$(themesdir)"
-	@list='$(dist_themes_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_themesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themesdir)/$$f'"; \
-	  $(dist_themesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themesdir)/$$f"; \
-	done
-
-uninstall-dist_themesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_themes_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(themesdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(themesdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(themesdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-dist_themesDATA
-
-install-dvi: install-dvi-recursive
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-dist_themesDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic ctags \
-	ctags-recursive distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am \
-	install-dist_themesDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-dist_themesDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/keyboard.lst
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/keyboard.lst	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/keyboard.lst	2008-03-29 14:43:56 UTC (rev 444)
@@ -68,3 +68,4 @@
 7|,
 8|.
 9|;
+9|ß

Added: tuxtype/trunk/tuxtype/data/themes/nepali/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nepali/Makefile.am	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/nepali/Makefile.am	2008-03-29 14:43:56 UTC (rev 444)
@@ -0,0 +1,11 @@
+## Makefile.am for tuxtype - data/themes/nepali:
+## Process with Automake to create Makefile.in
+
+SUBDIRS = words 
+
+themes_nepalidir = $(pkgdatadir)/data/themes/nepali
+
+dist_themes_nepali_DATA = authors.txt \
+  keyboard.lst \
+  lang.po \
+  settings.txt


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/Makefile.am
___________________________________________________________________
Name: svn:executable
   + *

Added: tuxtype/trunk/tuxtype/data/themes/nepali/authors.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nepali/authors.txt	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/nepali/authors.txt	2008-03-29 14:43:56 UTC (rev 444)
@@ -0,0 +1 @@
+Nepali theme contributed by Vikal Acharya and Shakeel Shrestha
\ No newline at end of file

Added: tuxtype/trunk/tuxtype/data/themes/nepali/keyboard.lst
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nepali/keyboard.lst	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/nepali/keyboard.lst	2008-03-29 14:43:56 UTC (rev 444)
@@ -0,0 +1,69 @@
+0|ा
+0|आ
+0|ट
+0|ठ
+0|ष
+0|ऋ
+0|१
+0|!
+1|स
+1|श
+1|ौ
+1|औ
+1|@
+1|२
+2|द
+2|ध
+2|ढ
+2|ड
+2|३
+2|#
+3|उ
+3|ऊ
+3|र
+3|छ
+3|च
+3|व
+3|५
+3|%
+3|त
+3|थ
+3|ग
+3|घ
+3|ब
+3|भ
+6|ज
+6|झ
+6|न
+6|ण
+6|म
+6|य
+6|ञ
+6|ह
+6|अ
+7|क
+7|ख
+7|ि
+7|ी
+7|,
+7|ङ
+8|ो
+8|ओ
+8|ल
+9|प
+9|फ
+9|;
+9|:
+9|्
+9|?
+9|इ
+9|ई
+9|ए
+9|ऐ
+9|'
+9|"
+9|०
+9|)
+9|९
+9|(
+9|- 


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/keyboard.lst
___________________________________________________________________
Name: svn:executable
   + *

Added: tuxtype/trunk/tuxtype/data/themes/nepali/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nepali/lang.po	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/nepali/lang.po	2008-03-29 14:43:56 UTC (rev 444)
@@ -0,0 +1,121 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+
+msgid "Sound Effects Volume"
+msgstr "ध्वनिको मात्राको असर"
+
+msgid "Music Volume"
+msgstr "संगितको मात्रा"
+#
+msgid "Sound & Music Disabled"
+msgstr "ध्वनि र संगित निष्क्रिय गर्नूहोस ।"
+#
+msgid "Paused!"
+msgstr " केहि बेर रोक्नुहोस ।"
+
+msgid "Press escape again to return to menu"
+msgstr "मेनुमा फर्कन इस्केप बटन थिच्नुहोस ।"
+#
+msgid "Press space bar to return to game"
+msgstr "खेलमा फर्कन स्पेस बार  थिच्नुहोस । "
+#
+msgid "Level"
+msgstr "श्रेणी"
+#
+msgid "Lives"
+msgstr "जिवनहरु"
+#
+msgid "Fish"
+msgstr "माछा"
+#
+msgid "Easy"
+msgstr "सजिलो"
+#
+msgid "Medium"
+msgstr "मध्यम"
+#
+msgid "Hard"
+msgstr "कठिन"
+#
+msgid "Practice"
+msgstr "प्रशिक्षण"
+#
+msgid "Congratulations"
+msgstr "तपाइलाई बधाई छ!!!"
+#
+msgid "Oh No!"
+msgstr "हेत्तेरिका!.."
+#
+msgid "Work In Progress!"
+msgstr "काम हुदैछ!!!!!!!!"
+#
+msgid "This feature is not ready yet"
+msgstr  "यो सुबिधा अहिले उपलब्ध हुनसक्दैन!!!!"
+#
+msgid "Discuss the future of TuxTyping at"
+msgstr " टक्शटाइप को भविष्य बारेमा छलफल गर्नुहोस ।"
+#
+msgid "Alphabet"
+msgstr "वर्णमाला"
+#
+msgid "Short Words"
+msgstr "छोटा शब्दहरु"
+#
+msgid "Medium Words"
+msgstr "मध्यम शब्दहरु"
+#
+msgid "Long Words"
+msgstr "लामा शब्दहरु"
+#
+msgid "Fish Cascade"
+msgstr "माछा क्यास्केड ‍"
+#
+msgid "Space Cadet"
+msgstr "‍ स्पेस क्याडेट"
+#
+msgid "Edit Word Lists"
+msgstr "शब्द शुचिहरुलाई सम्पादन गर्नुहोस ।"
+#
+msgid "Comet Zap"
+msgstr "कमेट ज्याप"
+#
+msgid "Pilot"
+msgstr "पाइलट"
+#
+msgid "Lessons"
+msgstr "पाठ्य‍क्रमहरु"
+#
+msgid "Ace"
+msgstr "एस"
+#
+msgid "Project Info"
+msgstr "‍परियोजनाको बारेमा"
+#
+msgid "Options"
+msgstr "विकल्पहरु‍"
+#
+msgid "Instructions"
+msgstr "निर्देशनहरु "
+#
+msgid "Commander"
+msgstr "कमान्डर‍"
+#
+msgid "Setup Language"
+msgstr "भाषा समाबिष्ट गर्नुहोस ।"
+#
+msgid "Quit"
+msgstr "बन्द गर्नुहोस ।"
+#
+msgid "Main Menu"
+msgstr "मुख्य मेनु" 
+#
+msgid "Next letter:"
+msgstr "आगामी अक्षर"
+#
+msgid "Great!"
+msgstr "उत्तम अति उत्तम ‍!"


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/lang.po
___________________________________________________________________
Name: svn:executable
   + *

Added: tuxtype/trunk/tuxtype/data/themes/nepali/settings.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nepali/settings.txt	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/nepali/settings.txt	2008-03-29 14:43:56 UTC (rev 444)
@@ -0,0 +1 @@
+theme_font_name=lohit_hi.ttf

Added: tuxtype/trunk/tuxtype/data/themes/nepali/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nepali/words/Makefile.am	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/nepali/words/Makefile.am	2008-03-29 14:43:56 UTC (rev 444)
@@ -0,0 +1,11 @@
+## Makefile.am for tuxtype - data/themes/nepali/words:
+## Process with Automake to create Makefile.in
+
+themes_nepali_wordsdir = $(pkgdatadir)/data/themes/nepali/words
+
+dist_themes_nepali_words_DATA = alphabet.txt \
+  fingers.txt \
+  plants.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/words/Makefile.am
___________________________________________________________________
Name: svn:executable
   + *

Added: tuxtype/trunk/tuxtype/data/themes/nepali/words/alphabet.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nepali/words/alphabet.txt	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/nepali/words/alphabet.txt	2008-03-29 14:43:56 UTC (rev 444)
@@ -0,0 +1,37 @@
+बर्णमाला
+क
+ख
+ग
+घ
+ङ
+च
+छ
+ज
+झ
+ञ
+ट
+ठ
+ड
+ढ
+ण
+त
+थ
+द
+ध
+न
+प
+फ
+ब
+भ
+म
+य
+र
+ल
+व
+स
+ष
+श
+ह
+क्ष
+त्र
+ज्ञ

Added: tuxtype/trunk/tuxtype/data/themes/nepali/words/fingers.txt
===================================================================
(Binary files differ)


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/words/fingers.txt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxtype/trunk/tuxtype/data/themes/nepali/words/plants.txt
===================================================================
(Binary files differ)


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/words/plants.txt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxtype/trunk/tuxtype/data/themes/nepali/words/words1.txt
===================================================================
(Binary files differ)


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/words/words1.txt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxtype/trunk/tuxtype/data/themes/nepali/words/words2.txt
===================================================================
(Binary files differ)


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/words/words2.txt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: tuxtype/trunk/tuxtype/data/themes/nepali/words/words3.txt
===================================================================
(Binary files differ)


Property changes on: tuxtype/trunk/tuxtype/data/themes/nepali/words/words3.txt
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tuxtype/trunk/tuxtype/loaders.c
===================================================================
--- tuxtype/trunk/tuxtype/loaders.c	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/tuxtype/loaders.c	2008-03-29 14:43:56 UTC (rev 444)
@@ -225,6 +225,8 @@
     sprintf(fn, "/usr/share/fonts/truetype/ttf-sil-andika/AndikaDesRevG.ttf");
   else if (strncmp(font_name, "DoulosSILR.ttf", FNLEN ) == 0)
     sprintf(fn, "/usr/share/fonts/truetype/ttf-sil-doulos/DoulosSILR.ttf");
+  else if (strncmp(font_name, "lohit_hi.ttf", FNLEN ) == 0)
+    sprintf(fn, "/usr/share/fonts/truetype/ttf-devanagari-fonts/lohit_hi.ttf");
   else if (strncmp(font_name, "Rachana_w01.ttf", FNLEN ) == 0)
     sprintf(fn, "/usr/share/fonts/truetype/ttf-malayalam-fonts/Rachana_w01.ttf");
 

Modified: tuxtype/trunk/tuxtype/setup.c
===================================================================
--- tuxtype/trunk/tuxtype/setup.c	2008-03-29 10:14:11 UTC (rev 443)
+++ tuxtype/trunk/tuxtype/setup.c	2008-03-29 14:43:56 UTC (rev 444)
@@ -90,22 +90,27 @@
 *****************************/
 void LibInit(Uint32 lib_flags)
 {
-	LOG( "LibInit():\n-About to init SDL Library\n" );
+  LOG( "LibInit():\n-About to init SDL Library\n" );
 
-	if (SDL_Init(lib_flags) < 0) 
-		/* FIXME this looks wrong - if no sys_sound, we don't init video??? */
-		if (settings.sys_sound) {
-			if (SDL_Init(SDL_INIT_VIDEO) < 0) {
-				fprintf(stderr, "Couldn't initialize SDL: %s\n",
-				SDL_GetError());
-				exit(2);
-			} else {
-				LOG( "Couldn't initialize SDL Sound\n" );
-				settings.sys_sound = 0;
-			}
-		}
+  if (SDL_Init(lib_flags) < 0) 
+  {
+    /* FIXME this looks wrong - if no sys_sound, we don't init video??? */
+    if (settings.sys_sound)
+    {
+      if (SDL_Init(SDL_INIT_VIDEO) < 0)
+      {
+        fprintf(stderr, "Couldn't initialize SDL: %s\n",
+                SDL_GetError());
+        exit(2);
+      }
+      else
+      {
+        LOG( "Couldn't initialize SDL Sound\n" );
+        settings.sys_sound = 0;
+      }
+    }
+  }
 
-
 //	atexit(SDL_Quit); // fire and forget... 
 
 	LOG( "-SDL Library init'd successfully\n" );




More information about the Tux4kids-commits mailing list