2 new commits in auctex: https://bitbucket.org/xemacs/auctex/commits/57b6e9cb7d88/ Changeset: 57b6e9cb7d88 User: matsl Date: 2014-06-28 01:12:14 Summary: Sync with upstream 11.84 (merge from branch) 2014-06-28 Mats Lidell <matsl(a)xemacs.org&gt; * ChangeLog.auctex: Merged upstream Changelog to Changelog.auctex. * Sync with upstream 11.84 (i.e. merge with branch auctex-11_84-import.) Affected #: 260 files diff -r dba52387094241da43d5f91eee3ec2ba2a4e951a -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 .dummy --- a/.dummy +++ /dev/null ＠＠ -1,1 +0,0 ＠＠ -;; This file is just a dummy file in order to generate the var directory. diff -r dba52387094241da43d5f91eee3ec2ba2a4e951a -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 COPYING --- a/COPYING +++ b/COPYING ＠＠ -2,7 +2,7 ＠＠ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. ＠＠ -305,7 +305,7 ＠＠ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. diff -r dba52387094241da43d5f91eee3ec2ba2a4e951a -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,10 ＠＠ +2014-06-28 Mats Lidell <matsl(a)xemacs.org&gt; + + * ChangeLog.auctex: Merged upstream Changelog to Changelog.auctex. + + * Sync with upstream 11.84 (i.e. merge with branch + auctex-11_84-import.) + 2014-06-02 Jerry James <james(a)xemacs.org&gt; * CHANGES: Remove generated file. See 2003-10-26 change. This diff is so big that we needed to truncate the remainder. https://bitbucket.org/xemacs/auctex/commits/40d87658aa7b/ Changeset: 40d87658aa7b User: matsl Date: 2014-06-28 01:36:12 Summary: Adjust for package build system 2014-06-28 Mats Lidell <matsl(a)xemacs.org&gt; * preview/latex/preview.dtx: Expand CVS keywords manually. * preview/preview.el (preview-version, preview-release-date): Ditto. * Makefile: Update Makefile to build 11.84. Affected #: 4 files diff -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 -r 40d87658aa7bc23e0595d783a057813e84495877 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,5 +1,11 ＠＠ 2014-06-28 Mats Lidell <matsl(a)xemacs.org&gt; + * preview/latex/preview.dtx: Expand CVS keywords manually. + * preview/preview.el (preview-version, preview-release-date): + Ditto. + + * Makefile: Update Makefile to build 11.84. + * ChangeLog.auctex: Merged upstream Changelog to Changelog.auctex. * Sync with upstream 11.84 (i.e. merge with branch diff -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 -r 40d87658aa7bc23e0595d783a057813e84495877 Makefile --- a/Makefile +++ b/Makefile ＠＠ -19,75 +19,107 ＠＠ VERSION = 1.51 -AUTHOR_VERSION = 11.55 +AUTHOR_VERSION = 11.84 MAINTAINER = Uwe Brauer <oub(a)mat.ucm.es&gt; PACKAGE = auctex PKG_TYPE = regular -REQUIRES = xemacs-base +REQUIRES = xemacs-base texinfo fsf-compat mail-lib edit-utils CATEGORY = standard include ../../Local.rules -ELCS = bib-cite.elc font-latex.elc latex.elc \ - toolbar-x.elc tex-bar.elc \ - multi-prompt.elc tex-buf.elc tex-info.elc tex-mik.elc \ - tex.elc texmathp.elc context.elc \ - context-en.elc context-nl.elc tex-fold.elc \ +ELCC=$(XEMACS) -batch -q -no-site-file -no-init-file -l lpath.el +MULESRC = tex-jp.el +MULEELC = tex-jp.elc -EXTRA_SOURCES = CHANGES PROBLEMS README FAQ RELEASE TODO HISTORY \ - ChangeLog.auctex tex-site.el \ +AUCSRC = tex.el tex-buf.el tex-style.el latex.el tex-info.el \ + texmathp.el multi-prompt.el tex-mik.el font-latex.el tex-font.el \ + context.el context-en.el context-nl.el tex-fold.el \ + toolbar-x.el tex-bar.el bib-cite.el tex-fptex.el +AUCELC = $(AUCSRC:.el=.elc) -ETC_ELCS = etc/units.elc etc/nicefrac.elc etc/alltt.elc \ - etc/slides.elc etc/foils.elc etc/subfigure.elc etc/amstex.elc \ - etc/jurabib.elc etc/listings.elc etc/url.elc etc/csquotes.elc\ - etc/ltx-base.elc etc/jsbook.elc etc/ltxdoc.elc etc/captcont.elc \ - etc/emp.elc etc/jsarticle.elc etc/paralist.elc etc/scrpage2.elc \ - etc/alphanum.elc etc/doc.elc etc/jura.elc etc/beamer.elc \ - etc/italian.elc etc/prosper.elc etc/booktabs.elc \ - etc/article.elc etc/book.elc etc/letter.elc \ - etc/report.elc etc/amsart.elc etc/amsbook.elc \ - etc/epsf.elc etc/psfig.elc etc/latexinfo.elc \ - etc/dutch.elc etc/german.elc etc/dk.elc \ - etc/j-article.elc etc/j-book.elc etc/j-report.elc \ - etc/jarticle.elc etc/jbook.elc etc/jreport.elc \ - etc/dinbrief.elc etc/virtex.elc etc/plfonts.elc \ - etc/plhb.elc etc/harvard.elc etc/swedish.elc \ - etc/danish.elc etc/slovak.elc etc/czech.elc \ - etc/amsmath.elc etc/amstext.elc etc/amsbsy.elc \ - etc/amsopn.elc etc/amsthm.elc etc/natbib.elc \ - etc/index.elc etc/makeidx.elc etc/multind.elc \ - etc/varioref.elc etc/fancyref.elc etc/mdwlist.elc \ - etc/ngerman.elc etc/graphicx.elc etc/graphics.elc \ - etc/verbatim.elc etc/scrbase.elc etc/scrartcl.elc \ - etc/scrbook.elc etc/scrreprt.elc etc/scrlttr2.elc +STYLESRC = style/prosper.el \ + style/slides.el style/foils.el style/amstex.el \ + style/article.el style/book.el style/letter.el \ + style/report.el style/amsart.el style/amsbook.el \ + style/epsf.el style/psfig.el style/latexinfo.el \ + style/dutch.el style/german.el style/dk.el \ + style/j-article.el style/j-book.el style/j-report.el \ + style/jarticle.el style/jbook.el style/jreport.el \ + style/dinbrief.el style/virtex.el style/plfonts.el \ + style/plhb.el style/harvard.el style/swedish.el \ + style/danish.el style/slovak.el style/czech.el \ + style/amsmath.el style/amstext.el style/amsbsy.el \ + style/amsopn.el style/amsthm.el style/natbib.el \ + style/index.el style/makeidx.el style/multind.el \ + style/varioref.el style/fancyref.el style/mdwlist.el \ + style/ngerman.el style/graphicx.el style/graphics.el \ + style/verbatim.el style/scrbase.el style/scrartcl.el \ + style/scrbook.el style/scrreprt.el style/scrlttr2.el \ + style/scrpage2.el style/captcont.el style/subfigure.el \ + style/paralist.el style/booktabs.el style/emp.el \ + style/jura.el style/alphanum.el style/beamer.el \ + style/alltt.el style/italian.el style/doc.el \ + style/ltxdoc.el style/ltx-base.el style/units.el \ + style/nicefrac.el style/url.el style/listings.el \ + style/jurabib.el style/csquotes.el style/jsarticle.el \ + style/jsbook.el style/babel.el style/dk-bib.el \ + style/inputenc.el style/frenchb.el style/francais.el \ + style/MinionPro.el style/pdfsync.el style/polish.el \ + style/polski.el +STYLEELC = $(STYLESRC:.el=.elc) -EXTRA_DEPENDENCIES = $(ETC_ELCS) texi/tex-ref.dvi \ - texi/tex-ref.log INSTALLATION README CHANGES HISTORY +DISTCLEANFILES = auctex.el auto-loads.el +DISTTEXTS = FAQ INSTALL INSTALL.windows README TODO -DATA_FILES = $(ETC_ELCS) $(ETC_ELCS:%.elc=%.el) +EXTRA_DEPENDENCIES = $(STYLEELC) \ + doc/tex-ref.dvi doc/tex-ref.log \ + INSTALLATION README CHANGES \ + $(DATA_3_FILES) $(DATA_4_FILES) + +DATA_FILES = $(STYLEELC) $(STYLESRC) DATA_DEST = $(PACKAGE)/style -DATA_1_FILES = .dummy -DATA_1_DEST = $(PACKAGE)/var -DATA_2_FILES = $(wildcard images/*.xpm) +# DATA_1_FILES = .dummy +# DATA_1_DEST = $(PACKAGE)/var +# DATA_2_FILES = $(wildcard images/*.xpm) +# DATA_2_DEST = $(PACKAGE)/images +DATA_1_FILES = $(wildcard images/*.xpm) +DATA_1_DEST = $(PACKAGE)/images + +PRVSRC = preview/prv-emacs.el preview/preview.el preview/prv-xemacs.el +ELCS_1 = $(PRVSRC:.el=.elc) +ELCS_1_DEST = $(PACKAGE) +ELCS_1_FILES = $(ELCS_1) $(PRVSRC) + +ICON_SOURCES = \ + preview/images/prverr16.xpm preview/images/prverr20.xpm preview/images/prverr24.xbm \ + preview/images/prverr24.xpm preview/images/prvtex-cap-up.xpm preview/images/prvtex12.xbm \ + preview/images/prvtex12.xpm preview/images/prvtex16.xbm preview/images/prvtex16.xpm \ + preview/images/prvtex20.xpm preview/images/prvtex24.xbm preview/images/prvtex24.xpm \ + preview/images/prvwrk12.xpm preview/images/prvwrk14.xpm preview/images/prvwrk16.xpm \ + preview/images/prvwrk20.xpm preview/images/prvwrk24.xbm preview/images/prvwrk24.xpm +DATA_2_FILES = $(ICON_SOURCES) DATA_2_DEST = $(PACKAGE)/images +EXPLICIT_DOCS = doc/auctex.texi doc/preview-latex.texi +EXTRA_TEXI_FILES = \ + doc/changes.texi doc/faq.texi doc/fdl.texi doc/install.texi \ + doc/intro.texi doc/macros.texi doc/quickstart.texi \ + doc/todo.texi doc/version.texi \ + doc/preview-dtxdoc.texi doc/preview-faq.texi \ + doc/preview-problems.texi doc/preview-readme.texi \ + doc/preview-todo.texi \ + doc/tex-ref.tex doc/wininstall.texi doc/copying.texi RELEASE -EXPLICIT_DOCS = texi/auctex.texi -EXTRA_TEXI_FILES = texi/changes.texi texi/history.texi texi/install.texi \ - texi/intro.texi texi/macros.texi texi/intro.texi \ - texi/todo.texi texi/wininstall.texi -EXTRA_DOC_FILES = texi/tex-ref.tex +PRELOADS = -eval '(setq load-path (cons "." (cons "preview" load-path)))' -PRELOADS = -l lpath.el +ELCS = $(AUCELC) ifeq ($(BUILD_WITHOUT_MULE),) -ELCS += tex-jp.elc +ELCS += $(MULEELC) endif - -include ../../XEmacs.rules - %.dvi: %.tex ifneq ($(TEX),) cd $(＠D) && $(TEX) $(*F) ＠＠ -95,23 +127,104 ＠＠ - endif +RUN_MAKEINFO_INDIVIDUAL = $(MAKEINFO) -I doc/ -D rawfile --no-validate --force --no-headers -o $＠ $< + +## Preview latex +PL = preview/latex + +TEXMFGEN = preview.sty prauctex.def prauctex.cfg prshowbox.def \ + prshowlabels.def prtracingall.def prtightpage.def prlyx.def \ + prcounters.def prfootnotes.def + +PREVIEW_TEXMFGEN = $(foreach file,$(TEXMFGEN),$(PL)/$(file)) +DATA_3_FILES = $(PREVIEW_TEXMFGEN) +DATA_3_DEST = $(PACKAGE)/latex + +DATA_4_FILES = preview/latex/preview.dvi +DATA_4_DEST = $(PACKAGE)/doc + +EXTRA_AUTOLOADS_DEPENDENCIES = tex-site.el preview/auto.el + +include ../../XEmacs.rules + +# If Makefile or _pkg.el has changed (Makefile will trigger _pkg.el +# rebuilding), then our suppress forms may have changed. Just rebuilding +# the autoload file normally isn't enough as the old suppress forms will +# still sit there, so nuke it first. +$(AUTOLOAD_PATH)/auto-autoloads.el:: $(AUTOLOAD_PATH)/_pkg.el + rm -f $(AUTOLOAD_PATH)/auto-autoloads.el + +ifeq ($(XEMACS_21_5),t) +$(AUTOLOAD_PATH)/auto-autoloads.el:: $(GENERATED_ELC_DEPENDENCIES) $(EXTRA_AUTOLOADS_DEPENDENCIES) + rm -f $(AUTOLOAD_PATH)/auto-autoloads.el + $(XEMACS_BATCH_CLEAN) $(LOAD_AUTOLOADS) \ + -l autoload -f batch-update-directory-autoloads \ + $(PACKAGE) $(AUTOLOAD_PATH) + # The equivalent of `touch' is done automatically + cat tex-site.el >> $(AUTOLOAD_PATH)/auto-autoloads.el + cat preview/auto.el >> $(AUTOLOAD_PATH)/auto-autoloads.el + ＠rm -f $(AUTOLOAD_PATH)/auto-autoloads.el~ + echo "THIS IS XEMACS_21_5" + +$(AUTOLOAD_PATH)/custom-defines.el: $(GENERATED_ELC_DEPENDENCIES) $(EXTRA_AUTOLOADS_DEPENDENCIES) + $(XEMACS_BATCH_CLEAN) $(LOAD_AUTOLOADS) \ + -l autoload -f batch-update-directory-custom-defines \ + $(PACKAGE) $(AUTOLOAD_PATH) + ＠rm -f $(AUTOLOAD_PATH)/custom-defines.el~ + +else +AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"$(PACKAGE)\") +AUTOLOAD_FILE = (setq generated-autoload-file \ + \"$(AUTOLOAD_PATH)/auto-autoloads.el\") + +$(AUTOLOAD_PATH)/auto-autoloads.el:: $(GENERATED_ELC_DEPENDENCIES) $(EXTRA_AUTOLOADS_DEPENDENCIES) + rm -f $(AUTOLOAD_PATH)/auto-autoloads.el + $(XEMACS_BATCH_CLEAN) $(LOAD_AUTOLOADS) \ + -eval "$(AUTOLOAD_PACKAGE_NAME)" \ + -eval "$(AUTOLOAD_FILE)" \ + -l autoload -f batch-update-autoloads $^ + cat tex-site.el >> $(AUTOLOAD_PATH)/auto-autoloads.el + cat preview/auto.el >> $(AUTOLOAD_PATH)/auto-autoloads.el + ＠touch $(AUTOLOAD_PATH)/auto-autoloads.el + ＠rm -f $(AUTOLOAD_PATH)/auto-autoloads.el~ +endif + ## 70+ pages -texi/auc-tex.dvi: texi/auc-tex.texi - cd $(＠D) && $(TEX) "\nonstopmode\input auc-tex.texi" \ - && texindex auc-tex.ky && texindex auc-tex.fn \ - && texindex auc-tex.vr && texindex auc-tex.cp \ - && $(TEX) "\nonstopmode\input auc-tex.texi" +doc/auctex.dvi: doc/auctex.texi + cd $(＠D) && $(TEX) "\nonstopmode\input auctex.texi" \ + && texindex auctex.ky && texindex auctex.fn \ + && texindex auctex.vr && texindex auctex.cp \ + && $(TEX) "\nonstopmode\input auctex.texi" -RUN_MAKEINFO_INDIVIDUAL = $(MAKEINFO) -D rawfile -I texi/ --no-validate --force --no-headers -o $＠ $< - -INSTALLATION: texi/install.texi +INSTALLATION: doc/install.texi -$(RUN_MAKEINFO_INDIVIDUAL) -README: texi/intro.texi +README: doc/intro.texi -$(RUN_MAKEINFO_INDIVIDUAL) -CHANGES: texi/changes.texi +CHANGES: doc/changes.texi -$(RUN_MAKEINFO_INDIVIDUAL) -HISTORY: texi/history.texi +# does not build. +HISTORY: doc/history.texi -$(RUN_MAKEINFO_INDIVIDUAL) + +$(PL)/preview-mk.ins: $(PL)/preview.dtx $(PL)/bootstrap.ins + cd $(PL) && \ + $(TEX) '\nonstopmode \input bootstrap.ins' + +$(PL)/preview.ins: $(PL)/preview.dtx + cd $(PL) && \ + $(TEX) '\nonstopmode\def\jobname{.ins}\input docstrip ' \ + '\generate{\file{preview.ins}{\from{preview.dtx}{installer}}}' \ + '\endbatchfile' + +$(PREVIEW_TEXMFGEN) $(PL)/preview.drv: $(PL)/preview.dtx $(PL)/preview-mk.ins + cd $(PL) && \ + $(TEX) '\nonstopmode \input preview-mk.ins' + +$(PL)/preview.dvi: $(PL)/preview.drv $(PL)/preview.dtx $(PL)/preview.sty + cd $(PL) && \ + $(LATEX) '\nonstopmode \input preview.drv' && \ + $(LATEX) '\nonstopmode \input preview.drv' && \ + $(LATEX) '\nonstopmode \input preview.drv' diff -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 -r 40d87658aa7bc23e0595d783a057813e84495877 preview/latex/preview.dtx --- a/preview/latex/preview.dtx +++ b/preview/latex/preview.dtx ＠＠ -437,12 +437,12 ＠＠ \NeedsTeXFormat{LaTeX2e} \def\reserved＠a #1#2$#3: #4${\xdef#1{\reserved＠c #2#4 $}} \def\reserved＠c #1 #2${#1} \begingroup \catcode`\_=12 -\reserved＠a\pr＠version $Name$ \ifx\pr＠version\＠empty -\reserved＠a\pr＠version CVS-$Revision$ \endgroup \else +\reserved＠a\pr＠version $Name: release_11_84 $ \ifx\pr＠version\＠empty +\reserved＠a\pr＠version CVS-$Revision: 1.122 $ \endgroup \else \def\next release_{} \lccode`\_=`. \edef\next{\lowercase{\endgroup \def\noexpand\pr＠version{\expandafter\next\pr＠version}}} \next \fi -\reserved＠a\next $Date$ +\reserved＠a\next $Date: 2006/08/25 10:34:36 $ \edef\next{\noexpand\ProvidesPackage{preview}% [\next\space \pr＠version\space (AUCTeX/preview-latex)]} \next diff -r 57b6e9cb7d8874b18379f333b74d1c21242b9377 -r 40d87658aa7bc23e0595d783a057813e84495877 preview/preview.el --- a/preview/preview.el +++ b/preview/preview.el ＠＠ -3511,8 +3511,8 ＠＠ (preview-reraise-error process))))) (defconst preview-version (eval-when-compile - (let ((name "$Name$") - (rev "$Revision$")) + (let ((name "$Name: $") + (rev "$Revision: 1.279 $")) (or (when (string-match "\\`[$]Name: *release_\\([^ ]+\\) *[$]\\'" name) (setq name (match-string 1 name)) (while (string-match "_" name) ＠＠ -3526,7 +3526,7 ＠＠ (defconst preview-release-date (eval-when-compile - (let ((date "$Date$")) + (let ((date "$Date: 2006-10-24 16:02:21 $")) (string-match "\\`[$]Date: *\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)" date) Repository URL: https://bitbucket.org/xemacs/auctex/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches