diff options
Diffstat (limited to 'Build/source/utils/vlna')
20 files changed, 490 insertions, 37 deletions
diff --git a/Build/source/utils/vlna/ChangeLog b/Build/source/utils/vlna/ChangeLog index b301a8b245a..078e4bc6029 100644 --- a/Build/source/utils/vlna/ChangeLog +++ b/Build/source/utils/vlna/ChangeLog @@ -1,7 +1,12 @@ +2011-05-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am, configure.ac: Reformulate in terms of vlna-1.5 + source tree and patches in vlna-1.5-PATCHES. + 2011-05-02 Peter Breitenlohner <peb@mppmu.mpg.de> * vlna.w (hexnum, settiestr): Declare as static. - (settiestr): Dreop unused local variable 'c'. + (settiestr): Drop unused local variable 'c'. 2011-04-27 Karl Berry <karl@tug.org> diff --git a/Build/source/utils/vlna/Makefile.am b/Build/source/utils/vlna/Makefile.am index 3511292221a..c9fd807c90d 100644 --- a/Build/source/utils/vlna/Makefile.am +++ b/Build/source/utils/vlna/Makefile.am @@ -5,38 +5,38 @@ ## ACLOCAL_AMFLAGS = -I ../../m4 -AM_CFLAGS = $(WARNING_CFLAGS) - -bin_PROGRAMS = vlna -dist_man1_MANS = vlna.man +## We want to re-distribute the whole original vlna source tree. +EXTRA_DIST = $(VLNA_TREE) +## Patches applied to the original source tree +EXTRA_DIST += $(VLNA_TREE)-PATCHES -CWEB_SRC = vlna.w -CSMAC = csmac.tex -CWEB_TEX = vlna.tex vlna.idx vlna.scn -CWEB_DVI = vlna.dvi +# in case of an SVN repository +dist-hook: + rm -rf `find $(distdir) -name .svn` -DOCS = README README.en vlna.txt vlna-cz.man +AM_CFLAGS = $(WARNING_CFLAGS) -EXTRA_DIST = $(CWEB_SRC) $(CSMAC) $(CWEB_TEX) $(CWEB_DVI) $(DOCS) +bin_PROGRAMS = vlna +man1_MANS = $(VLNA_TREE)/vlna.man CLEANFILES = vlna.log vlna.toc vlna.dvi: vlna.tex vlna.idx vlna.scn - TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(CSPLAIN) vlna.tex + TEXINPUTS=.:$(srcdir)/$(VLNA_TREE):$$TEXINPUTS $(CSPLAIN) vlna.tex # Running cweave in order to create vlna.tex generates in addition # vlna.idx and vlna.scn; we must rerun cweave when they are not # up to date (even if vlna.tex is up to date). Thus the sub-make. # -vlna.tex vlna.idx vlna.scn: vlna.w +vlna.tex vlna.idx vlna.scn: $(VLNA_TREE)/vlna.w $(MAKE) $(AM_MAKEFLAGS) do-cweave -do-cweave: vlna.w .FORCE +do-cweave: $(VLNA_TREE)/vlna.w .FORCE $(CWEAVE) $< .PHONY: do-cweave .FORCE if do_cweb all-local: vlna.dvi -vlna.c: vlna.w +vlna.c: $(VLNA_TREE)/vlna.w $(CTANGLE) $< else !do_cweb all-local: diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in index 094cd4a38cd..1f2a8f1587d 100644 --- a/Build/source/utils/vlna/Makefile.in +++ b/Build/source/utils/vlna/Makefile.in @@ -34,8 +34,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = vlna$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \ - $(srcdir)/../../build-aux/depcomp \ +DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/configure \ @@ -91,7 +90,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' man1dir = $(mandir)/man1 NROFF = nroff -MANS = $(dist_man1_MANS) +MANS = $(man1_MANS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -150,6 +149,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +VLNA_TREE = @VLNA_TREE@ WARNING_CFLAGS = @WARNING_CFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -194,14 +194,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 +EXTRA_DIST = $(VLNA_TREE) $(VLNA_TREE)-PATCHES AM_CFLAGS = $(WARNING_CFLAGS) -dist_man1_MANS = vlna.man -CWEB_SRC = vlna.w -CSMAC = csmac.tex -CWEB_TEX = vlna.tex vlna.idx vlna.scn -CWEB_DVI = vlna.dvi -DOCS = README README.en vlna.txt vlna-cz.man -EXTRA_DIST = $(CWEB_SRC) $(CSMAC) $(CWEB_TEX) $(CWEB_DVI) $(DOCS) +man1_MANS = $(VLNA_TREE)/vlna.man CLEANFILES = vlna.log vlna.toc all: all-am @@ -303,10 +298,10 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -install-man1: $(dist_man1_MANS) +install-man1: $(man1_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ + @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ { for i in $$list; do echo "$$i"; done; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ @@ -330,7 +325,7 @@ install-man1: $(dist_man1_MANS) uninstall-man1: @$(NORMAL_UNINSTALL) - @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \ + @list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ @@ -435,6 +430,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -661,8 +659,8 @@ uninstall-man: uninstall-man1 .PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \ clean clean-binPROGRAMS clean-generic ctags dist dist-all \ - dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-compile \ + dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-compile \ distclean-generic distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ @@ -677,21 +675,25 @@ uninstall-man: uninstall-man1 uninstall-man1 +# in case of an SVN repository +dist-hook: + rm -rf `find $(distdir) -name .svn` + vlna.dvi: vlna.tex vlna.idx vlna.scn - TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(CSPLAIN) vlna.tex + TEXINPUTS=.:$(srcdir)/$(VLNA_TREE):$$TEXINPUTS $(CSPLAIN) vlna.tex # Running cweave in order to create vlna.tex generates in addition # vlna.idx and vlna.scn; we must rerun cweave when they are not # up to date (even if vlna.tex is up to date). Thus the sub-make. # -vlna.tex vlna.idx vlna.scn: vlna.w +vlna.tex vlna.idx vlna.scn: $(VLNA_TREE)/vlna.w $(MAKE) $(AM_MAKEFLAGS) do-cweave -do-cweave: vlna.w .FORCE +do-cweave: $(VLNA_TREE)/vlna.w .FORCE $(CWEAVE) $< .PHONY: do-cweave .FORCE @do_cweb_TRUE@all-local: vlna.dvi -@do_cweb_TRUE@vlna.c: vlna.w +@do_cweb_TRUE@vlna.c: $(VLNA_TREE)/vlna.w @do_cweb_TRUE@ $(CTANGLE) $< @do_cweb_FALSE@all-local: diff --git a/Build/source/utils/vlna/configure b/Build/source/utils/vlna/configure index ffa6816acd3..d52bdd60dcf 100755 --- a/Build/source/utils/vlna/configure +++ b/Build/source/utils/vlna/configure @@ -564,11 +564,12 @@ PACKAGE_STRING='vlna for TeX Live 1.5' PACKAGE_BUGREPORT='tex-live@tug.org' PACKAGE_URL='' -ac_unique_file="vlna.w" +ac_unique_file="vlna-1.5/vlna.w" ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +VLNA_TREE do_cweb_FALSE do_cweb_TRUE CSPLAIN @@ -3498,6 +3499,9 @@ else fi +VLNA_TREE=vlna-1.5 + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/Build/source/utils/vlna/configure.ac b/Build/source/utils/vlna/configure.ac index 9d177c53ca1..d468b90066a 100644 --- a/Build/source/utils/vlna/configure.ac +++ b/Build/source/utils/vlna/configure.ac @@ -6,9 +6,10 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([vlna for TeX Live], [1.5], [tex-live@tug.org]) +m4_define([vlna_version], [1.5])[]dnl using unmodified vlna source tree +AC_INIT([vlna for TeX Live], vlna_version, [tex-live@tug.org]) AC_PREREQ([2.65]) -AC_CONFIG_SRCDIR([vlna.w]) +AC_CONFIG_SRCDIR([vlna-]vlna_version[/vlna.w]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) @@ -37,5 +38,7 @@ if test x"$do_cweb" = xyes; then fi AM_CONDITIONAL([do_cweb], [test "x$do_cweb" = xyes]) +AC_SUBST([VLNA_TREE], [vlna-]vlna_version) + AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/ChangeLog b/Build/source/utils/vlna/vlna-1.5-PATCHES/ChangeLog new file mode 100644 index 00000000000..64e27dced7e --- /dev/null +++ b/Build/source/utils/vlna/vlna-1.5-PATCHES/ChangeLog @@ -0,0 +1,9 @@ +2011-05-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-0[123]-warnings (new): Document changes applied to the + vlna-1.5 source tree. + +2011-04-27 Karl Berry <karl@tug.org> + + * Import 1.5 from ftp://math.feld.cvut.cz/pub/olsak/vlna. + diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/TL-Changes b/Build/source/utils/vlna/vlna-1.5-PATCHES/TL-Changes new file mode 100644 index 00000000000..353390c0867 --- /dev/null +++ b/Build/source/utils/vlna/vlna-1.5-PATCHES/TL-Changes @@ -0,0 +1,18 @@ +Changes applied to the vlna-1.5 tree as obtained from: + ftp://math.feld.cvut.cz/pub/olsak/vlna/vlna-1.5.tar.gz + +Remove: + Makefile.in + aclocal.m4 + configure + depcomp + install-sh + missing + +Remove and regenerate in ../: + vlna.c + vlna.dvi + vlna.idx + vlna.scn + vlna.tex + diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-01-warnings b/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-01-warnings new file mode 100644 index 00000000000..290b32176be --- /dev/null +++ b/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-01-warnings @@ -0,0 +1,240 @@ +2009-08-19 Peter Breitenlohner <peb@mppmu.mpg.de> + + * vlna.c: Use ANSI C function definitions, all static except main. + +diff -ur vlna-1.5.orig/vlna.w vlna-1.5/vlna.w +--- vlna-1.5.orig/vlna.w 2010-02-01 22:52:15.000000000 +0100 ++++ vlna-1.5/vlna.w 2011-05-02 15:58:47.000000000 +0200 +@@ -59,9 +59,7 @@ + + @ Základní rozvržení funkce |main|. + @<Hlavní program@>= +-int main (argc,argv) +- int argc; +- char **argv; ++int main (int argc, char **argv) + { + @<Lokální proměnné funkce |main|@>; + prog_name=argv[0]; status = OK; +@@ -112,7 +110,7 @@ + kulturně dlouhý string obsahující \.{\char92n} s formátovacími + požadavky. Byl jsem nucen to takto nehezky zapsat. + @<Pomocné funkce@>= +-void printusage () ++static void printusage (void) + { + fprintf(stderr, + "usage: vlna [opt] [filenames]\n" +@@ -204,8 +202,7 @@ + @ Definujeme funkci pro výpis chybového hlášení při neúspěšném otevření + souboru. + @<Pomocné funkce@>= +-void ioerr (f) +- char *f; ++static void ioerr (char *f) + { + fprintf(stderr, "%s: cannot open file %s\n", prog_name, f); + } +@@ -335,7 +332,7 @@ + } PATITEM; + typedef struct PATTERN { /* jeden pattern */ + PATITEM *patt; /* ukazatel na prvni pozici */ +- void (*proc)(); /* procedura spustena pri souhlasu patternu */ ++ void (*proc)(void); /* procedura spustena pri souhlasu patternu */ + struct PATTERN *next ; /* nasledujici v seznamu vsech patternu */ + } PATTERN; + +@@ -407,8 +404,7 @@ + ohlídat případnou chybu při alokaci, budeme allokovat paměť zprostředkovaně + pomocí funkce |myalloc|. + @<Pomocné funkce@>= +-void *myalloc (size) +- int size; ++static void *myalloc (int size) + { + void *p; + p = malloc (size); +@@ -425,8 +421,7 @@ + Vrátí ukazatel na nově alokované místo. Jednotlivé pozice patternu se musí + následovně alokovat pomocí |setpi|. + @<Pomocné funkce@>= +-PATTERN *setpattern (proc) @/ +- void (*proc)(); ++static PATTERN *setpattern (void (*proc)(void)) + { + PATTERN *pp; + pp = myalloc (sizeof (PATTERN)); +@@ -444,9 +439,7 @@ + |patt| ve struktuře |PATTERN| a další byly provázány položkou |next| ve + struktuře |PATITEM|. Poslední pozice má |next==NULL|. + @<Pomocné funkce@>= +-void setpi (str, flag) +- char *str; +- int flag; ++static void setpi (char *str, int flag) + { + PATITEM* p; + p = myalloc (sizeof (PATITEM)); +@@ -479,9 +472,7 @@ + + @ Definujme funkci |normalpattern|. + @<Pomocné funkce@>= +-PATTERN *normalpattern (proc, str) @/ +- void (*proc)(); +- char *str; ++static PATTERN *normalpattern (void (*proc)(void), char *str) + { + PATTERN *pp; + int j=0; +@@ -517,8 +508,7 @@ + @d FOUND -1 + @d NOFOUND -2 + @<Pomocné funkce@>= +-int match (p) +- PATITEM *p; ++static int match (PATITEM *p) + { + int m; + if (strchr (p->str, c) != NULL) m = 1; /* Znak nalezen */ +@@ -565,8 +555,7 @@ + implementovat jen přepínání mezi stavem čtení z oblasti komentáře + (|listpatt==commentlist|) a mimo komentář (|listpatt==normallist|); + @<Vlnkovací funkce |tie|@>= +-void tie (input, output) +- FILE *input, *output; ++static void tie (FILE *input, FILE *output) + { + int ap; /* ap je pocet otevrenych patternu */ + register int k, m, n; +@@ -736,7 +725,7 @@ + neboli vlnku. Nakonec připojíme zapamatovaný znak |p|, ovšem pokud před ním byla nula, + vložíme ji ještě před znak |p|. + @<Pomocné funkce@>= +-void vlnkain() ++static void vlnkain(void) + { + int i; + char p, z; +@@ -780,7 +769,7 @@ + situaci pouze zrušíme stávající (v pořadí druhé) \uv{\.{\char92n}} a + nebudeme vytvářet nové. Na výstupu bude soubor o jeden řádek kratší. + @<Pomocné funkce@>= +-void vlnkacr() ++static void vlnkacr(void) + { + char p, z; + int i, j; +@@ -850,7 +839,7 @@ + hodnotu proměnné |c|. Stačí tedy změnit hodnotu |c| a vlnkovací patterny se + neotevřou. + @<Pomocné funkce@>= +-void tielock () ++static void tielock (void) + { + c = 1; + } +@@ -859,7 +848,7 @@ + módu vlnky neděláme. Při zjištěném nesouladu v přechodech mezi + math-módy spustíme následující proceduru. + @<Pomocné funkce@>= +-void printwarning () ++static void printwarning (void) + { + if (!silent) + fprintf (stderr, +@@ -884,13 +873,13 @@ + } + + @ @<Pomocné funkce@>= +-void mathin () ++static void mathin (void) + { + if (mode!=TEXTMODE) printwarning (); + mode = MATHMODE; + normallist = listpatt = mathlist; + } +-void mathout () ++static void mathout (void) + { + if (mode!=MATHMODE) printwarning (); + mode = TEXTMODE; +@@ -902,7 +891,7 @@ + \.{\$\$} souhlasí ten druhý dolar s naším patternem, ale to už jsme uvnitř + display módu. V takovém případě také nic neděláme. + @<Pomocné funkce@>= +-void onedollar () ++static void onedollar (void) + { + if (buffnz[inz-3]=='\\' || (buffnz[inz-3]=='$' && buffnz[inz-4]!='\\')) return; + if (mode==DISPLAYMODE) printwarning (); +@@ -921,7 +910,7 @@ + setpi (cr, ONE); + + @ @<Pomocné funkce@>= +-void checkmode () ++static void checkmode (void) + { + if (mode!=TEXTMODE) { + printwarning (); +@@ -947,17 +936,17 @@ + } + + @ @<Pomocné funkce@>= +-void displayin () ++static void displayin (void) + { + if (mode!=TEXTMODE) printwarning (); + mode = DISPLAYMODE; normallist = listpatt = parcheck; + } +-void displayout () ++static void displayout (void) + { + if (mode!=DISPLAYMODE) printwarning(); + mode = TEXTMODE; normallist = listpatt = vlnkalist; + } +-void twodollars () ++static void twodollars (void) + { + if (buffnz[inz-3]=='\\') return; + if (mode==DISPLAYMODE) displayout (); +@@ -999,7 +988,7 @@ + int prevmode; + PATTERN *prevlist, *verboutlist[4]; + char verbchar[2]; +-void verbinchar () ++static void verbinchar (void) + { + prevmode = mode; + verbchar[0] = c; +@@ -1017,7 +1006,7 @@ + math. módu může být + \.{\char92hbox} a v něm lokálně verbatim konstrukce). + @<Pomocné funkce@>= +-void verbin () ++static void verbin (void) + { + int i; + i = 0; +@@ -1037,7 +1026,7 @@ + } + + @ @<Pomocné funkce@>= +-void verbout () ++static void verbout (void) + { + if (mode!=VERBMODE) return; + if (web && buffnz[inz-2] == '@@' && buffnz[inz-3] == '@@') return; +@@ -1059,11 +1048,11 @@ + normalpattern (tieon, "%.~.+"); + + @ @<Pomocné funkce@>= +-void tieoff () ++static void tieoff (void) + { + normallist = NULL; + } +-void tieon () ++static void tieon (void) + { + normallist = vlnkalist; + } diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-02-warnings b/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-02-warnings new file mode 100644 index 00000000000..ac53828ba90 --- /dev/null +++ b/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-02-warnings @@ -0,0 +1,26 @@ +2009-08-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * vlna.w (normalpattern): Constify string arg. + Drop unused global 'pi'. + +diff -ur vlna-1.5.orig/vlna.w vlna-1.5/vlna.w +--- vlna-1.5.orig/vlna.w 2011-05-02 15:58:47.000000000 +0200 ++++ vlna-1.5/vlna.w 2011-05-02 16:00:12.000000000 +0200 +@@ -380,7 +380,7 @@ + PATITEM *lapi[MAXPATT]; /* pole ukazatelu na aktualni pozice */ + PATTERN *lapt[MAXPATT]; /* pole odpovidajicich ukazatelu na patterny */ + PATTERN *listpatt, *normallist, *commentlist, *pt, *lastpt=NULL; +-PATITEM *pi, *lastpi=NULL; ++PATITEM *lastpi=NULL; + char c; /* zrovna nacetny znak */ + char buff[MAXBUFF]; /* prechodny buffer */ + int ind; /* aktualni pozice prechodneho bufferu */ +@@ -472,7 +472,7 @@ + + @ Definujme funkci |normalpattern|. + @<Pomocné funkce@>= +-static PATTERN *normalpattern (void (*proc)(void), char *str) ++static PATTERN *normalpattern (void (*proc)(void), const char *str) + { + PATTERN *pp; + int j=0; diff --git a/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-03-warnings b/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-03-warnings new file mode 100644 index 00000000000..8e07f53981c --- /dev/null +++ b/Build/source/utils/vlna/vlna-1.5-PATCHES/patch-03-warnings @@ -0,0 +1,26 @@ +2011-05-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * vlna.w (hexnum, settiestr): Declare as static. + (settiestr): Drop unused local variable 'c'. + +diff -ur vlna-1.5.orig/vlna.w vlna-1.5/vlna.w +--- vlna-1.5.orig/vlna.w 2011-05-02 16:00:12.000000000 +0200 ++++ vlna-1.5/vlna.w 2011-05-02 16:02:38.000000000 +0200 +@@ -172,14 +172,14 @@ + + @ Vyřešíme konverzi kódu zapsaného za parametrem \.{-x} na string |tiestr|. + @<Pomocné funkce@>= +-unsigned char hexnum(char c) { ++static unsigned char hexnum(char c) { + if (c >= '0' && c <= '9') return c - '0'; + if (c >= 'A' && c <= 'F') return c - 'A' + 10; + if (c >= 'a' && c <= 'f') return c - 'a' + 10; + printusage (), exit (BAD_OPTIONS); + } +-void settiestr(char *s) { +- int i, j, c; ++static void settiestr(char *s) { ++ int i, j; + i = strlen(s); + if ((i > 2*MAXLEN) || i%2 == 1) printusage (), exit (BAD_OPTIONS); + tiestrlen = i/2; diff --git a/Build/source/utils/vlna/vlna-1.5/ChangeLog b/Build/source/utils/vlna/vlna-1.5/ChangeLog new file mode 100644 index 00000000000..8d058e8e23e --- /dev/null +++ b/Build/source/utils/vlna/vlna-1.5/ChangeLog @@ -0,0 +1,53 @@ +2010-02-01 Petr Olsak <petr@olsak.net> + + * Buffer overflow problem corrected + * vlna.w: BANNER: version 1.4 -> version 1.5 + +2009-04-30 Petr Olsak <petr@olsak.net> + + * vlna.w: program is able to process utf16 input by following way: + it ignores zero bytes while searching patterns but it stores + all bytes from input to output. + * vlna.w, vlna.man: The -u changed to -x option. + * vlna.man, vlna-cz.man: English man page is created. + +2009-04-26 Petr Olsak <petr@olsak.net> + + * vlna.w, vlna.man: new parameter -u. You can set another code + to be inserted instead a tie. Example: vlna -u C2A0 . + * vlna.w: BANNER: version 1.3 -> version 1.4 + +2009-04-20 Petr Olsak <petr@olsak.net> + + * README.en: the stupid sequence about "selling" of the program + and its modifications is removed from "Program distribution" + paragraph. The Czech README file never included the translation of + this sentecne; it means the inconsistency was there. + +2008-07-18 Petr Olsak <petr@olsak.net> + + * vlna.w: BANNER: vlna, version 1.2 -> vlna, version 1.3 + * vlna.tex, vlna.dvi, vlna.c: dtto + * README, README.en: Acknowledgement added. + +2008-07-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * vlna.idx, vlna.scn (new): Add these files required to build + vlna.dvi. + * Makefile.am: Rules to (re-)build vlna.idx and vlna.scn. + +2008-07-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * vlna.dvi: new version from Zdenek, keep it here because it is + required for 'make dist (copy in Master/texmf/doc/vlna/). + +2008-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * README.en (new): from Zdenek Wagner, fixed a few typos. + * vlna.w: Ensure charset parameter for '-v'. + +2008-06-25 Peter Breitenlohner <peb@mppmu.mpg.de> + + Autoconfiscated vlna-1.2, imported from + ftp://math.feld.cvut.cz/pub/olsak/vlna. + diff --git a/Build/source/utils/vlna/vlna-1.5/Makefile.am b/Build/source/utils/vlna/vlna-1.5/Makefile.am new file mode 100644 index 00000000000..2de8c38680c --- /dev/null +++ b/Build/source/utils/vlna/vlna-1.5/Makefile.am @@ -0,0 +1,36 @@ +# Makefile.am -- Peter Breitenlohner <peb@mppmu.mpg.de> -- Public domain. + +bin_PROGRAMS = vlna +dist_man1_MANS = vlna.man + +CWEB_SRC = vlna.w +CSMAC = csmac.tex +CWEB_TEX = vlna.tex vlna.idx vlna.scn +CWEB_DVI = vlna.dvi + +DOCS = README README.en vlna.txt + +EXTRA_DIST = $(CWEB_SRC) $(CSMAC) $(CWEB_TEX) $(CWEB_DVI) $(DOCS) + +CLEANFILES = vlna.log vlna.toc + +vlna.dvi: vlna.tex vlna.idx vlna.scn + TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(CSPLAIN) vlna.tex + +# Running cweave in order to create vlna.tex generates in addition +# vlna.idx and vlna.scn; we must rerun cweave when they are not +# up to date (even if vlna.tex is up to date). Thus the sub-make. +# +vlna.tex vlna.idx vlna.scn: vlna.w + $(MAKE) do-cweave +do-cweave: vlna.w .FORCE + $(CWEAVE) $< +.PHONY: do-cweave .FORCE + +if MAINTAINER_MODE +all-local: vlna.dvi +vlna.c: vlna.w + $(CTANGLE) $< +else +all-local: +endif diff --git a/Build/source/utils/vlna/README b/Build/source/utils/vlna/vlna-1.5/README index 5c4e09d1f02..5c4e09d1f02 100644 --- a/Build/source/utils/vlna/README +++ b/Build/source/utils/vlna/vlna-1.5/README diff --git a/Build/source/utils/vlna/README.en b/Build/source/utils/vlna/vlna-1.5/README.en index 81ae74d20b7..81ae74d20b7 100644 --- a/Build/source/utils/vlna/README.en +++ b/Build/source/utils/vlna/vlna-1.5/README.en diff --git a/Build/source/utils/vlna/vlna-1.5/configure.ac b/Build/source/utils/vlna/vlna-1.5/configure.ac new file mode 100644 index 00000000000..750d233936d --- /dev/null +++ b/Build/source/utils/vlna/vlna-1.5/configure.ac @@ -0,0 +1,31 @@ +dnl configure.ac -- Peter Breitenlohner <peb@mppmu.mpg.de> -- Public domain. + +AC_PREREQ(2.60) +AC_INIT([vlna], [1.3], [tex-live@tug.org]) +AC_CONFIG_SRCDIR([vlna.w]) + +AM_INIT_AUTOMAKE([foreign no-define])dnl using automake + +# Checks for programs. +AC_PROG_CC +AC_PROG_MAKE_SET +AC_PROG_INSTALL + +dnl Maintainer mode requires ctangle, cweave, and csplain +AC_CHECK_PROGS([CTANGLE], [ctangle], [none]) +AC_CHECK_PROGS([CWEAVE], [cweave], [none]) +AC_CHECK_PROGS([CSPLAIN], [csplain], [none]) + +if test x"$enable_maintainer_mode" = xyes; then + case :$CTANGLE:$CWEAVE:$CSPLAIN: in + *:none:*) + AC_MSG_WARN([Maintainer mode disabled -- requires ctangle, cweave, and csplain.]) + enable_maintainer_mode=no + ;; + esac +fi + +AM_MAINTAINER_MODE[]dnl maintainer mode only if requested + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/Build/source/utils/vlna/csmac.tex b/Build/source/utils/vlna/vlna-1.5/csmac.tex index 0860a70f4f0..0860a70f4f0 100644 --- a/Build/source/utils/vlna/csmac.tex +++ b/Build/source/utils/vlna/vlna-1.5/csmac.tex diff --git a/Build/source/utils/vlna/vlna-cz.man b/Build/source/utils/vlna/vlna-1.5/vlna-cz.man index 334b683572b..334b683572b 100644 --- a/Build/source/utils/vlna/vlna-cz.man +++ b/Build/source/utils/vlna/vlna-1.5/vlna-cz.man diff --git a/Build/source/utils/vlna/vlna.man b/Build/source/utils/vlna/vlna-1.5/vlna.man index 691b3cb7128..691b3cb7128 100644 --- a/Build/source/utils/vlna/vlna.man +++ b/Build/source/utils/vlna/vlna-1.5/vlna.man diff --git a/Build/source/utils/vlna/vlna.txt b/Build/source/utils/vlna/vlna-1.5/vlna.txt index 0546f828207..0546f828207 100644 --- a/Build/source/utils/vlna/vlna.txt +++ b/Build/source/utils/vlna/vlna-1.5/vlna.txt diff --git a/Build/source/utils/vlna/vlna.w b/Build/source/utils/vlna/vlna-1.5/vlna.w index 08a7588ecc6..08a7588ecc6 100644 --- a/Build/source/utils/vlna/vlna.w +++ b/Build/source/utils/vlna/vlna-1.5/vlna.w |