diff --git a/ChangeLog b/ChangeLog index 3ee854acf0d..9aa48b0d3b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-12-13 Glenn Morris + + * info/dir: Add bovine. + 2012-12-12 Andreas Schwab * Makefile.in (install-info): Use `${MAKE} -s' for echo-info. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 3557e27184c..6985439f356 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,13 @@ +2012-12-13 Glenn Morris + + * bovine.texi: Small edits. Set copyright to FSF, update license to + GFDL 1.3+, remove empty index. + * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add bovine. + (bovine, $(buildinfodir)/bovine$(INFO_EXT), bovine.dvi, bovine.pdf): + New targets. + * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add bovine. + ($(infodir)/bovine$(INFO_EXT), bovine.dvi): New targets. + 2012-12-13 Eric Ludlam David Ponce Richard Kim diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index ecff9a97d4e..905a81f4d6a 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -41,7 +41,7 @@ INFO_OPTS=@INFO_OPTS@ MAKEINFO = @MAKEINFO@ MAKEINFO_OPTS = --force -I$(emacsdir) -INFO_TARGETS = ada-mode auth autotype calc ccmode cl \ +INFO_TARGETS = ada-mode auth autotype bovine calc ccmode cl \ dbus dired-x ebrowse ede ediff edt eieio \ emacs-mime epa erc ert eshell eudc efaq \ flymake forms gnus emacs-gnutls idlwave info.info \ @@ -54,6 +54,7 @@ DVI_TARGETS = \ ada-mode.dvi \ auth.dvi \ autotype.dvi \ + bovine.dvi \ calc.dvi \ cc-mode.dvi \ cl.dvi \ @@ -107,6 +108,7 @@ PDF_TARGETS = \ ada-mode.pdf \ auth.pdf \ autotype.pdf \ + bovine.pdf \ calc.pdf \ cc-mode.pdf \ cl.pdf \ @@ -220,6 +222,15 @@ autotype.dvi: ${srcdir}/autotype.texi autotype.pdf: ${srcdir}/autotype.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi +bovine : $(buildinfodir)/bovine$(INFO_EXT) +$(buildinfodir)/bovine$(INFO_EXT): ${srcdir}/bovine.texi + $(mkinfodir) + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/bovine.texi +bovine.dvi: ${srcdir}/bovine.texi + $(ENVADD) $(TEXI2DVI) ${srcdir}/bovine.texi +bovine.pdf: ${srcdir}/bovine.texi + $(ENVADD) $(TEXI2PDF) ${srcdir}/bovine.texi + calc : $(buildinfodir)/calc$(INFO_EXT) $(buildinfodir)/calc$(INFO_EXT): ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(mkinfodir) diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi index b24e0e0dd7d..a263cadabae 100644 --- a/doc/misc/bovine.texi +++ b/doc/misc/bovine.texi @@ -1,6 +1,6 @@ \input texinfo @c -*-texinfo-*- @c %**start of header -@setfilename bovine.info +@setfilename ../../info/bovine @set TITLE Bovine parser development @set AUTHOR Eric M. Ludlam, David Ponce, and Richard Y. Kim @settitle @value{TITLE} @@ -23,29 +23,26 @@ @c %**end of header @copying -This manual documents Bovine parser development in Semantic - -Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 Eric M. Ludlam -Copyright @copyright{} 2001, 2002, 2003, 2004 David Ponce -Copyright @copyright{} 2002, 2003 Richard Y. Kim +Copyright @copyright{} 1999-2004, 2012 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being list their titles, with the Front-Cover Texts -being list, and with the Back-Cover Texts being list. A copy of the -license is included in the section entitled ``GNU Free Documentation -License''. +under the terms of the GNU Free Documentation License, Version 1.3 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' +and with the Back-Cover Texts as in (a) below. A copy of the license +is included in the section entitled ``GNU Free Documentation License''. + +(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and +modify this GNU manual. Buying copies from the FSF supports it in +developing GNU and promoting software freedom.'' @end quotation @end copying -@ifinfo -@dircategory Emacs +@dircategory Emacs misc features @direntry -* Semantic bovine parser development: (bovine). +* Bovine: (bovine). Semantic bovine parser development. @end direntry -@end ifinfo @iftex @finalout @@ -54,28 +51,19 @@ License''. @c @setchapternewpage odd @c @setchapternewpage off -@ifinfo -This file documents parser development with the bovine parser generator -@emph{Infrastructure for parser based text analysis in Emacs} - -Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR} -@end ifinfo - @titlepage @sp 10 @title @value{TITLE} @author by @value{AUTHOR} -@vskip 0pt plus 1 fill -Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004 @value{AUTHOR} @page @vskip 0pt plus 1 fill @insertcopying @end titlepage @page -@c MACRO inclusion -@include semanticheader.texi - +@macro semantic{} +@i{Semantic} +@end macro @c ************************************************************************* @c @ Document @@ -97,13 +85,17 @@ extension. When compiled, the contents is converted into a file of the form @file{NAME-by.el}. This, in turn is byte compiled. @inforef{top, Grammar Framework Manual, grammar-fw}. +@ifnottex +@insertcopying +@end ifnottex + @menu * Starting Rules:: The starting rules for the grammar. -* Bovine Grammar Rules:: Rules used to parse a language -* Optional Lambda Expression:: Actions to take when a rule is matched -* Bovine Examples:: Simple Samples -* GNU Free Documentation License:: -* Index:: +* Bovine Grammar Rules:: Rules used to parse a language. +* Optional Lambda Expression:: Actions to take when a rule is matched. +* Bovine Examples:: Simple Samples. +* GNU Free Documentation License:: The license for this documentation. +@c * Index:: @end menu @node Starting Rules @@ -160,9 +152,9 @@ semantic-appdev}. means that a syntactic token of class @code{FOO} must be matched. @menu -* How Lexical Tokens Match:: -* Grammar-to-Lisp Details:: -* Order of components in rules:: +* How Lexical Tokens Match:: +* Grammar-to-Lisp Details:: +* Order of components in rules:: @end menu @node How Lexical Tokens Match @@ -462,11 +454,14 @@ which would return @node GNU Free Documentation License @appendix GNU Free Documentation License -@include fdl.texi +@include doclicense.texi +@c There is nothing to index at the moment. +@ignore @node Index @unnumbered Index @printindex cp +@end ignore @iftex @contents diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in index d8054ce62fe..0213ce97cce 100644 --- a/doc/misc/makefile.w32-in +++ b/doc/misc/makefile.w32-in @@ -55,7 +55,7 @@ INFO_TARGETS = $(infodir)/ccmode$(INFO_EXT) \ $(infodir)/epa$(INFO_EXT) $(infodir)/mairix-el$(INFO_EXT) $(infodir)/sasl$(INFO_EXT) \ $(infodir)/auth$(INFO_EXT) $(infodir)/eieio$(INFO_EXT) $(infodir)/ede$(INFO_EXT) \ $(infodir)/semantic$(INFO_EXT) $(infodir)/edt$(INFO_EXT) $(infodir)/emacs-gnutls$(INFO_EXT) \ - $(infodir)/srecode$(INFO_EXT) + $(infodir)/srecode$(INFO_EXT) $(infodir)/bovine$(INFO_EXT) DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.dvi dired-x.dvi \ ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \ sieve.dvi pgg.dvi mh-e.dvi \ @@ -66,7 +66,7 @@ DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.dvi dired-x.dvi \ newsticker.dvi rcirc.dvi erc.dvi ert.dvi \ remember.dvi nxml-mode.dvi \ epa.dvi mairix-el.dvi sasl.dvi auth.dvi eieio.dvi ede.dvi \ - semantic.dvi edt.dvi emacs-gnutls.dvi srecode.dvi + semantic.dvi edt.dvi emacs-gnutls.dvi srecode.dvi bovine.dvi INFOSOURCES = info.texi # The following rule does not work with all versions of `make'. @@ -364,6 +364,12 @@ $(infodir)/srecode$(INFO_EXT): srecode.texi doclicense.texi srecode.dvi: srecode.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/srecode.texi +$(infodir)/bovine$(INFO_EXT): bovine.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ bovine.texi +bovine.dvi: bovine.texi doclicense.texi + $(ENVADD) $(TEXI2DVI) $(srcdir)/bovine.texi + + mostlyclean: - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.* @@ -392,7 +398,8 @@ clean: mostlyclean $(infodir)/mairix-el* $(infodir)/auth* \ $(infodir)/eieio* $(infodir)/ede* \ $(infodir)/semantic* $(infodir)edt* \ - $(infodir)/emacs-gnutls* $(infodir)/srecode* + $(infodir)/emacs-gnutls* $(infodir)/srecode* \ + $(infodir)/bovine* distclean: clean - $(DEL) makefile diff --git a/info/dir b/info/dir index ef232145f3d..987ebea0ab6 100644 --- a/info/dir +++ b/info/dir @@ -79,9 +79,10 @@ Emacs misc features and citations. * Remember: (remember). Simple information manager for Emacs. * Semantic: (semantic). Source code parser library and utilities. +* SRecode: (srecode). Template code generator. +* Bovine: (bovine). Semantic bovine parser development. * SES: (ses). Simple Emacs Spreadsheet. * Speedbar: (speedbar). File/Tag summarizing utility. -* SRecode: (srecode). Template code generator. * VIP: (vip). An older VI-emulation for Emacs. * VIPER: (viper). A VI-emulation mode for Emacs. * WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man".