devnag: Add a 'make check' test case

git-svn-id: svn://tug.org/texlive/trunk@29397 c570f23f-e606-0410-a88d-b1316a301751

17 files changed, 1432 insertions, 707 deletions

diff --git a/Build/source/texk/devnag/ChangeLog b/Build/source/texk/devnag/ChangeLog
index ebeff59c303..e5b85bea552 100644
--- a/Build/source/texk/devnag/ChangeLog
+++ b/Build/source/texk/devnag/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* src/Makefile.am (removed): Merged into Makefile.am.
+	* tests/devnag.test (new): Shell script for a test case.
+	* tests/*.{dn,tex} (new): Test input and expected output.
+	* Makefile.am, configure.ac: Adapted.
+
 2012-12-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* configure.ac: Use KPSE_BASIC to enable silent rules.
diff --git a/Build/source/texk/devnag/Makefile.am b/Build/source/texk/devnag/Makefile.am
index b08f08b9d08..feb76f8e548 100644
--- a/Build/source/texk/devnag/Makefile.am
+++ b/Build/source/texk/devnag/Makefile.am
@@ -1,8 +1,26 @@
 ## Makefile.am for the TeX Live subdirectory texk/devnag/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
-SUBDIRS = src
+AM_CFLAGS = $(WARNING_CFLAGS)
+
+bin_PROGRAMS = devnag
+
+devnag_SOURCES = src/devnag.c
+
+## Tests.
+##
+TESTS = tests/devnag.test
+EXTRA_DIST = $(TESTS)
+## tests/devnag.test
+EXTRA_DIST += \
+	tests/captions.dn tests/captions.tex \
+	tests/examples.dn tests/examples.tex \
+	tests/misspaal.dn tests/misspaal.tex \
+	tests/vedasample.dn tests/vedasample.tex
+
+DISTCLEANFILES = captions.dn examples.dn *.tex
+
diff --git a/Build/source/texk/devnag/Makefile.in b/Build/source/texk/devnag/Makefile.in
index e4b20e68171..bdc073bc3bb 100644
--- a/Build/source/texk/devnag/Makefile.in
+++ b/Build/source/texk/devnag/Makefile.in
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 am__make_dryrun = \
   { \
@@ -47,14 +48,17 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+bin_PROGRAMS = devnag$(EXEEXT)
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README ../../build-aux/config.guess ../../build-aux/config.sub \
-	../../build-aux/depcomp ../../build-aux/install-sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ../../build-aux/ltmain.sh \
+	$(srcdir)/config.h.in $(top_srcdir)/../../build-aux/depcomp \
+	$(top_srcdir)/../../build-aux/test-driver AUTHORS COPYING \
+	ChangeLog INSTALL NEWS README ../../build-aux/config.guess \
+	../../build-aux/config.sub ../../build-aux/depcomp \
+	../../build-aux/install-sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap \
+	../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/install-sh \
 	$(top_srcdir)/../../build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -69,6 +73,12 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_devnag_OBJECTS = src/devnag.$(OBJEXT)
+devnag_OBJECTS = $(am_devnag_OBJECTS)
+devnag_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -81,29 +91,29 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-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 \
-	tags-recursive uninstall-recursive
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(devnag_SOURCES)
+DIST_SOURCES = $(devnag_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -125,7 +135,208 @@ am__define_uniq_tagged_files = \
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
-DIST_SUBDIRS = $(SUBDIRS)
+AM_RECURSIVE_TARGETS = cscope check recheck
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+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 = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -136,31 +347,6 @@ am__remove_distdir = \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
 am__post_remove_distdir = $(am__remove_distdir)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
@@ -258,11 +444,18 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
-SUBDIRS = src
+AM_CFLAGS = $(WARNING_CFLAGS)
+devnag_SOURCES = src/devnag.c
+TESTS = tests/devnag.test
+EXTRA_DIST = $(TESTS) tests/captions.dn tests/captions.tex \
+	tests/examples.dn tests/examples.tex tests/misspaal.dn \
+	tests/misspaal.tex tests/vedasample.dn tests/vedasample.tex
+DISTCLEANFILES = captions.dn examples.dn *.tex
 all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
+.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -312,63 +505,93 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-
-# 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.
-$(am__recursive_targets):
-	@fail= 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//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	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; \
-	  ($(am__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"
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+src/$(am__dirstamp):
+	@$(MKDIR_P) src
+	@: > src/$(am__dirstamp)
+src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/$(DEPDIR)
+	@: > src/$(DEPDIR)/$(am__dirstamp)
+src/devnag.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+devnag$(EXEEXT): $(devnag_OBJECTS) $(devnag_DEPENDENCIES) $(EXTRA_devnag_DEPENDENCIES) 
+	@rm -f devnag$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(devnag_OBJECTS) $(devnag_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+	-rm -f src/*.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/devnag.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
+tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	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 || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
@@ -381,7 +604,7 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	      $$unique; \
 	  fi; \
 	fi
-ctags: ctags-recursive
+ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
@@ -400,7 +623,7 @@ cscope: cscope.files
 clean-cscope:
 	-rm -f cscope.files
 cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
+cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
@@ -420,6 +643,162 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# exand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all 
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
@@ -452,31 +831,6 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
@@ -602,19 +956,22 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(PROGRAMS) config.h
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-recursive
+installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -626,102 +983,112 @@ install-strip:
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/$(am__dirstamp)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 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: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
-distclean: distclean-recursive
+distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf src/$(DEPDIR)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-tags
 
-dvi: dvi-recursive
+dvi: dvi-am
 
 dvi-am:
 
-html: html-recursive
+html: html-am
 
 html-am:
 
-info: info-recursive
+info: info-am
 
 info-am:
 
 install-data-am:
 
-install-dvi: install-dvi-recursive
+install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am:
+install-exec-am: install-binPROGRAMS
 
-install-html: install-html-recursive
+install-html: install-html-am
 
 install-html-am:
 
-install-info: install-info-recursive
+install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-recursive
+install-pdf: install-pdf-am
 
 install-pdf-am:
 
-install-ps: install-ps-recursive
+install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf src/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-pdf: pdf-recursive
+pdf: pdf-am
 
 pdf-am:
 
-ps: ps-recursive
+ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: all check-am install-am install-strip
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
-	am--refresh check check-am clean clean-cscope clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-TESTS \
+	check-am clean clean-binPROGRAMS clean-cscope clean-generic \
 	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
 	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am 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-am uninstall \
-	uninstall-am
+	distcheck distclean distclean-compile distclean-generic \
+	distclean-hdr distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am 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 maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
+	uninstall uninstall-am uninstall-binPROGRAMS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/devnag/configure b/Build/source/texk/devnag/configure
index 3c6ef53ae18..8638310ea70 100755
--- a/Build/source/texk/devnag/configure
+++ b/Build/source/texk/devnag/configure
@@ -4732,7 +4732,7 @@ fi
 done
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -5471,7 +5471,6 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/Build/source/texk/devnag/configure.ac b/Build/source/texk/devnag/configure.ac
index 978497c6bc4..374395a6f88 100644
--- a/Build/source/texk/devnag/configure.ac
+++ b/Build/source/texk/devnag/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -30,6 +30,6 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 dnl Checks for library functions.
 AC_CHECK_FUNCS([strstr])
 
-AC_CONFIG_FILES([Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
diff --git a/Build/source/texk/devnag/src/Makefile.am b/Build/source/texk/devnag/src/Makefile.am
deleted file mode 100644
index 3928c23ec96..00000000000
--- a/Build/source/texk/devnag/src/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-bin_PROGRAMS = devnag
-devnag_SOURCES = devnag.c
-
-AM_CFLAGS = $(WARNING_CFLAGS)
diff --git a/Build/source/texk/devnag/src/Makefile.in b/Build/source/texk/devnag/src/Makefile.in
deleted file mode 100644
index 65970cc86b7..00000000000
--- a/Build/source/texk/devnag/src/Makefile.in
+++ /dev/null
@@ -1,527 +0,0 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2012 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.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@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 = :
-bin_PROGRAMS = devnag$(EXEEXT)
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../../build-aux/depcomp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_devnag_OBJECTS = devnag.$(OBJEXT)
-devnag_OBJECTS = $(am_devnag_OBJECTS)
-devnag_LDADD = $(LDADD)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(devnag_SOURCES)
-DIST_SOURCES = $(devnag_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-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@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-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_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-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_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-devnag_SOURCES = devnag.c
-AM_CFLAGS = $(WARNING_CFLAGS)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign src/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: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-devnag$(EXEEXT): $(devnag_OBJECTS) $(devnag_DEPENDENCIES) $(EXTRA_devnag_DEPENDENCIES) 
-	@rm -f devnag$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(devnag_OBJECTS) $(devnag_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/devnag.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-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 "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
-	distclean distclean-compile distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	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 maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am \
-	uninstall-binPROGRAMS
-
-
-# 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:
diff --git a/Build/source/texk/devnag/tests/captions.dn b/Build/source/texk/devnag/tests/captions.dn
new file mode 100644
index 00000000000..689ca67448f
--- /dev/null
+++ b/Build/source/texk/devnag/tests/captions.dn
@@ -0,0 +1,40 @@
+@modernhindi
+\def\datemodernhindi{\def\today{\@datenumeric\day\space\ifcase\month\or
+{\dn janavarii}\or
+{\dn faravarii}\or
+{\dn maarca}\or
+{\dn apraila}\or
+{\dn maI}\or
+{\dn juuna}\or
+{\dn julAI}\or
+{\dn agasta}\or
+{\dn sitambara}\or
+{\dn aktuubara (ak.tobara)}\or
+{\dn navambara}\or
+{\dn disambara}\fi\space\@datenumeric\year}}
+
+\def\captionsmodernhindi{%
+\def\abstractname{{\dn saaraa.m"sa}}%
+\def\appendixname{{\dn pari"si.s.ta}}%
+\def\bibname{{\dn sa.mdar"sa grantha}}% (?)
+\def\ccname{}%
+\def\chaptername{{\dn adhyaaya}}%
+\def\contentsname{{\dn vi.saya-suucii}}%
+\def\enclname{{\dn }}%
+\def\figurename{{\dn citra}}% rekhaacitra
+\def\headpagename{{\dn p.r.s.tha}}%
+\def\headtoname{}%
+\def\indexname{{\dn suucii}}%
+%                suucaka
+%                anukrama.nikaa
+%                anukrama.ni
+\def\listfigurename{{\dn citro.m kii suucii}}%
+\def\listtablename{{\dn taalikaao.m kii suucii}}%
+\def\pagename{{\dn p.r.s.tha}}%
+\def\partname{{\dn kha.n.da}}%
+\def\prefacename{{\dn prastaavanaa}}% praakkathana
+\def\refname{{\dn havaale}}%
+\def\tablename{{\dn taalikaa}}%
+\def\seename{{\dn dekhie}}%
+\def\alsoname{{\dn aur dekhie}}%
+\def\alsoseename{{\dn aur dekhie}}}
diff --git a/Build/source/texk/devnag/tests/captions.tex b/Build/source/texk/devnag/tests/captions.tex
new file mode 100644
index 00000000000..14bd7a4fbae
--- /dev/null
+++ b/Build/source/texk/devnag/tests/captions.tex
@@ -0,0 +1,40 @@
+\def\DevnagVersion{2.15}%@modernhindi
+\def\datemodernhindi{\def\today{\@datenumeric\day\space\ifcase\month\or
+{\dn jnvrF}\or
+{\dn \327wrvrF}\or
+{\dn mAc\0}\or
+{\dn a\3FEw\4l}\or
+{\dn mI}\or
+{\dn \8{j}n}\or
+{\dn \7{j}lAI}\or
+{\dn ag-t}\or
+{\dn EstMbr}\or
+{\dn a?\8{t}br {\rs (\re}a?Vobr{\rs )\re}}\or
+{\dn nvMbr}\or
+{\dn EdsMbr}\fi\space\@datenumeric\year}}
+
+\def\captionsmodernhindi{%
+\def\abstractname{{\dn sArA\2f}}%
+\def\appendixname{{\dn pErEf\309wV}}%
+\def\bibname{{\dn s\2df\0 g\5\306wT}}% (?)
+\def\ccname{}%
+\def\chaptername{{\dn a@yAy}}%
+\def\contentsname{{\dn Evqy{\rs -\re}\8{s}cF}}%
+\def\enclname{{\dn }}%
+\def\figurename{{\dn Ec/}}% rekhaacitra
+\def\headpagename{{\dn \9{p}\309wW}}%
+\def\headtoname{}%
+\def\indexname{{\dn \8{s}cF}}%
+%                suucaka
+%                anukrama.nikaa
+%                anukrama.ni
+\def\listfigurename{{\dn Ec/o{\qva} kF \8{s}cF}}%
+\def\listtablename{{\dn tAElkAao\2 kF \8{s}cF}}%
+\def\pagename{{\dn \9{p}\309wW}}%
+\def\partname{{\dn K\317wX}}%
+\def\prefacename{{\dn \3FEw-tAvnA}}% praakkathana
+\def\refname{{\dn hvAl\?}}%
+\def\tablename{{\dn tAElkA}}%
+\def\seename{{\dn d\?EKe}}%
+\def\alsoname{{\dn aOr d\?EKe}}%
+\def\alsoseename{{\dn aOr d\?EKe}}}
diff --git a/Build/source/texk/devnag/tests/devnag.test b/Build/source/texk/devnag/tests/devnag.test
new file mode 100755
index 00000000000..a528be0c199
--- /dev/null
+++ b/Build/source/texk/devnag/tests/devnag.test
@@ -0,0 +1,35 @@
+#! /bin/sh
+
+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+failed=
+
+rm -f captions.dn examples.dn *.tex
+cp $srcdir/tests/captions.dn .
+cp $srcdir/tests/examples.dn .
+
+./devnag captions \
+	&& diff $srcdir/tests/captions.tex captions.tex \
+	&& echo "captions.tex tests OK" \
+	|| failed="$failed captions.tex"
+
+./devnag examples.dn \
+	&& diff $srcdir/tests/examples.tex examples.tex \
+	&& echo "examples.tex tests OK" \
+	|| failed="$failed examples.tex"
+
+./devnag $srcdir/tests/misspaal misspaal.tex \
+	&& diff $srcdir/tests/misspaal.tex misspaal.tex \
+	&& echo "misspaal.tex tests OK" \
+	|| failed="$failed misspaal.tex"
+
+./devnag $srcdir/tests/vedasample.dn vedasample.tex \
+	&& diff $srcdir/tests/vedasample.tex vedasample.tex \
+	&& echo "vedasample.tex tests OK" \
+	|| failed="$failed vedasample.tex"
+
+test -z "$failed" && exit 0
+echo "failed tests:$failed"
+exit 1
+
diff --git a/Build/source/texk/devnag/tests/examples.dn b/Build/source/texk/devnag/tests/examples.dn
new file mode 100644
index 00000000000..301c70c550c
--- /dev/null
+++ b/Build/source/texk/devnag/tests/examples.dn
@@ -0,0 +1,159 @@
+@hyphen
+\documentclass[12pt]{article}
+\usepackage{devanagari}
+\parindent=0pt
+
+\begin{document}
+
+\section{Examples}
+
+{\dn
+\begin{center}
+\setlength{\fboxrule}{2pt}
+\framebox[3.2cm][s]{.o ga.ne"saaya nama.h}
+\end{center}
+}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+\begin{center}
+\setlength{\fboxrule}{2pt}
+\framebox[4cm][s]{.o ga.ne"saaya nama.h}
+\end{center}
+}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn\dnnum
+atha ga.nitapraarambhe.abhii.s.tadevataa.m namaskaroti|
+\begin{itemize}
+\setlength{\itemsep}{0mm}
+\item nanu pratyadhyaayamabhii.s.tadevataapra.natipratij~nota
+granthaarambhe k.rtanamaskaare.naabhii.s.tasiddhirbhavati|
+punari.s.tadevataanamaskaare.na ki.m saadhya.m|
+\item ucyate divya.m hyatiindriya.m j~naana.m ga.nita.m
+munibhirmata.m para.m brahmeva durj~neya.m vidyaanaamuttama.m
+tata.h| atho vidyottamatvaatpraarambhe.abhii.s.tadevataasmarana.m
+tathaa caadau madhye tathaa caante granthe kaarye.svapi
+sm.rta.m ma"ngalaacarana.m ce.s.tadevataapuujanaadi ca|
+\end{itemize}
+}
+
+\begin{verbatim}
+\documentclass[12pt]{article}
+\usepackage{devanagari}
+\end{verbatim}
+%\vspace*{-.45cm}
+%\vspace*{-.40cm}
+%\begin{verbatim}
+\verb+\+\verb+begin{document}+ \\
+%\end{verbatim}
+%\vspace*{-.35cm}
+\verb+{\+{\tt dn}\verb+\+{\tt dnnum}
+\begin{verbatim}
+atha ga.nitapraarambhe.abhii.s.tadevataa.m namaskaroti|
+\begin{itemize}
+\setlength{\itemsep}{0mm}
+\item nanu pratyadhyaayamabhii.s.tadevataapra.natipratij~nota
+granthaarambhe k.rtanamaskaare.naabhii.s.tasiddhirbhavati|
+punari.s.tadevataanamaskaare.na ki.m saadhya.m|
+\item ucyate divya.m hyatiindriya.m j~naana.m ga.nita.m
+munibhirmata.m para.m brahmeva durj~neya.m vidyaanaamuttama.m
+tata.h|
+atho vidyottamatvaatpraarambhe.abhii.s.tadevataasmarana.m
+tathaa caadau madhye tathaa caante granthe kaarye.svapi
+sm.rta.m ma"ngalaacarana.m ce.s.tadevataapuujanaadi ca|
+\end{itemize}
+}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \dnnum
+ata ubhayathaa smara.na.m yuktatara.m|
+\begin{verse}
+liilaagalalulallolakaalavyaalavilaasine|\\
+\hspace*{10mm} ga.ne"saaya namo niilakamalaamalakaantaye|| 12||
+\end{verse}
+}
+
+\verb+{\+{\tt dn}\verb+\+{\tt dnnum}
+\begin{verbatim}
+ata ubhayathaa smara.na.m yuktatara.m|
+\begin{verse}
+liilaagalalulallolakaalavyaalavilaasine|\\
+\hspace*{10mm} ga.ne"saaya namo niilakamalaamalakaantaye|| 12||
+\end{verse}
+}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \bfseries
+ata ubhayathaa smara.na.m yuktatara.m|
+}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+ \bfseries ata ubhayathaa smara.na.m yuktatara.m|}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \Large ata ubhayathaa smara.na.m yuktatara.m|}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+ \Large ata ubhayathaa smara.na.m yuktatara.m|}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \dncalcutta ata ubhayathaa smara.na.m yuktatara.m|}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+ \dncalcutta ata ubhayathaa smara.na.m yuktatara.m|}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \dnpen ata ubhayathaa smara.na.m yuktatara.m|}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+ \dnpen ata ubhayathaa smara.na.m yuktatara.m|}
+\end{verbatim}
+
+\newpage
+\hrule
+\medskip
+
+{\dn\dnnum
+"sriibhaaskaraacaaryaga.nita"saastrebhya udaahara.naani
+\begin{enumerate}
+\item liilavaatii
+\item biijaga.nita.m
+\item grahaga.nita.m
+\end{enumerate}
+}
+
+\verb+{\+{\tt dn}\verb+\+{\tt dnnum}
+\begin{verbatim}
+"sriibhaaskaraacaaryaga.nita"saastrebhya udaahara.naani
+\begin{enumerate}
+\item liilavaatii
+\item biijaga.nita.m
+\item grahaga.nita.m
+\end{enumerate}
+}
+\end{verbatim}
+
+\end{document}
diff --git a/Build/source/texk/devnag/tests/examples.tex b/Build/source/texk/devnag/tests/examples.tex
new file mode 100644
index 00000000000..13008240ee5
--- /dev/null
+++ b/Build/source/texk/devnag/tests/examples.tex
@@ -0,0 +1,159 @@
+\def\DevnagVersion{2.15}%@hyphen
+\documentclass[12pt]{article}
+\usepackage{devanagari}
+\parindent=0pt
+
+\begin{document}
+
+\section{Examples}
+
+{\dn
+\begin{center}
+\setlength{\fboxrule}{2pt}
+\framebox[3.2cm][s]{: g\-Z\?\-fA\-y n\-m,}
+\end{center}
+}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+\begin{center}
+\setlength{\fboxrule}{2pt}
+\framebox[4cm][s]{.o ga.ne"saaya nama.h}
+\end{center}
+}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn\dnnum
+a\-T g\-EZ\-t\-\3FEwA\-r\-MB\?\35FwBF\-\3A3w\-d\?\-v\-tA\2 n\-m\--k\-ro\-Et.
+\begin{itemize}
+\setlength{\itemsep}{0mm}
+\item n\-\7{n} \3FEw\-(y\-@yA\-y\-m\-BF\-\3A3w\-d\?\-v\-tA\-\3FEw\-Z\-Et\-\3FEw\-Et\-\3E2wo\-t
+g\5\-\306wTA\-r\-MB\? \9{k}\-t\-n\-m\--kA\-r\?\-ZA\-BF\-\3A3w\-Es\-E\388w\-B\0\-v\-Et.
+\7{p}\-n\-Er\-\3A3w\-d\?\-v\-tA\-n\-m\--kA\-r\?\-Z Ek\2 sA\-@y\2.
+\item u\-Qy\-t\? Ed\-\326wy\2 \39Dw\-tF\-E\306w\qb{d}\-y\2 \3E2wA\-n\2 g\-EZ\-t\2
+\7{m}\-En\-EB\-m\0\-t\2 p\-r\2 b\5\-\39Cw\?\-v \7{d}\-\3E2w\?{\qvb}\-y\2 Ev\-\38DwA\-nA\-\7{m}\-\381w\-m\2
+t\-t,. a\-To Ev\-\38Dwo\-\381w\-m\-(vA\-(\3FEwA\-r\-MB\?\35FwBF\-\3A3w\-d\?\-v\-tA\--m\-r\-n\2
+t\-TA cA\-dO m\-@y\? t\-TA cA\-\306wt\? g\5\-\306wT\? kA\-y\?{\qvb}\-\309wv\-Ep
+-\9{m}\-t\2 m\-\3BDw\-lA\-c\-r\-n\2 c\?\-\3A3w\-d\?\-v\-tA\-\8{p}\-j\-nA\-Ed c.
+\end{itemize}
+}
+
+\begin{verbatim}
+\documentclass[12pt]{article}
+\usepackage{devanagari}
+\end{verbatim}
+%\vspace*{-.45cm}
+%\vspace*{-.40cm}
+%\begin{verbatim}
+\verb+\+\verb+begin{document}+ \\
+%\end{verbatim}
+%\vspace*{-.35cm}
+\verb+{\+{\tt dn}\verb+\+{\tt dnnum}
+\begin{verbatim}
+atha ga.nitapraarambhe.abhii.s.tadevataa.m namaskaroti|
+\begin{itemize}
+\setlength{\itemsep}{0mm}
+\item nanu pratyadhyaayamabhii.s.tadevataapra.natipratij~nota
+granthaarambhe k.rtanamaskaare.naabhii.s.tasiddhirbhavati|
+punari.s.tadevataanamaskaare.na ki.m saadhya.m|
+\item ucyate divya.m hyatiindriya.m j~naana.m ga.nita.m
+munibhirmata.m para.m brahmeva durj~neya.m vidyaanaamuttama.m
+tata.h|
+atho vidyottamatvaatpraarambhe.abhii.s.tadevataasmarana.m
+tathaa caadau madhye tathaa caante granthe kaarye.svapi
+sm.rta.m ma"ngalaacarana.m ce.s.tadevataapuujanaadi ca|
+\end{itemize}
+}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \dnnum
+a\-t u\-B\-y\-TA -m\-r\-Z\2 \7{y}\-\3C4w\-t\-r\2.
+\begin{verse}
+lF\-lA\-g\-l\-\7{l}\-l\-\3A5wo\-l\-kA\-l\-\326wyA\-l\-Ev\-lA\-Es\-n\?.\\
+\hspace*{10mm} g\-Z\?\-fA\-y n\-mo nF\-l\-k\-m\-lA\-m\-l\-kA\-\306wt\-y\?.. \rn{12}..
+\end{verse}
+}
+
+\verb+{\+{\tt dn}\verb+\+{\tt dnnum}
+\begin{verbatim}
+ata ubhayathaa smara.na.m yuktatara.m|
+\begin{verse}
+liilaagalalulallolakaalavyaalavilaasine|\\
+\hspace*{10mm} ga.ne"saaya namo niilakamalaamalakaantaye|| 12||
+\end{verse}
+}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \bfseries
+a\-t u\-B\-y\-TA -m\-r\-Z\2 \7{y}\-\3C4w\-t\-r\2.
+}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+ \bfseries ata ubhayathaa smara.na.m yuktatara.m|}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \Large a\-t u\-B\-y\-TA -m\-r\-Z\2 \7{y}\-\3C4w\-t\-r\2.}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+ \Large ata ubhayathaa smara.na.m yuktatara.m|}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \dncalcutta a\-t u\-B\-y\-TA -m\-r\-Z\2 \7{y}\-\3C4w\-t\-r\2.}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+ \dncalcutta ata ubhayathaa smara.na.m yuktatara.m|}
+\end{verbatim}
+
+\hrule
+\medskip
+
+{\dn \dnpen a\-t u\-B\-y\-TA -m\-r\-Z\2 \7{y}\-\3C4w\-t\-r\2.}
+
+\verb+{\+{\tt dn}
+\begin{verbatim}
+ \dnpen ata ubhayathaa smara.na.m yuktatara.m|}
+\end{verbatim}
+
+\newpage
+\hrule
+\medskip
+
+{\dn\dnnum
+\399wF\-BA\--k\-rA\-cA\-y\0\-g\-EZ\-t\-fA\--/\?\-<y u\-dA\-h\-r\-ZA\-En
+\begin{enumerate}
+\item lF\-l\-vA\-tF
+\item bF\-j\-g\-EZ\-t\2
+\item g\5\-h\-g\-EZ\-t\2
+\end{enumerate}
+}
+
+\verb+{\+{\tt dn}\verb+\+{\tt dnnum}
+\begin{verbatim}
+"sriibhaaskaraacaaryaga.nita"saastrebhya udaahara.naani
+\begin{enumerate}
+\item liilavaatii
+\item biijaga.nita.m
+\item grahaga.nita.m
+\end{enumerate}
+}
+\end{verbatim}
+
+\end{document}
diff --git a/Build/source/texk/devnag/tests/misspaal.dn b/Build/source/texk/devnag/tests/misspaal.dn
new file mode 100644
index 00000000000..e327784ebfa
--- /dev/null
+++ b/Build/source/texk/devnag/tests/misspaal.dn
@@ -0,0 +1,98 @@
+\documentclass[11pt]{article}
+\usepackage{devanagari}
+
+\def\portraitpage{%
+    \setlength{\topmargin}{-0.50in} % real margin == this + 1in
+    \setlength{\oddsidemargin}{-0.0in} % real margin == this + 1in
+    \setlength{\evensidemargin}{-0.0in} % real margin == this + 1in
+    \setlength{\headsep}{-0.0in}
+    \setlength{\footskip}{-0.50in}
+
+    % Use Portrait Size Page
+    \setlength{\textwidth}{6.5in}
+    \setlength{\textheight}{9.75in}%
+}
+\portraitpage
+
+\begin{document}
+\pagestyle{empty}
+
+@modernhindi
+
+\begin{center}
+{\dn \LARGE mis paal}
+\end{center}
+
+\begin{center}
+{\dn \large mohan raake"s}
+\end{center}
+
+{\dn vah duur se dikhaayii detii aak.rti mis paal hii ho sakatii thii|
+phir bhii vi"svaas karane ke lie maiMne apanaa ca"smaa .thiik kiyaa|
+ni.hsaMdeh, vah mis paal hii thii| yah to khair mujhe pataa thaa ki
+vah un dinoM kulluu meM hii kahiiM rahatii hai, par is tarah acaanak usase
+bheM.t ho jaayegii, yah nahiiM socaa thaa| aur use saamane dekhakar bhii
+mujhe vi"svaas nahiiM huaa ki vah sthaayii ruup se kulluu aur manaalii
+ke biic us cho.te-se gaa/v meM rahatii hogii| jab vah dillii se naukarii
+choRakar aayii thii, to logoM ne usake baare meM kyaa-kyaa nahiiM socaa
+thaa!
+
+bas raayasan ke .daakakhaane ke paas pahuMcakar ruk gayii| mis paal
+.daakakhaane ke baahar khaRii pos.tamaas.tar se kuch baat kar rahii thii|
+haath meM vah ek thailaa liye thii| bas ke rukane par na jaane kis baat ke
+lie pos.tamaas.tar ko dhanyavaad detii huii vah bas kii taraph muRii|
+tabhii maiM utarakar usake saamane pahu/c gayaa| ek aadamii ke acaanak
+saamane aa jaane se mis paal thoRaa acakacaa gayii, magar mujhe pahacaanate
+hii usakaa ceharaa khu"sii aur utsaah se khil gayaa|
+
+``ra.najiit tum?'' usane kahaa, ``tum yahaa/ se .tapak paRe?''
+
+``maiM is bas se manaalii se aa rahaa huu/|'' maiMne kahaa|
+
+``acchaa! manaalii tum kab se aaye hue the?''
+
+``aa.th-das din hue, aayaa thaa| aaj vaapas jaa rahaa huu/|''
+
+``aaj hii jaa rahe ho?'' mis paal ke cehare se aadhaa utsaah gaayab ho
+gayaa, ``dekho, kitanii burii baat hai ki aa.th-das din se tum yahaa/
+ho aur mujhase milane kii tumane ko"si"s bhii nahiiM kii| tumheM yah to
+pataa hii thaa ki maiM aajakal kulluu meM huu/|''
+
+``haa/, yah to pataa thaa, par yah nahiiM pataa thaa ki kulluu ke kis
+hisse meM ho| ab bhii tum acaanak hii dikhaayii de gayiiM, nahiiM
+mujhe kahaa/ se pataa calataa ki tum is jaMgal ko aabaad kar rahii ho?''
+
+``sacamuc bahut burii baat hai,'' mis paal ulaahane ke svar meM bolii,
+``tum itane dinoM se yahaa/ ho aur mujhase tumhaarii bheM.t huii aaj
+jaane ke vaqt###|''
+
+.draaivar jor-jor se h~orn bajaane lagaa| mis paal ne kuch ciRhakar
+.draaivar kii taraf dekhaa aur ekasaath jhiRakane k.samaa maa/gane
+ke svar meM kahaa, ``bas jii ek mina.t| maiM bhii isii bas se kulluu
+cal rahii huu/| mujhe kulluu kii ek sii.t de diijie| thaiMk yuu verii
+mac!'' aur phir merii taraf muRakar bolii, ``tum is bas se kahaa/ tak
+jaa rahe ho?''
+
+``aaj to is bas se jogindaranagar jaauu/gaa| vahaa/ ek din rahakar kal
+subah aage kii bas pakaRuu/gaa|''
+
+.draaivar ab aur jor se h~orn bajaane lagaa| mis paal ne ek baar krodh
+aur bebasii ke saath usakii taraf dekhaa aur bas ke daravaaze kii
+taraf baRhatii huii bolii, ``acchaa, kulluu tak to ham logoM kaa saath
+hai hii, aur baat kulluu pahu/cakar kareMge| maiM to kahatii huu/ ki
+tum do-caar din yahiiM ruko, phir cale jaanaa|''
+
+bas meM pahale hii bahut bhiiR thii| do-tiin aadamii vahaa/ se aur caRh
+gaye the, jisase andar khaRe hone kii jagah bhii nahiiM rahii thii|
+mis paal daravaaze se andar jaane lagii to ka.n.dak.tar ne haath
+baRhaakar use rok diyaa| maiMne ka.n.dak.tar se bahuteraa kahaa ki
+andar mere vaalii jagah khaalii hai, mis saahab vahaa/ bai.th
+jaaeMgii aur maiM bhiiR meM kisii tarah khaRaa hokar calaa jaauu/gaa,
+magar ka.n.dak.tar ek baar jid par aRaa to aRaa hii rahaa ki aur
+savaarii vah nahiiM le sakataa| maiM abhii usase baat kar hii rahaa
+thaa ki .draaivar ne bas s.taar.t kar dii| meraa saamaan bas meM thaa,
+isalie maiM dauRakar calatii bas meM savaar ho gayaa| {\rm\ldots{}}\par
+}
+
+\end{document}
+
diff --git a/Build/source/texk/devnag/tests/misspaal.tex b/Build/source/texk/devnag/tests/misspaal.tex
new file mode 100644
index 00000000000..007ec8fdbf7
--- /dev/null
+++ b/Build/source/texk/devnag/tests/misspaal.tex
@@ -0,0 +1,98 @@
+\def\DevnagVersion{2.15}\documentclass[11pt]{article}
+\usepackage{devanagari}
+
+\def\portraitpage{%
+    \setlength{\topmargin}{-0.50in} % real margin == this + 1in
+    \setlength{\oddsidemargin}{-0.0in} % real margin == this + 1in
+    \setlength{\evensidemargin}{-0.0in} % real margin == this + 1in
+    \setlength{\headsep}{-0.0in}
+    \setlength{\footskip}{-0.50in}
+
+    % Use Portrait Size Page
+    \setlength{\textwidth}{6.5in}
+    \setlength{\textheight}{9.75in}%
+}
+\portraitpage
+
+\begin{document}
+\pagestyle{empty}
+
+%@modernhindi
+
+\begin{center}
+{\dn \LARGE Ems pAl}
+\end{center}
+
+\begin{center}
+{\dn \large mohn rAk\?f}
+\end{center}
+
+{\dn vh \8{d}r s\? EdKAyF d\?tF aA\9{k}Et Ems pAl hF ho sktF TF.
+EPr BF Ev\35BwvAs krn\? k\? Ele m\4{\qva}n\? apnA c\35BwmA WFk EkyA.
+En,s\2d\?h{\rs ,\re} vh Ems pAl hF TF. yh to K\4r \7{m}J\? ptA TA Ek
+vh un Edno{\qva} \7{k}S\8{l} m\?{\qva} hF khF{\qva} rhtF h\4{\rs ,\re} pr is trh acAnk uss\?
+B\?{\qva}V ho jAy\?gF{\rs ,\re} yh nhF{\qva} socA TA. aOr us\? sAmn\? d\?Kkr BF
+\7{m}J\? Ev\35BwvAs nhF{\qva} \7{h}aA Ek vh -TAyF !p s\? \7{k}S\8{l} aOr mnAlF
+k\? bFc us CoV\?{\rs -\re}s\? gA\1v m\?{\qva} rhtF hogF. jb vh EdSlF s\? nOkrF
+Cowkr aAyF TF{\rs ,\re} to logo{\qva} n\? usk\? bAr\? m\?{\qva} ?yA{\rs -\re}?yA nhF{\qva} socA
+TA{\rs !\re}
+
+bs rAysn k\? XAkKAn\? k\? pAs p\7{h}\2ckr zk gyF. Ems pAl
+XAkKAn\? k\? bAhr KwF po-VmA-Vr s\? \7{k}C bAt kr rhF TF.
+hAT m\?{\qva} vh ek T\4lA Ely\? TF. bs k\? zkn\? pr n jAn\? Eks bAt k\?
+Ele po-VmA-Vr ko D\306wyvAd d\?tF \7{h}I vh bs kF trP \7{m}wF.
+tBF m\4{\qva} utrkr usk\? sAmn\? p\7{h}\1c gyA. ek aAdmF k\? acAnk
+sAmn\? aA jAn\? s\? Ems pAl TowA ackcA gyF{\rs ,\re} mgr \7{m}J\? phcAnt\?
+hF uskA c\?hrA \7{K}fF aOr u(sAh s\? EKl gyA.
+
+{\rs ``\re}rZjFt \7{t}m{\rs ?''\re} usn\? khA{\rs ,\re} {\rs ``\re}\7{t}m yhA\1 s\? Vpk pw\?{\rs ?''\re}
+
+{\rs ``\re}m\4{\qva} is bs s\? mnAlF s\? aA rhA \8{h}\1.{\rs ''\re} m\4{\qva}n\? khA.
+
+{\rs ``\re}aQCA{\rs !\re} mnAlF \7{t}m kb s\? aAy\? \7{h}e T\?{\rs ?''\re}
+
+{\rs ``\re}aAW{\rs -\re}ds Edn \7{h}e{\rs ,\re} aAyA TA. aAj vAps jA rhA \8{h}\1.{\rs ''\re}
+
+{\rs ``\re}aAj hF jA rh\? ho{\rs ?''\re} Ems pAl k\? c\?hr\? s\? aADA u(sAh gAyb ho
+gyA{\rs ,\re} {\rs ``\re}d\?Ko{\rs ,\re} EktnF \7{b}rF bAt h\4 Ek aAW{\rs -\re}ds Edn s\? \7{t}m yhA\1
+ho aOr \7{m}Js\? Emln\? kF \7{t}mn\? koEff BF nhF{\qva} kF. \7{t}Mh\?{\qva} yh to
+ptA hF TA Ek m\4{\qva} aAjkl \7{k}S\8{l} m\?{\qva} \8{h}\1.{\rs ''\re}
+
+{\rs ``\re}hA\1{\rs ,\re} yh to ptA TA{\rs ,\re} pr yh nhF{\qva} ptA TA Ek \7{k}S\8{l} k\? Eks
+Eh-s\? m\?{\qva} ho. ab BF \7{t}m acAnk hF EdKAyF d\? gyF{\qva}{\rs ,\re} nhF{\qva}
+\7{m}J\? khA\1 s\? ptA cltA Ek \7{t}m is j\2gl ko aAbAd kr rhF ho{\rs ?''\re}
+
+{\rs ``\re}sc\7{m}c b\7{h}t \7{b}rF bAt h\4{\rs ,''\re} Ems pAl ulAhn\? k\? -vr m\?{\qva} bolF{\rs ,\re}
+{\rs ``\re}\7{t}m itn\? Edno{\qva} s\? yhA\1 ho aOr \7{m}Js\? \7{t}MhArF B\?{\qva}V \7{h}I aAj
+jAn\? k\? v\30Awt\315w\315w\315w.{\rs ''\re}
+
+\6{X}Aivr jor{\rs -\re}jor s\? hA\<n\0 bjAn\? lgA. Ems pAl n\? \7{k}C Ecxkr
+\6{X}Aivr kF tr\327w d\?KA aOr eksAT EJwkn\? \322wmA mA\1gn\?
+k\? -vr m\?{\qva} khA{\rs ,\re} {\rs ``\re}bs jF ek EmnV. m\4{\qva} BF isF bs s\? \7{k}S\8{l}
+cl rhF \8{h}\1. \7{m}J\? \7{k}S\8{l} kF ek sFV d\? dFEje. T\4{\qva}k \8{y} v\?rF
+mc{\rs !''\re} aOr EPr m\?rF tr\327w \7{m}wkr bolF{\rs ,\re} {\rs ``\re}\7{t}m is bs s\? khA\1 tk
+jA rh\? ho{\rs ?''\re}
+
+{\rs ``\re}aAj to is bs s\? joEg\306wdrngr jAU\1gA. vhA\1 ek Edn rhkr kl
+\7{s}bh aAg\? kF bs pk\8{w}\1gA.{\rs ''\re}
+
+\6{X}Aivr ab aOr jor s\? hA\<n\0 bjAn\? lgA. Ems pAl n\? ek bAr \387woD
+aOr b\?bsF k\? sAT uskF tr\327w d\?KA aOr bs k\? drvA)\? kF
+tr\327w bxtF \7{h}I bolF{\rs ,\re} {\rs ``\re}aQCA{\rs ,\re} \7{k}S\8{l} tk to hm logo{\qva} kA sAT
+h\4 hF{\rs ,\re} aOr bAt \7{k}S\8{l} p\7{h}\1ckr kr\?{\qva}g\?. m\4{\qva} to khtF \8{h}\1 Ek
+\7{t}m do{\rs -\re}cAr Edn yhF{\qva} zko{\rs ,\re} EPr cl\? jAnA.{\rs ''\re}
+
+bs m\?{\qva} phl\? hF b\7{h}t BFw TF. do{\rs -\re}tFn aAdmF vhA\1 s\? aOr cx
+gy\? T\?{\rs ,\re} Ejss\? a\306wdr Kw\? hon\? kF jgh BF nhF{\qva} rhF TF.
+Ems pAl drvA)\? s\? a\306wdr jAn\? lgF to k\317wX?Vr n\? hAT
+bxAkr us\? rok EdyA. m\4{\qva}n\? k\317wX?Vr s\? b\7{h}t\?rA khA Ek
+a\306wdr m\?r\? vAlF jgh KAlF h\4{\rs ,\re} Ems sAhb vhA\1 b\4W
+jAe\2gF aOr m\4{\qva} BFw m\?{\qva} EksF trh KwA hokr clA jAU\1gA{\rs ,\re}
+mgr k\317wX?Vr ek bAr Ejd pr awA to awA hF rhA Ek aOr
+svArF vh nhF{\qva} l\? sktA. m\4{\qva} aBF uss\? bAt kr hF rhA
+TA Ek \6{X}Aivr n\? bs -VAV\0 kr dF. m\?rA sAmAn bs m\?{\qva} TA{\rs ,\re}
+isEle m\4{\qva} dOwkr cltF bs m\?{\qva} svAr ho gyA. {\rm\ldots{}}\par
+}
+
+\end{document}
+
diff --git a/Build/source/texk/devnag/tests/vedasample.dn b/Build/source/texk/devnag/tests/vedasample.dn
new file mode 100644
index 00000000000..c2a10256e94
--- /dev/null
+++ b/Build/source/texk/devnag/tests/vedasample.dn
@@ -0,0 +1,118 @@
+\input dnmacs
+\font\dnhead=dvnc10 at 20pt
+\font\rmhead=cmr10 at 14pt
+\def\newpage{\vfill\eject}
+\def\newline{\hfill\break}
+\def\skiphead{\vskip 2pc}
+\def\skipline{\vskip 1pc}
+\def\samaindent{\parindent=1.0in}
+\nopagenumbers
+
+{\dn\dnnum\dncalcutta\dnbig
+
+\centerline{{\dnhead .rgveda sa.mhitaa}}
+\skipline
+
+{\dnveda
+
+\_{a}gni\|{mii}Le \_{pu}ro\|{hi}ta.m \_{ya}j~na\|{sya}
+\_{de}va\_{m.r}tvi\|{ja}m |\ %
+ho\|{taa}ra.m ra\_{tna}dhaa\|{ta}mam \quad 1
+
+\_{a}gni.h puurve\_{bhi}r.r\|{.si}\_{bhi}\~rii\_{.dyo}
+nuu\|{ta}nai\_{ru}ta |\ %
+sa \_{de}vaa/ eha \|{va}k.sati \quad 2
+
+\_{a}gni\|{naa} \_{ra}yi\|{ma}.sna\_{va}t po\|{.sa}\_{me}va
+\_{di}ve\|{di}ve |\ %
+\_{ya}"sa\|{sa.m} \_{vii}ra\|{va}ttamam \quad 3 \qquad {\dnnormal 1..1}
+
+\skipline
+
+\|{da}\_{"sa}me \_{yu}ge \_{ya}tii\|{naa.m} \_{bra}hmaa
+\|{bha}va\_{ti} saa\|{ra}thi.h| \qquad {\dnnormal 1..158..6}
+
+\skipline
+
+\_{.r}co \_{a}k.sa\|{re} pa\_{ra}me \|{vyo}\_{ma}n \quad
+ya\|{smi}n \_{de}vaa a\_{dhi} vi\|{"sve} ni\_{.se}du.h| \par
+yastanna ve\_{da} ki\_{m.r}caa \|{ka}ri.sya\_{ti} \quad
+ya it tad \_{vi}dusta \_{i}me sa\|{maa}sate || \qquad {\dnnormal 1..164..39}
+
+\skipline
+
+\_{duu}\_{re}d.r"sa.m \_{g.r}ha\|{pa}tima\_{tha}ryum| \qquad
+{\dnnormal 7..1..1}
+
+\skipline
+
+\_{sa}ha\|{sra}"sii\_{r.saa} pu\|{ru}.sa \qquad {\dnnormal 10..90..1}
+
+\skipline
+
+\|{ya}thaa\_{puu}rva\|{ma}kalpayat| \qquad {\dnnormal 10..190..3}
+
+}
+
+}
+
+\skiphead
+\centerline{{\rmhead \d{R}gveda sa\d{m}hit\=a}}
+\skipline
+
+{\rm\dnvedatrans
+
+1.1.1 \qquad
+\_agnim\|{\={\i}}\d{l}e p\_uroh\|ita\d{m} y\_aj\~nasy\|a 
+d\_evam\_{\d{r}}tvij\|am \qquad
+hot\|{\=a}ra\d{m} ratn\_adh\=at\|amam 
+
+}
+
+{\dn\dnnum\dncalcutta\dnbig
+
+\skiphead
+\centerline{{\dnhead saamaveda sa.mhitaa}}
+\skipline
+
+{\dnsamaveda\samaindent
+
+\item{1} \^{a}{2}\^{gna}{3} \^{aa}{1} \^{yaa}{2}hi
+\^{vii}{3}\^{ta}{1}\^{ye}{2} g.r\^{.naa}{3}\^{no}{2}
+\^{ha}{3}\^{vya}{1}\^{daa}{2}taye \newline
+\^{ni}{1} ho\^{taa}{2ra} satsi \^{ba}{3}\^{rhi}{1}\^{.si}{2} \quad 1
+
+\skipline
+
+\item{2} \^{tva}{1}\^{ma}{2}gne \^{ya}{3}\^{j~naa}{2}\^{naa}{3}\@\ %
+\^{ho}{2}\^{taa}{3} \^{vi}{1}\^{"sve}{2}.saa\@\ %
+\^{hi}{3}\^{ta}{2}.h \newline
+\^{de}{3}\^{ve}{2}\^{bhi}{3}\^{rmaa}{1}\^{nu}{2}\^{.se}{3}
+\^{ja}{1}\^{ne}{2} \quad 2
+
+\skipline
+
+\item{3} \^{a}{3}\^{gni.m}{2} \^{duu}{3}\^{ta.m}{1}
+\^{v.r}{2}.niima\^{he}{3} \^{ho}{1}\^{taa}{2}ra.m
+\^{vi}{3}\^{"sva}{1}\^{ve}{2}dasam \newline
+\^{a}{3}\^{sya}{2} \^{ya}{3}\^{j~na}{1}\^{sya}{2}
+\^{su}{3}\^{kra}{1}\^{tu}{2}m \quad 3
+
+}
+
+}
+
+\skiphead
+\centerline{{\rmhead S\=amaveda sa\d{m}hit\=a}}
+\skipline
+
+{\rm\dnsamavedatrans
+
+\item{1.1} a\^2gna\^3 \=a\^1 y\=a\^2hi
+v\={\i}\^3ta\^1ye\^2 g\d{r}\d{n}\=a\^3no\^2
+ha\^3vya\^1d\=a\^2taye \newline
+ni\^1 hot\=a\^{2ra} satsi ba\^3rhi\^1\d{s}i\^2
+
+}
+
+\end
\ No newline at end of file
diff --git a/Build/source/texk/devnag/tests/vedasample.tex b/Build/source/texk/devnag/tests/vedasample.tex
new file mode 100644
index 00000000000..924a6671f31
--- /dev/null
+++ b/Build/source/texk/devnag/tests/vedasample.tex
@@ -0,0 +1,118 @@
+\def\DevnagVersion{2.15}\input dnmacs
+\font\dnhead=dvnc10 at 20pt
+\font\rmhead=cmr10 at 14pt
+\def\newpage{\vfill\eject}
+\def\newline{\hfill\break}
+\def\skiphead{\vskip 2pc}
+\def\skipline{\vskip 1pc}
+\def\samaindent{\parindent=1.0in}
+\nopagenumbers
+
+{\dn\dnnum\dncalcutta\dnbig
+
+\centerline{{\dnhead \31Bw`v\?d s\2EhtA}}
+\skipline
+
+{\dnveda
+
+\_{a}E`n\|{mF}\30Fw\? \_{\7{p}}ro\|{Eh}t\2 \_{y}\3E2w\|{-y}
+\_{d\?}v\_{\9{m}}E(v\|{j}\qq{m} .\ %
+ho\|{tA}r\2 r\_{\3D7w}DA\|{t}m\qq{m} \quad \rn{1}
+
+\_{a}E`n, \8{p}v\?{\qvb}\_{EB}\31Bw\0\|{Eq}\_{EB}\~rF\_{\3B7wo}
+\8{n}\|{t}n\4\_{z}t .\ %
+s \_{d\?}vA\1 eh \|{v}\322wEt \quad \rn{2}
+
+\_{a}E`n\|{nA} \_{r}Ey\|{m}\309wn\_{v}\qq{t} po\|{q}\_{m\?}v
+\_{Ed}v\?\|{Ed}v\? .\ %
+\_{y}f\|{s\2} \_{vF}r\|{v}\381wm\qq{m} \quad \rn{3} \qquad {\dnnormal \rn{1}\314w\rn{1}}
+
+\skipline
+
+\|{d}\_{f}m\? \_{\7{y}}g\? \_{y}tF\|{nA\2} \_{b\5}\39CwA
+\|{B}v\_{Et} sA\|{r}ET,. \qquad {\dnnormal \rn{1}\314w\rn{158}\314w\rn{6}}
+
+\skipline
+
+\_{\31Bw}co \_{a}\322w\|{r\?} p\_{r}m\? \|{\326wyo}\_{m}\qq{n} \quad
+y\|{E-m}\qq{n} \_{d\?}vA a\_{ED} Ev\|{\398w\?} En\_{q\?}\7{d},. \par
+y-t\3E0w v\?\_{d} Ek\_{\9{m}}cA \|{k}Er\309wy\_{Et} \quad
+y i\qq{t} t\qq{d} \_{Ev}\7{d}-t \_{i}m\? s\|{mA}st\? .. \qquad {\dnnormal \rn{1}\314w\rn{164}\314w\rn{39}}
+
+\skipline
+
+\_{\8{d}}\_{r\?}\9{d}f\2 \_{\9{g}}h\|{p}Etm\_{T}\7{y}\0\qq{m}. \qquad
+{\dnnormal \rn{7}\314w\rn{1}\314w\rn{1}}
+
+\skipline
+
+\_{s}h\|{\3FAw}fF\_{qA\0} \7{p}\|{z}q \qquad {\dnnormal \rn{10}\314w\rn{90}\314w\rn{1}}
+
+\skipline
+
+\|{y}TA\_{\8{p}}v\0\|{m}kSpy\qq{t}. \qquad {\dnnormal \rn{10}\314w\rn{190}\314w\rn{3}}
+
+}
+
+}
+
+\skiphead
+\centerline{{\rmhead \d{R}gveda sa\d{m}hit\=a}}
+\skipline
+
+{\rm\dnvedatrans
+
+1.1.1 \qquad
+\_agnim\|{\={\i}}\d{l}e p\_uroh\|ita\d{m} y\_aj\~nasy\|a 
+d\_evam\_{\d{r}}tvij\|am \qquad
+hot\|{\=a}ra\d{m} ratn\_adh\=at\|amam 
+
+}
+
+{\dn\dnnum\dncalcutta\dnbig
+
+\skiphead
+\centerline{{\dnhead sAmv\?d s\2EhtA}}
+\skipline
+
+{\dnsamaveda\samaindent
+
+\item{\rn{1}} \^{a}{\rn{2}}\^{`n}{\rn{3}} \^{aA}{\rn{1}} \^{yA}{\rn{2}}Eh
+\^{vF}{\rn{3}}\^{t}{\rn{1}}\^{y\?}{\rn{2}} \9{g}\^{ZA}{\rn{3}}\^{no}{\rn{2}}
+\^{h}{\rn{3}}\^{\326wy}{\rn{1}}\^{dA}{\rn{2}}ty\? \newline
+\^{En}{\rn{1}} ho\^{tA}{\rn{2}r} sE(s \^{b}{\rn{3}}\^{Eh\0}{\rn{1}}\^{Eq}{\rn{2}} \quad \rn{1}
+
+\skipline
+
+\item{\rn{2}} \^{(v}{\rn{1}}\^{m}{\rn{2}}`n\? \^{y}{\rn{3}}\^{\3E2wA}{\rn{2}}\^{nA}{\rn{3}}\@\ %
+\^{ho}{\rn{2}}\^{tA}{\rn{3}} \^{Ev}{\rn{1}}\^{\398w\?}{\rn{2}}qA\@\ %
+\^{Eh}{\rn{3}}\^{t}{\rn{2}}, \newline
+\^{d\?}{\rn{3}}\^{v\?}{\rn{2}}\^{EB}{\rn{3}}\^{mA\0}{\rn{1}}\^{\7{n}}{\rn{2}}\^{q\?}{\rn{3}}
+\^{j}{\rn{1}}\^{n\?}{\rn{2}} \quad \rn{2}
+
+\skipline
+
+\item{\rn{3}} \^{a}{\rn{3}}\^{E`n\2}{\rn{2}} \^{\8{d}}{\rn{3}}\^{t\2}{\rn{1}}
+\^{\9{v}}{\rn{2}}ZFm\^{h\?}{\rn{3}} \^{ho}{\rn{1}}\^{tA}{\rn{2}}r\2
+\^{Ev}{\rn{3}}\^{\398w}{\rn{1}}\^{v\?}{\rn{2}}ds\qq{m} \newline
+\^{a}{\rn{3}}\^{-y}{\rn{2}} \^{y}{\rn{3}}\^{\3E2w}{\rn{1}}\^{-y}{\rn{2}}
+\^{\7{s}}{\rn{3}}\^{\387w}{\rn{1}}\^{\7{t}}{\rn{2}}\qq{m} \quad \rn{3}
+
+}
+
+}
+
+\skiphead
+\centerline{{\rmhead S\=amaveda sa\d{m}hit\=a}}
+\skipline
+
+{\rm\dnsamavedatrans
+
+\item{1.1} a\^2gna\^3 \=a\^1 y\=a\^2hi
+v\={\i}\^3ta\^1ye\^2 g\d{r}\d{n}\=a\^3no\^2
+ha\^3vya\^1d\=a\^2taye \newline
+ni\^1 hot\=a\^{2ra} satsi ba\^3rhi\^1\d{s}i\^2
+
+}
+
+\end
\ No newline at end of file
diff --git a/Build/source/texk/web2c/luatexdir/lua52/lauxlib.c b/Build/source/texk/web2c/luatexdir/lua52/lauxlib.c
index 36ae7e629f5..3785ecc84a7 100644
--- a/Build/source/texk/web2c/luatexdir/lua52/lauxlib.c
+++ b/Build/source/texk/web2c/luatexdir/lua52/lauxlib.c
@@ -598,7 +598,7 @@ static int skipBOM (LoadF *lf) {
   lf->n = 0;
   do {
     c = getc(lf->f);
-    if (c == EOF || c != *(unsigned char *)p++) return c;
+    if (c == EOF || c != *(const unsigned char *)p++) return c;
     lf->buff[lf->n++] = c;  /* to be read by the parser */
   } while (*p != '\0');
   lf->n = 0;  /* prefix matched; discard it */