1 new commit in xemacs-packages:
https://bitbucket.org/xemacs/xemacs-packages/commits/9954f5555c86/
Changeset: 9954f5555c86
User: Jerry James
Date: 2014-06-04 23:49:00
Summary: Support building HTML pages from texinfo sources with texi2any.
Drop support for texi2html 1.56k, which is more than a decade old.
Support encoding info files in UTF-8 with XEmacs 21.5 and encoding HTML
files in UTF-8 with all XEmacs versions. See xemacs-patches message with id
<CAHCOHQ=KnqkHK4eq9Zj88CDtVMy2antAWrXKiPTDGcXQ348gQA@mail.gmail.com>.
Affected #: 4 files
diff -r a8327abc702f36ae305b190894cc6f51401e345f -r 9954f5555c86d01eb90ccbb4fa662988241fb58a .hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -5,13 +5,13 @@
fb24044de5ab711da585692cd888b37d4c0ad32e mule-packages/leim
4196835ebe0fd2e03a0a7e077703d0cae55b67e9 mule-packages/locale
7af608160c697a0e6528567347f18a6094ff4ead mule-packages/lookup
-debccbb1b41832fa7c9f505aa0bd9de087783d45 mule-packages/mule-base
-34eb2a4c087800c35a9418ecac3b4f1e132689a1 mule-packages/mule-ucs
-cd6ebd8d4052952c43e58cbcfac236ef25cbb318 mule-packages/skk
+73778e0c6557f3895bf507414ec4d6e9b8492670 mule-packages/mule-base
+f7fb28ff013e12e7d94db7caae862dcff4c2dc16 mule-packages/mule-ucs
+0733acf1eea30f37921345e012c144e78ee0f773 mule-packages/skk
205e191f77a705351506f811ae5791a7397ed018 xemacs-packages/Sun
59caae12caf18ded4f30a77d4b1e03b9e9de0a77 xemacs-packages/ada
76c1a89a4a0815693dd9ef67b57e8c60521a23bf xemacs-packages/apel
-205bc50740c13d23f5f16ea086623a419ff485d8 xemacs-packages/auctex
+dba52387094241da43d5f91eee3ec2ba2a4e951a xemacs-packages/auctex
6bb0e98940a59f149b01409d75072e8554866596 xemacs-packages/bbdb
e0e5d9739b9d2535205a24f81968c366a187fd15 xemacs-packages/build
3e0a184be3acd281672f1c918d14aedf91caa815 xemacs-packages/c-support
@@ -68,7 +68,7 @@
74313bb2d6e600051de7bd32a33e0830039ae227 xemacs-packages/liece
973fcb1ceaedb0cd96ddff1a5428d789319edb96 xemacs-packages/mail-lib
2fd72e8d70e7f3fb560f75f09d3779e6afcae726 xemacs-packages/mailcrypt
-2b9e6184cbd6ae100d8c4f489448dd9294415dc9 xemacs-packages/mew
+842672ea26e047b412c9420ab66c8b7d0e8a353a xemacs-packages/mew
5b73297b966ce51e6f5661ed0558270efcee226a xemacs-packages/mh-e
c59650af035f31ee2a59eb56debda01434f13e90 xemacs-packages/mine
59715eb96f78c4dbe8a7aa379d3c7bc83c9216ed xemacs-packages/misc-games
@@ -91,7 +91,7 @@
0ee1257d7cabca1d8fa4dd59668fbb6fc0351c85 xemacs-packages/python-modes
e2c73886ecaa1e698482f9af754187844ea0a43f xemacs-packages/re-builder
627ae65e79f6ddd6cb6613c6d18985f982775af7 xemacs-packages/reftex
-4a658c7f6f62e7358d5f8542f7fc102f050864c4 xemacs-packages/riece
+461d0ff81ae7bbedd84a57ef1a7a96b84fc3c19e xemacs-packages/riece
b89cc6d0cc293b7df9f5614dac6daa67098276f1 xemacs-packages/rmail
adb52a4e377c843292da797dfcb05bd3a1f1fbe7 xemacs-packages/ruby-modes
570518888f8c761832e3149a9ad194dbdd1fcf7b xemacs-packages/sasl
@@ -111,18 +111,18 @@
da2c71235bd8dbade52e3bd2ccf93b8e7cdcf61a xemacs-packages/text-modes
b05362392512f6039e689c4c08eee193f025c67d xemacs-packages/textools
e6d063da5d54876bcf3855c748b9d41453cb73d9 xemacs-packages/time
-b8c1c44424e50c08741c232c3cbdbc4c9022e7d2 xemacs-packages/tm
+a36edb38dd1ed3e06f233ef2b6b0bf3070964ec6 xemacs-packages/tm
6d1309305e5fe1f361cd2940f4eccfd020073d26 xemacs-packages/tooltalk
7bcc62f4ea924ca0565d85c500043f966fa32b64 xemacs-packages/tpu
-fa3dda7de3c4a3780ad8eb10ddf5379c320734e7 xemacs-packages/tramp
+cb7f3960d3fec0b936d1a3ff4498407466884f84 xemacs-packages/tramp
aa6b5f62e7a5857fb11cc448857357f708b58b80 xemacs-packages/vc
7b706d28f50b4311c145312845e4b9cb649b0efb xemacs-packages/vc-cc
4abfbdb0f15c3517c211b5e4238006cc6d5c1787 xemacs-packages/vhdl
48cfca2ee69f84c97abc631df6f532005dfc17a9 xemacs-packages/view-process
2950090a6a9597ac422dafd1cc07f07759e90b02 xemacs-packages/viper
-be2fbb8d32e2739dd2c9e606dac872bb77a1077c xemacs-packages/vm
-ce765cb8ad26831c86e044585739a6d94b667253 xemacs-packages/w3
-75dfeb7be38ea246f90c07803a2883f31edace2f xemacs-packages/x-symbol
+6717e479f23c18ce92695cd7b7832056832eacf3 xemacs-packages/vm
+2f834e2965a5907ac52c1189c1785e3879ae2399 xemacs-packages/w3
+47b3dcf636bfed9ad0a0b8baa5ed29ff87188aad xemacs-packages/x-symbol
06f247e269bfbba4b2944ab529e846dfab7eae2e xemacs-packages/xemacs-base
8e2a462a5f49d1769b22d4c7e1c5d92b9129be6e xemacs-packages/xemacs-devel
17b87e1bcfcde7e61ef484196689181725d378df xemacs-packages/xetla
diff -r a8327abc702f36ae305b190894cc6f51401e345f -r 9954f5555c86d01eb90ccbb4fa662988241fb58a ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-02 Jerry James <[email protected]>
+
+ * Local.rules.template: Support texi2any. Drop support for
+ texi2html 1.56k, which is more than a decade old.
+ * XEmacs.rules: Support encoding info files in UTF-8 with XEmacs
+ 21.5 and encoding HTML files in UTF-8 with all XEmacs versions.
+
2014-05-30 Norbert Koch <[email protected]>
* Packages released: cc-mode.
diff -r a8327abc702f36ae305b190894cc6f51401e345f -r 9954f5555c86d01eb90ccbb4fa662988241fb58a Local.rules.template
--- a/Local.rules.template
+++ b/Local.rules.template
@@ -84,10 +84,9 @@
symlink =
# If `t', the build process will build and install .html versions of the
-# doc files. NOTE: texi2html 1.56k (#### perhaps 1.64 is better?) issues
-# complaints about a large number of files that pass `makeinfo' just fine.
-# This doesn't prevent it from building the .html files, though.
-#
+# doc files. NOTE: texi2html and texi2any both issue complaints about a
+# large number of files that pass `makeinfo' just fine. This doesn't
+# prevent it from building the .html files, though.
INSTALL_HTML =
##################### End settings that commonly need to be changed
@@ -190,18 +189,13 @@
#
MAKEINFO = makeinfo
-# path to texi2html
+# path to texi2html or texi2any
#
-TEXI2HTML = texi2html
-# texi2html 1.56k on Cygwin has "-split_chapter", whereas newer versions
-# (eg. 1.64) has "-split chapter", this should work either way. 1.56k doesn't
-# have "-help" and 1.64 doesn't have "-usage", but doing "-help" with 1.56k
-# outputs the usage anyway :P
-ifneq ('$(shell sh -c "texi2html -help 2>&1 | grep -l split_chapter")','')
-TEXI2HTML_FLAGS = -split_chapter
-TEXI2HTML_1_56K = t
+TEXI2HTML = texi2any
+ifeq ($(TEXI2HTML),texi2html)
+TEXI2HTML_FLAGS = -split chapter
else
-TEXI2HTML_FLAGS = -split chapter
+TEXI2HTML_FLAGS = --html --split=chapter
endif
diff -r a8327abc702f36ae305b190894cc6f51401e345f -r 9954f5555c86d01eb90ccbb4fa662988241fb58a XEmacs.rules
--- a/XEmacs.rules
+++ b/XEmacs.rules
@@ -278,6 +278,12 @@
XEMACS_BATCH_PREPARE_FOR_TEXINFO = $(XEMACS_BATCH_CLEAN) -eval '(setq load-path (append (list "$(XEMACS_PACKAGES_BASE)/xemacs-packages/texinfo" "$(XEMACS_PACKAGES_BASE)/xemacs-packages/text-modes" "$(XEMACS_PACKAGES_BASE)/xemacs-packages/xemacs-base") load-path))' $(LOAD_AUTOLOADS)
+ifeq ($(XEMACS_21_5),t)
+INFO_ENCODING = utf-8
+else
+INFO_ENCODING = iso-2022-7
+endif
+
FORMAT_INFO_USING_XEMACS_ARGS = -l informat -l texinfmt -f texinfo-format-buffer
FORMAT_INFO_USING_XEMACS = \
@@ -289,7 +295,7 @@
-eval '(unless (featurep (quote mule)) (kill-emacs 0))' \
-eval '(cd "$(<D)")' \
$(FORMAT_INFO_USING_XEMACS_ARGS) \
- -eval '(setq file-coding-system (quote iso-2022-7))' \
+ -eval '(setq file-coding-system (quote $(INFO_ENCODING)))' \
-eval '(save-buffer 0)'
# makeinfo doesn't seem able to handle Mule-formatted files correctly, so
@@ -315,9 +321,24 @@
## puts its results in the current directory, not the directory of the
## source file.
-# V 1.56k (with Cygwin) does not allow -p flag. Works fine without it.
-#RUN_TEXI2HTML = cd $(@D) && $(TEXI2HTML) $(TEXI2HTML_FLAGS) -p $(<F)
+ifeq ($(COMPILE_INFO_AS_MULE),t)
+ifeq ($(XEMACS_21_5),t)
+PREPARE_MULE_UCS =
+else
+PREPARE_MULE_UCS = -eval '(setq load-path (append (list "$(XEMACS_PACKAGES_BASE)/mule-packages/mule-base" "$(XEMACS_PACKAGES_BASE)/mule-packages/mule-ucs/lisp" "$(XEMACS_PACKAGES_BASE)/mule-packages/latin-euro-standards") load-path))' $(LOAD_AUTOLOADS) -l tae -l un-define
+endif
+RUN_TEXI2HTML = for fil in $< $(EXTRA_TEXI_FILES); do \
+ $(XEMACS_BATCH_PREPARE_FOR_TEXINFO) $(PREPARE_MULE_UCS) \
+ -eval '(unless (featurep (quote mule)) (kill-emacs 0))' \
+ -eval "(find-file \"$$fil\")" \
+ -eval '(setq file-coding-system (quote utf-8))' \
+ -eval '(progn (goto-char (point-min)) (when (search-forward "@setfilename" nil t) (forward-line) (insert "@documentencoding UTF-8\n")))' \
+ -eval '(save-buffer 16)'; done && \
+ pushd $(@D) && $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(<F) && popd && \
+ for fil in $< $(EXTRA_TEXI_FILES); do mv -f $$fil~ $$fil; done
+else
RUN_TEXI2HTML = cd $(@D) && $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(<F)
+endif
%_toc.html: %.txi
$(RUN_TEXI2HTML)
@@ -522,13 +543,13 @@
# Make the $(pkg_tar).gz first, then the $(pkg_tar).bz2
package-info : package-info.in Makefile $(AUTOLOAD_PATH)/_pkg.el \
$(pkg_tar).gz $(pkg_tar).bz2
- # #### See if we can't CLEAN this up
+ # #### See if we can't CLEAN this up
$(XEMACS_BATCH_DIRTY) \
-l package-info.elc -f batch-update-package-info \
'$(VERSION)' $(PKG_TAR_GZ) \
'$(REQUIRES)' \
'$(AUTHOR_VERSION)' '$(MAINTAINER)' '$(CATEGORY)'
- # #### See if we can't CLEAN this up
+ # #### See if we can't CLEAN this up
$(XEMACS_BATCH_DIRTY) \
-l $(HACK_PACKAGE_INDEX) -f batch-hack-package-index \
$(PACKAGE) package-info $(PACKAGE_INFO) $(CATEGORY)
Repository URL: https://bitbucket.org/xemacs/xemacs-packages/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.