reorg and cleanup

.gitignore

@@ -11,6 +11,7 @@ makefile
 *.gcov
 *.gcno
 *.bak
+*.save
 .project
 bibtool
 Work

AutoConf/makefile.in

@@ -1,6 +1,4 @@
-# *****************************************************************************
-#  $Id: makefile.in,v 1.18 2013-11-24 21:40:13 gene Exp $
-# =============================================================================
+# *** makefile ****************************************************************
 #  
 #  This file is part of BibTool.
 #  It is distributed under the GNU General Public License.
@@ -387,32 +385,32 @@ OLIBFILES     = crossref$(OBJ)			\
 		version$(OBJ)			\
 		wordlist$(OBJ)
 
-DOCFILES      = Doc$(DIR_SEP)bibtool.1		\
-		Doc$(DIR_SEP)bibtool.tex	\
-		Doc$(DIR_SEP)bibtool.bib	\
-		Doc$(DIR_SEP)bibtool.ist	\
-		Doc$(DIR_SEP)bibtool-doc.sty	\
-		Doc$(DIR_SEP)bibtool.tex	\
-		Doc$(DIR_SEP)ref_card.tex	\
-		Doc$(DIR_SEP)Makefile		\
-		Doc$(DIR_SEP)config.tex		\
-		Doc$(DIR_SEP)c_main.tex		\
-		Doc$(DIR_SEP)c_lib.tex		\
-		Doc$(DIR_SEP)c.tex		\
-		Doc$(DIR_SEP)c_get.pl		\
-		Doc$(DIR_SEP)make_version.pl
-
-LIBFILES      = Lib$(DIR_SEP)biblatex.rsc	\
-		Lib$(DIR_SEP)braces.rsc		\
-		Lib$(DIR_SEP)check_y.rsc	\
-		Lib$(DIR_SEP)default.rsc	\
-		Lib$(DIR_SEP)field.rsc		\
-		Lib$(DIR_SEP)improve.rsc	\
-		Lib$(DIR_SEP)iso2tex.rsc	\
-		Lib$(DIR_SEP)month.rsc		\
-		Lib$(DIR_SEP)opt.rsc		\
-		Lib$(DIR_SEP)sort_fld.rsc	\
-		Lib$(DIR_SEP)tex_def.rsc
+DOCFILES      = doc$(DIR_SEP)bibtool.1		\
+		doc$(DIR_SEP)bibtool.tex	\
+		doc$(DIR_SEP)bibtool.bib	\
+		doc$(DIR_SEP)bibtool.ist	\
+		doc$(DIR_SEP)bibtool-doc.sty	\
+		doc$(DIR_SEP)bibtool.tex	\
+		doc$(DIR_SEP)ref_card.tex	\
+		doc$(DIR_SEP)Makefile		\
+		doc$(DIR_SEP)config.tex		\
+		doc$(DIR_SEP)c_main.tex		\
+		doc$(DIR_SEP)c_lib.tex		\
+		doc$(DIR_SEP)c.tex		\
+		doc$(DIR_SEP)c_get.pl		\
+		doc$(DIR_SEP)make_version.pl
+
+LIBFILES      = lib$(DIR_SEP)biblatex.rsc	\
+		lib$(DIR_SEP)braces.rsc		\
+		lib$(DIR_SEP)check_y.rsc	\
+		lib$(DIR_SEP)default.rsc	\
+		lib$(DIR_SEP)field.rsc		\
+		lib$(DIR_SEP)improve.rsc	\
+		lib$(DIR_SEP)iso2tex.rsc	\
+		lib$(DIR_SEP)month.rsc		\
+		lib$(DIR_SEP)opt.rsc		\
+		lib$(DIR_SEP)sort_fld.rsc	\
+		lib$(DIR_SEP)tex_def.rsc
 
 PROGFILES     = Perl$(DIR_SEP)bibtool.pl	\
 		Tcl$(DIR_SEP)bibtool.tcl
@@ -493,18 +491,19 @@ bibtcl:
 CLEAN_TARGETS	= *$(OBJ) xref *.bak core #* *~ 
 
 clean mostlyclean:
-	-cd Doc && $(MAKE) $(MFLAGS) clean
+	-cd doc && $(MAKE) $(MFLAGS) clean
 	-cd Test && $(MAKE) $(MFLAGS) clean
 	-cd BibTcl && $(MAKE) $(MFLAGS) clean
 	-$(RM) $(CLEAN_TARGETS)
 
 veryclean distclean realclean extraclean: clean
-	-cd Doc && $(MAKE) $(MFLAGS) distclean
+	-cd doc && $(MAKE) $(MFLAGS) distclean
 	-cd Test && $(MAKE) $(MFLAGS) distclean
 	-$(RM) bibtool config.cache config.status config.log makefile
 
-doc:
-	cd Doc; $(MAKE) $(MFLAGS) DIR_SEP=$(DIR_SEP)
+doc: Doc
+Doc:
+	cd doc; $(MAKE) $(MFLAGS) DIR_SEP=$(DIR_SEP)
 
 info:
 
@@ -524,7 +523,7 @@ install.bin install-exec: bibtool$(EXT)
 	-$(INSTALL_DIR) $(INSTALLPREFIX)$(BINDIR)
 	$(INSTALL) bibtool$(EXT) $(INSTALLPREFIX)$(BINDIR)
 
-INSTALL_LIB_FILES = Lib$(DIR_SEP)*.*
+INSTALL_LIB_FILES = lib$(DIR_SEP)*.*
 
 install.lib install-data: 
 	-$(INSTALL_DIR) $(INSTALLPREFIX)$(LIBDIR)
@@ -542,7 +541,7 @@ install.include install-include:
 
 install.man install-man: 
 	-$(INSTALL_DIR) $(INSTALLPREFIX)$(MANDIR)$(DIR_SEP)man$(MANSECT)
-	$(INSTALL) Doc$(DIR_SEP)bibtool.1 \
+	$(INSTALL) doc$(DIR_SEP)bibtool.1 \
 		$(INSTALLPREFIX)$(MANDIR)$(DIR_SEP)man$(MANSECT)$(DIR_SEP)bibtool.$(MANSECT)
 
 uninstall: uninstall.bin uninstall.lib

AutoConf/reconfig.h.in

@@ -1,6 +1,4 @@
-/******************************************************************************
-** $Id: reconfig.h.in,v 1.5 2013-11-24 21:40:13 gene Exp $
-**=============================================================================
+/*** reconfig.h ***************************************************************
 ** 
 ** This file is part of BibTool.
 ** It is distributed under the GNU General Public License.

BibTcl/bibtcl.bib

@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% $Id: bibtcl.bib,v 1.1.1.1 2007-02-07 21:29:08 gene Exp $
+%%% bibtcl.bib
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 @Book{		  ousterhout:tcl,

BibTcl/bibtcl.ltx

@@ -1,5 +1,5 @@
 %%*****************************************************************************
-%% $Id: bibtcl.ltx,v 1.1.1.1 2007-02-07 21:29:08 gene Exp $
+%% bibtcl.ltx
 %%*****************************************************************************
 %% Author: Gerd Neugebauer
 %%-----------------------------------------------------------------------------

BibTcl/bibtcl.tex

@@ -1,5 +1,5 @@
 %%*****************************************************************************
-%% $Id: bibtcl.tex,v 1.1.1.1 2007-02-07 21:29:18 gene Exp $
+%% bibtcl.tex
 %%*****************************************************************************
 %% Author: Gerd Neugebauer
 %%-----------------------------------------------------------------------------

BibTcl/bibtool.c

@@ -1,5 +1,5 @@
 /******************************************************************************
-** $Id: bibtool.c,v 1.3 2011-06-07 20:01:06 gene Exp $
+** bibtool.c
 *******************************************************************************
 ** Author: Gerd Neugebauer
 **===========================================================================*/

BibTcl/main.tcl

@@ -1,6 +1,6 @@
 #!/usr/local/bin/wish -f
 ###----------------------------------------------------------------------------
-### $Id: main.tcl,v 1.1.1.1 2007-02-07 21:28:56 gene Exp $
+### main.tcl
 ###----------------------------------------------------------------------------
 
 set infiles {}

BibTcl/version.tex

@@ -4,10 +4,10 @@
 %% It is distributed under the GNU General Public License.
 %% See the file COPYING for details.
 %%
-%% (c) 1995-1999 Gerd Neugebauer
+%% (c) 1995-2013 Gerd Neugebauer
 %%
 %% Net: [email protected]
 %%
 %%********************************************************
-\newcommand\Year{1999}
-\newcommand\Version{2.44}
+\newcommand\Year{2013}
+\newcommand\Version{2.56}

Changes.tex

@@ -1,6 +1,4 @@
 %%*****************************************************************************
-%% $Id: Changes.tex,v 1.16 2013-11-24 21:40:13 gene Exp $
-%%*****************************************************************************
 %% Author: Gerd Neugebauer
 %%-----------------------------------------------------------------------------
 \documentclass[11pt,a4paper]{scrartcl}

Changes.xml

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--  $Id: Changes.xml,v 1.8 2011-04-26 17:43:35 gene Exp $                -->
-<!-- ====================================================================== -->
 
 <changes>
  <developers>

INSTALL

@@ -4,7 +4,7 @@
 ## It is distributed under the GNU General Public License.
 ## See the file COPYING for details.
 ## 
-## (c) 1996-2012 Gerd Neugebauer
+## (c) 1996-2013 Gerd Neugebauer
 ## 
 ## Net: [email protected]
 ## 
@@ -184,8 +184,8 @@ To install BibTool you can try to apply the following instructions:
 
 	make clean
 
- H  To prepare the documentation contained  in the sub-directory Doc go into
-    the Doc sub-directory and run
+ H  To prepare the documentation contained  in the sub-directory doc go into
+    the doc sub-directory and run
 
 	latex   bibtool
 	latex   bibtool
@@ -212,7 +212,7 @@ To install BibTool you can try to apply the following instructions:
 
         make
 
-    in the Doc directory which tries to perform the steps given above.
+    in the doc directory which tries to perform the steps given above.
 
     The documentation is written in a way that either LaTeX or LaTeX2.09 can
     be used to compile it. I had a bug report about a real ancient LaTeX2.09
@@ -367,7 +367,7 @@ General instructions:
  D  Link together all object files to get the executable bibtool.
     (maybe include the kpathsea library; see section 6)
 
- E  Run  LaTeX  on  bibtool.tex  in  the Doc  sub-directory  to  produce the
+ E  Run  LaTeX  on  bibtool.tex  in  the doc  sub-directory  to  produce the
     documentation.  (see step H in section 2 for details)
 
 
@@ -441,9 +441,9 @@ First of all a small list of assumptions that I use.
 9. The C Interface
 ==================
 
-The C interface to  BibTool is described in the  document Doc/c_lib.dvi.  To
+The C interface to  BibTool is described in the  document doc/c_lib.dvi.  To
 create this  document run LaTeX and makeindex  on the  file c_lib.tex in the
-Doc sub-directory:
+doc sub-directory:
 
 	latex c_lib
 	makeindex c_lib

Makefile

@@ -1,6 +1,4 @@
-#******************************************************************************
-#* $Id: Makefile,v 1.9 2013-11-24 21:40:13 gene Exp $
-# =============================================================================
+#*** Makefile ******************************************************************
 #
 #  This file is part of BibTool.
 #  It is distributed under the GNU General Public License.
@@ -50,7 +48,7 @@ lint:
 	gcc  $(C_FLAGS) $(REGEX_DEF) $(DONT_LINK) -ansi -W -Wall -O2 ${CFILES}
 
 dist:
-	@( cd Doc; make)
+	@( cd doc; make)
 	@( cd ..; rm -f $(DIR).tar.gz;				\
 	   tar  -cvzf $(DIR).tar.gz $(DISTFILES:%=$(DIR)/%)	\
 		--exclude CVS --exclude config.status )

config.h

@@ -1,6 +1,4 @@
-/******************************************************************************
-** $Id: config.h,v 1.5 2012-01-30 05:08:02 gene Exp $
-**=============================================================================
+/*** config.h ******************************************************************
 ** 
 ** This file is part of BibTool.
 ** It is distributed under the GNU General Public License.

crossref.c

@@ -1,6 +1,4 @@
-/******************************************************************************
-** $Id: crossref.c,v 1.6 2013-11-24 22:07:52 gene Exp $
-**=============================================================================
+/*** crossref.c ***************************************************************
 ** 
 ** This file is part of BibTool.
 ** It is distributed under the GNU General Public License.

database.c

@@ -1,6 +1,4 @@
-/******************************************************************************
-** $Id: database.c,v 1.14 2013-11-24 22:07:52 gene Exp $
-**=============================================================================
+/*** databse.c ****************************************************************
 ** 
 ** This file is part of BibTool.
 ** It is distributed under the GNU General Public License.

Doc/Makefile → doc/Makefile

@@ -1,12 +1,10 @@
-##*****************************************************************************
-## $Id: Makefile,v 1.14 2012-02-12 06:16:08 gene Exp $
-##=============================================================================
+##*** Makefile ****************************************************************
 ## 
 ## This file is part of BibTool.
 ## It is distributed under the GNU General Public License.
 ## See the file COPYING for details.
 ## 
-## (c) 1997-2011 Gerd Neugebauer
+## (c) 1997-2013 Gerd Neugebauer
 ## 
 ## Net: [email protected]
 ## 

Doc/bibtool-doc.sty → doc/bibtool-doc.sty

@@ -1,12 +1,10 @@
-%%*****************************************************************************
-%% $Id: bibtool-doc.sty,v 1.2 2012-02-18 06:09:50 gene Exp $
-%%=============================================================================
+%%*** bibtool-doc.sty *********************************************************
 %%
 %% This file is part of BibTool.
 %% It is distributed under the Creative Commons Attribution-Share
 %% Alike 3.0 License.
 %%
-%% (c) 2011-2012 Gerd Neugebauer
+%% (c) 2011-2013 Gerd Neugebauer
 %%
 %% Net: [email protected]
 %%*****************************************************************************

Doc/bibtool.bib → doc/bibtool.bib

@@ -1,5 +1,5 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% $Id: bibtool.bib,v 1.1.1.1 2007-02-07 21:28:03 gene Exp $
+%%% bibtool.bib
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 @Book{		  knuth:texbook,

Doc/bibtool.tex → doc/bibtool.tex

@@ -1,6 +1,4 @@
-%%*****************************************************************************
-%% $Id: bibtool.tex,v 1.32 2013-11-24 21:40:13 gene Exp $
-%%=============================================================================
+%%*** bibtool.tex *************************************************************
 %%
 %% This file is part of BibTool.
 %% It is distributed under the Creative Commons Attribution-Share

Doc/c_get.pl → doc/c_get.pl

@@ -5,7 +5,7 @@
 # It is distributed under the GNU General Public License.
 # See the file COPYING for details.
 #
-# (c) 1997-2004 Gerd Neugebauer
+# (c) 1997-2013 Gerd Neugebauer
 #
 # Net: [email protected]
 #

Doc/c_lib.tex → doc/c_lib.tex

@@ -1,6 +1,4 @@
-%%*****************************************************************************
-%% $Id: c_lib.tex,v 1.9 2013-11-24 22:07:52 gene Exp $
-%%=============================================================================
+%%*** c_lib.tex ***************************************************************
 %%
 %% This file is part of BibTool.
 %% It is distributed under the Creative Commons Attribution-Share

Doc/make_version.pl → doc/make_version.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 ##*****************************************************************************
-## $Id: make_version.pl,v 1.3 2011-11-27 14:25:46 gene Exp $
+## make_version.pl
 ##*****************************************************************************
 ## Author: Gerd Neugebauer
 ##=============================================================================

Doc/ref_card.tex → doc/ref_card.tex

@@ -1,6 +1,4 @@
-%%*****************************************************************************
-%% $Id: ref_card.tex,v 1.17 2013-11-24 22:07:52 gene Exp $
-%%=============================================================================
+%%*** ref_card.tex ************************************************************
 %%
 %% This file is part of BibTool.
 %% It is distributed under the Creative Commons Attribution-Share

entry.c

@@ -1,6 +1,4 @@
-/******************************************************************************
-** $Id: entry.c,v 1.9 2013-11-24 22:07:52 gene Exp $
-**=============================================================================
+/*** entry.c ******************************************************************
 ** 
 ** This file is part of BibTool.
 ** It is distributed under the GNU General Public License.

error.c

@@ -1,6 +1,4 @@
-/******************************************************************************
-** $Id: error.c,v 1.10 2013-11-24 22:07:52 gene Exp $
-**=============================================================================
+/*** error.c ******************************************************************
 ** 
 ** This file is part of BibTool.
 ** It is distributed under the GNU General Public License.

expand.c

@@ -1,6 +1,4 @@
-/******************************************************************************
-** $Id: expand.c,v 1.12 2013-11-24 22:07:52 gene Exp $
-**=============================================================================
+/*** expnad.c *****************************************************************
 ** 
 ** This file is part of BibTool.
 ** It is distributed under the GNU General Public License.

HTML/Makefile → html/Makefile

@@ -1,11 +1,11 @@
 #******************************************************************************
-#* $Id: Makefile,v 1.8 2011-12-12 15:15:39 gene Exp $
+#* Makefile
 #******************************************************************************
 #* Author: Gerd Neugebauer
 #*=============================================================================
 
-DOCFILES      = ../Doc/bibtool.bbl	\
-	  	../Doc/bibtool.tex
+DOCFILES      = ../doc/bibtool.bbl	\
+	  	../doc/bibtool.tex
 
 INSTFILES     = ../install.tex