Documentation pathes

* Remove README.themes: does not exist
* MANUAL.he moved to docs directory. Not installed by "make install"
* Man pages: geresh.1 and pgeresh.1

5 files changed, 155 insertions, 143 deletions

diff --git a/Makefile.am b/Makefile.am
index dfb7fef..1f28b25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,16 +43,16 @@ THEMES = \
 	$(THEME_DIR)/green.thm \
 	$(THEME_DIR)/borland.thm \
 	$(THEME_DIR)/occult.thm \
-	$(THEME_DIR)/arnold.thm \
-	$(THEME_DIR)/README.themes
+	$(THEME_DIR)/arnold.thm 
 
-pkgdata_DATA = \
-	MANUAL.he kbdtab reprtab transtab
+pkgdata_DATA = kbdtab reprtab transtab
 
-EXTRA_DIST = \
-	MANUAL.he kbdtab reprtab transtab \
+EXTRA_DIST = MANUAL.he kbdtab reprtab transtab \
+	geresh.1 pgeresh.1 \
 	$(THEMES)
 
+man_MANS = geresh.1 pgeresh.1
+
 localedir = $(datadir)/locale
 INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
 
diff --git a/Makefile.in b/Makefile.in
index 1c285d7..4ffc989 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -69,61 +69,21 @@ VERSION = @VERSION@
 AUTOMAKE_OPTIONS = foreign
 
 bin_PROGRAMS = geresh
-geresh_SOURCES = \
-	bidi.cc bidi.h \
-	basemenu.cc basemenu.h \
-	converters.cc converters.h \
-	dbg.cc dbg.h \
-	dialogline.cc dialogline.h \
-	editbox.cc editbox2.cc editbox.h \
-	editor.cc editor.h \
-	event.cc event.h \
-	helpbox.cc helpbox.h \
-	inputline.cc inputline.h \
-	io.cc io.h \
-	iso88598.cc iso88598.h \
-	label.cc label.h \
-	main.cc bindings.cc \
-	menus.cc menus.h \
-	mk_wcwidth.cc mk_wcwidth.h \
-	question.cc question.h \
-	scrollbar.cc scrollbar.h \
-	speller.cc speller.h \
-	shaping.cc shaping.h \
-	statusline.cc statusline.h \
-	terminal.cc terminal.h \
-	themes.cc themes.h \
-	transtbl.cc transtbl.h \
-	types.cc types.h \
-	undo.cc undo.h \
-	utf8.cc utf8.h \
-	widget.cc widget.h \
-	directvect.h dispatcher.h my_wctob.h \
-	pathnames.h point.h univalues.h
+geresh_SOURCES =  	bidi.cc bidi.h 	basemenu.cc basemenu.h 	converters.cc converters.h 	dbg.cc dbg.h 	dialogline.cc dialogline.h 	editbox.cc editbox2.cc editbox.h 	editor.cc editor.h 	event.cc event.h 	helpbox.cc helpbox.h 	inputline.cc inputline.h 	io.cc io.h 	iso88598.cc iso88598.h 	label.cc label.h 	main.cc bindings.cc 	menus.cc menus.h 	mk_wcwidth.cc mk_wcwidth.h 	question.cc question.h 	scrollbar.cc scrollbar.h 	speller.cc speller.h 	shaping.cc shaping.h 	statusline.cc statusline.h 	terminal.cc terminal.h 	themes.cc themes.h 	transtbl.cc transtbl.h 	types.cc types.h 	undo.cc undo.h 	utf8.cc utf8.h 	widget.cc widget.h 	directvect.h dispatcher.h my_wctob.h 	pathnames.h point.h univalues.h
 
 
 bin_SCRIPTS = pgeresh
 
 THEME_DIR = themes
-THEMES = \
-	$(THEME_DIR)/default.thm \
-	$(THEME_DIR)/default_bw.thm \
-	$(THEME_DIR)/mc.thm \
-	$(THEME_DIR)/green.thm \
-	$(THEME_DIR)/borland.thm \
-	$(THEME_DIR)/occult.thm \
-	$(THEME_DIR)/arnold.thm \
-	$(THEME_DIR)/README.themes
+THEMES =  	$(THEME_DIR)/default.thm 	$(THEME_DIR)/default_bw.thm 	$(THEME_DIR)/mc.thm 	$(THEME_DIR)/green.thm 	$(THEME_DIR)/borland.thm 	$(THEME_DIR)/occult.thm 	$(THEME_DIR)/arnold.thm 
 
 
-pkgdata_DATA = \
-	MANUAL.he kbdtab reprtab transtab
+pkgdata_DATA = kbdtab reprtab transtab
 
+EXTRA_DIST = MANUAL.he kbdtab reprtab transtab 	geresh.1 pgeresh.1 	$(THEMES)
 
-EXTRA_DIST = \
-	MANUAL.he kbdtab reprtab transtab \
-	$(THEMES)
 
+man_MANS = geresh.1 pgeresh.1
 
 localedir = $(datadir)/locale
 INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
@@ -156,16 +116,21 @@ CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+man1dir = $(mandir)/man1
+MANS = $(man_MANS)
+
+NROFF = nroff
 DATA =  $(pkgdata_DATA)
 
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING INSTALL Makefile.am \
-Makefile.in NEWS THANKS TODO aclocal.m4 config.h.in configure \
-configure.in install-sh missing mkinstalldirs pgeresh.in
+Makefile.in NEWS THANKS TODO aclocal.m4 config.guess config.h.in \
+config.sub configure configure.in install-sh missing mkinstalldirs \
+pgeresh.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 SOURCES = $(geresh_SOURCES)
 OBJECTS = $(geresh_OBJECTS)
@@ -287,6 +252,45 @@ uninstall-binSCRIPTS:
 .cc.o:
 	$(CXXCOMPILE) -c $<
 
+install-man1:
+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+	@list='$(man1_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+	done
+
+uninstall-man1:
+	@list='$(man1_MANS)'; \
+	l2='$(man_MANS)'; for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+	done
+install-man: $(MANS)
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-man1
+uninstall-man:
+	@$(NORMAL_UNINSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
+
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@@ -324,7 +328,7 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
 
 mostlyclean-tags:
 
@@ -384,87 +388,6 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-basemenu.o: basemenu.cc config.h basemenu.h widget.h dispatcher.h \
-	event.h types.h directvect.h terminal.h themes.h
-bidi.o: bidi.cc config.h bidi.h types.h directvect.h univalues.h dbg.h
-bindings.o: bindings.cc config.h editbox.h directvect.h widget.h \
-	dispatcher.h event.h types.h terminal.h bidi.h univalues.h \
-	transtbl.h undo.h point.h editor.h dialogline.h label.h \
-	inputline.h statusline.h speller.h helpbox.h basemenu.h
-converters.o: converters.cc config.h converters.h types.h directvect.h \
-	iso88598.h utf8.h dbg.h
-dbg.o: dbg.cc config.h terminal.h dbg.h
-dialogline.o: dialogline.cc config.h dialogline.h label.h types.h \
-	directvect.h widget.h dispatcher.h event.h terminal.h \
-	inputline.h editbox.h bidi.h univalues.h transtbl.h undo.h \
-	point.h editor.h statusline.h speller.h question.h dbg.h
-editbox.o: editbox.cc config.h editbox.h directvect.h widget.h \
-	dispatcher.h event.h types.h terminal.h bidi.h univalues.h \
-	transtbl.h undo.h point.h scrollbar.h themes.h dbg.h
-editbox2.o: editbox2.cc config.h editbox.h directvect.h widget.h \
-	dispatcher.h event.h types.h terminal.h bidi.h univalues.h \
-	transtbl.h undo.h point.h mk_wcwidth.h my_wctob.h iso88598.h \
-	shaping.h themes.h dbg.h
-editor.o: editor.cc config.h editor.h editbox.h directvect.h widget.h \
-	dispatcher.h event.h types.h terminal.h bidi.h univalues.h \
-	transtbl.h undo.h point.h dialogline.h label.h inputline.h \
-	statusline.h speller.h menus.h basemenu.h scrollbar.h io.h \
-	pathnames.h themes.h utf8.h dbg.h helpbox.h
-event.o: event.cc config.h event.h types.h directvect.h terminal.h \
-	my_wctob.h iso88598.h dbg.h
-helpbox.o: helpbox.cc config.h helpbox.h editbox.h directvect.h widget.h \
-	dispatcher.h event.h types.h terminal.h bidi.h univalues.h \
-	transtbl.h undo.h point.h label.h editor.h dialogline.h \
-	inputline.h statusline.h speller.h io.h pathnames.h themes.h
-inputline.o: inputline.cc config.h inputline.h editbox.h directvect.h \
-	widget.h dispatcher.h event.h types.h terminal.h bidi.h \
-	univalues.h transtbl.h undo.h point.h io.h themes.h dbg.h
-io.o: io.cc config.h io.h types.h directvect.h editbox.h widget.h \
-	dispatcher.h event.h terminal.h bidi.h univalues.h transtbl.h \
-	undo.h point.h converters.h dbg.h speller.h label.h
-iso88598.o: iso88598.cc config.h iso88598.h types.h directvect.h \
-	univalues.h
-label.o: label.cc config.h label.h types.h directvect.h widget.h \
-	dispatcher.h event.h terminal.h themes.h
-main.o: main.cc config.h io.h types.h directvect.h pathnames.h \
-	terminal.h editor.h editbox.h widget.h dispatcher.h event.h \
-	bidi.h univalues.h transtbl.h undo.h point.h dialogline.h \
-	label.h inputline.h statusline.h speller.h themes.h dbg.h
-menus.o: menus.cc config.h io.h types.h directvect.h pathnames.h menus.h \
-	basemenu.h widget.h dispatcher.h event.h terminal.h editbox.h \
-	bidi.h univalues.h transtbl.h undo.h point.h editor.h \
-	dialogline.h label.h inputline.h statusline.h speller.h
-mk_wcwidth.o: mk_wcwidth.cc mk_wcwidth.h types.h directvect.h
-question.o: question.cc config.h question.h label.h types.h directvect.h \
-	widget.h dispatcher.h event.h terminal.h
-scrollbar.o: scrollbar.cc config.h scrollbar.h types.h directvect.h \
-	widget.h dispatcher.h event.h terminal.h themes.h
-shaping.o: shaping.cc config.h shaping.h types.h directvect.h widget.h \
-	dispatcher.h event.h terminal.h bidi.h univalues.h
-speller.o: speller.cc speller.h editbox.h directvect.h widget.h \
-	dispatcher.h event.h types.h terminal.h config.h bidi.h \
-	univalues.h transtbl.h undo.h point.h label.h mk_wcwidth.h \
-	converters.h editor.h dialogline.h inputline.h statusline.h \
-	dbg.h
-statusline.o: statusline.cc config.h statusline.h editbox.h directvect.h \
-	widget.h dispatcher.h event.h types.h terminal.h bidi.h \
-	univalues.h transtbl.h undo.h point.h editor.h dialogline.h \
-	label.h inputline.h speller.h themes.h dbg.h
-terminal.o: terminal.cc config.h editor.h editbox.h directvect.h \
-	widget.h dispatcher.h event.h types.h terminal.h bidi.h \
-	univalues.h transtbl.h undo.h point.h dialogline.h label.h \
-	inputline.h statusline.h speller.h dbg.h
-themes.o: themes.cc config.h io.h types.h directvect.h pathnames.h \
-	widget.h dispatcher.h event.h terminal.h themes.h
-transtbl.o: transtbl.cc config.h transtbl.h types.h directvect.h io.h \
-	dbg.h
-types.o: types.cc config.h types.h directvect.h converters.h utf8.h
-undo.o: undo.cc undo.h types.h directvect.h point.h dbg.h config.h
-utf8.o: utf8.cc config.h utf8.h types.h directvect.h univalues.h dbg.h
-widget.o: widget.cc config.h widget.h dispatcher.h event.h types.h \
-	directvect.h terminal.h mk_wcwidth.h bidi.h univalues.h \
-	shaping.h my_wctob.h iso88598.h
-
 info-am:
 info: info-am
 dvi-am:
@@ -479,22 +402,22 @@ all-recursive-am: config.h
 install-exec-am: install-binPROGRAMS install-binSCRIPTS
 install-exec: install-exec-am
 
-install-data-am: install-pkgdataDATA install-data-local
+install-data-am: install-man install-pkgdataDATA install-data-local
 install-data: install-data-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man \
 		uninstall-pkgdataDATA uninstall-local
 uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) \
-		$(DESTDIR)$(pkgdatadir)
+		$(DESTDIR)$(mandir)/man1 $(DESTDIR)$(pkgdatadir)
 
 
 mostlyclean-generic:
@@ -537,6 +460,7 @@ mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS \
+install-man1 uninstall-man1 install-man uninstall-man \
 uninstall-pkgdataDATA install-pkgdataDATA tags mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
diff --git a/geresh.1 b/geresh.1
new file mode 100644
index 0000000..555f05c
--- /dev/null
+++ b/geresh.1
@@ -0,0 +1,43 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH GERESH 1 "October 15, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+geresh \- a multilingual text editor with bidi support
+.SH SYNOPSIS
+.B geresh
+.RI "[options] [[+LINE] file]" 
+.br
+.SH DESCRIPTION
+geresh is text editor for consoles & terminals. Although it is text based it does support unicode and even bidi (though FriBiDi). It especially has support for both Hebrew and Arabic (with shaping). geresh also support many spell checkers (for many languages).
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, please see the help summary.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH SEE ALSO
+.BR pgeresh (1),
+.SH AUTHOR
+geresh was written by Moffie <mooffie@typo.co.il>.
+.PP
+This manual page was written by Lior Kaplan <webmaster@guides.co.il>,
+for the Debian project (but may be used by others).
diff --git a/pathnames.h b/pathnames.h
index 4b60ffe..070ba59 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -21,7 +21,7 @@
 #define USER_TRANSTBL_FILE	"~/.%P/transtab"
 #define USER_REPRTBL_FILE	"~/.%P/reprtab"
 #define USER_ALTKBDTBL_FILE	"~/.%P/kbdtab"
-#define USER_MANUAL_FILE	"~/.%P/MANUAL.he"
+#define USER_MANUAL_FILE    	"~/.%P/MANUAL.he"
 #define USER_UNICODE_DATA_FILE	"~/.%P/UnicodeData.txt"
 #define USER_THEMES_DIR		"~/.%P/themes/"
 
@@ -29,7 +29,7 @@
 #define SYSTEM_TRANSTBL_FILE	    PKGDATADIR "/transtab"
 #define SYSTEM_REPRTBL_FILE	    PKGDATADIR "/reprtab"
 #define SYSTEM_ALTKBDTBL_FILE	    PKGDATADIR "/kbdtab"
-#define SYSTEM_MANUAL_FILE	    PKGDATADIR "/MANUAL.he"
+#define SYSTEM_MANUAL_FILE	    "/usr/share/doc/geresh/MANUAL.he"
 #define SYSTEM_UNICODE_DATA_FILE    PKGDATADIR "/UnicodeData.txt"
 #define SYSTEM_THEMES_DIR	    PKGDATADIR "/themes/"
 
diff --git a/pgeresh.1 b/pgeresh.1
new file mode 100644
index 0000000..f2ac231
--- /dev/null
+++ b/pgeresh.1
@@ -0,0 +1,45 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH PGERESH 1 "October 15, 2004"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+pgeresh \- a pager for geresh (a multilingual text editor with bidi support)
+.SH SYNOPSIS
+.B pgeresh
+.RI "[options] [[+LINE] file]" 
+.br
+.SH DESCRIPTION
+geresh is text editor for consoles & terminals. Although it is text based it does support unicode and even bidi (though FriBiDi). It especially has support for both Hebrew and Arabic (with shaping). geresh also support many spell checkers (for many languages).
+.br
+pgeresh is a bash script for using geresh as a pager. 
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, please see the help summary.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH SEE ALSO
+.BR pgeresh (1),
+.SH AUTHOR
+pgeresh was written by Moffie <mooffie@typo.co.il>.
+.PP
+This manual page was written by Lior Kaplan <webmaster@guides.co.il>,
+for the Debian project (but may be used by others).