[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6095] use TOP_NODE_UP_URL=/manual/ for our own manuals, and fix other b
|
From: |
karl |
|
Subject: |
[6095] use TOP_NODE_UP_URL=/manual/ for our own manuals, and fix other broken links |
|
Date: |
Tue, 03 Feb 2015 18:53:38 +0000 |
Revision: 6095
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6095
Author: karl
Date: 2015-02-03 18:53:36 +0000 (Tue, 03 Feb 2015)
Log Message:
-----------
use TOP_NODE_UP_URL=/manual/ for our own manuals, and fix other broken links
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/doc/Makefile.am
trunk/doc/texinfo.texi
trunk/tp/Makefile.am
trunk/util/htmlxref.cnf
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-02-02 23:58:41 UTC (rev 6094)
+++ trunk/ChangeLog 2015-02-03 18:53:36 UTC (rev 6095)
@@ -1,3 +1,14 @@
+2015-02-03 Karl Berry <address@hidden>
+
+ * doc/Makefile.am (gendocs_invoke): pass TOP_NODE_UP_URL=/manual/.
+ (gnulib, etc.): new variable and settings to invoke gendocs.sh
+ from gnulib, as it is no longer maintained here.
+ * doc/texinfo.texi: fix broken cross-manual links, etc.
+ * util/htmlxref.cnf: add free TeX manuals on tug.org.
+
+ * Makefile.am (long-checks),
+ * tp/Makefile.am (long-checks): convenience target for tp/tests.
+
2015-02-02 Karl Berry <address@hidden>
* doc/texinfo.texi (First Node): mention TOP_NODE_UP_URL usage.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2015-02-02 23:58:41 UTC (rev 6094)
+++ trunk/Makefile.am 2015-02-03 18:53:36 UTC (rev 6095)
@@ -21,14 +21,25 @@
system.h gnulib/m4/gnulib-cache.m4 \
contrib djgpp
+# include contrib perl manual, exclude .svn.
dist-hook:
cd $(top_distdir)/contrib/perldoc-all && $(MAKE) distclean
rm -rf `find $(distdir) -type d -name .svn`
+# update texi2html translations.
+dist-local:
+ cp -fpR $(srcdir)/po_document/*.po $(srcdir)/po_document/LINGUAS
texi2html/po_document/
+ cp -fpR $(srcdir)/po/*.po $(srcdir)/po/LINGUAS texi2html/po_messages/
+
# This is to prevent texinfo.tex from being included in the top-level
# distribution directory.
TEXINFO_TEX = doc/texinfo.tex
+# One special target for installers to use by hand if desired.
+install-tex:
+ cd doc && $(MAKE) TEXMF=$(TEXMF) install-tex
+
+# painful separate build for cross-compiling.
SUBDIRS =
if TOOLS_ONLY
# Build native tools only.
@@ -59,23 +70,19 @@
doc man
endif
-# One special target for installers to use by hand if desired.
-install-tex:
- cd doc && $(MAKE) TEXMF=$(TEXMF) install-tex
-
distclean-local:
-test -d "$(native_tools)" && rm -rf "$(native_tools)"
-dist-local:
- cp -fpR $(srcdir)/po_document/*.po $(srcdir)/po_document/LINGUAS
texi2html/po_document/
- cp -fpR $(srcdir)/po/*.po $(srcdir)/po/LINGUAS texi2html/po_messages/
-
# Don't install native tools for cross compile.
if TOOLS_ONLY
install:
endif
+# just a convenience for running these additional tests.
+long-checks:
+ cd tp/tests && $(MAKE) long-checks
+
# From coreutils.
# Verify that all source files using _() are listed in po/POTFILES.in.
# Run this before making pretests, as well as official releases, so that
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2015-02-02 23:58:41 UTC (rev 6094)
+++ trunk/doc/Makefile.am 2015-02-03 18:53:36 UTC (rev 6095)
@@ -2,7 +2,7 @@
# Makefile.am for texinfo/doc.
#
# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-# 2013 Free Software Foundation, Inc.
+# 2013, 2014, 2015 Free Software Foundation, Inc.
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -76,14 +76,17 @@
# using the gendocs.sh script; see
# http://www.gnu.org/prep/maintain/html_node/Invoking-gendocs_002esh.html
#
-# Since gendocs.sh is maintained here in Texinfo, use it from
-# the development sources; ordinarily it's invoked from a gnulib checkout.
+# Invoke gendocs.sh from a gnulib checkout (outside our tree).
#
-gendocs = $(abs_top_srcdir)/util/gendocs.sh
-gendocs_templates = $(abs_top_srcdir)/util
+gnulib = $(abs_top_srcdir)/../gnulib
+gendocs = $(gnulib)/build-aux/gendocs.sh
+gendocs_templates = $(gnulib)/doc
gendocs_envvars = GENDOCS_TEMPLATE_DIR=$(gendocs_templates)
+#
gendocs_email = address@hidden
-gendocs_invoke = env $(gendocs_envvars) $(gendocs) --email $(gendocs_email)
+gendocs_dir_url = /manual/
+gendocs_invoke = env $(gendocs_envvars) $(gendocs) --email $(gendocs_email) \
+ --html '-c TOP_NODE_UP_URL=$(gendocs_dir_url)'
#
manual1 = info
manual1_title = "GNU Info manual"
@@ -94,17 +97,21 @@
manual3 = texinfo
manual3_title = "GNU Texinfo manual"
#
+# We also make a little HTML document for pod2texi script.
+pod2texi_pl = $(abs_top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl
+
+# destination directory.
doctemp = wwwtemp
www_target = $(HOME)/gnu/www/texinfo/manual
#
wwwdoc-build:
rm -rf $(doctemp) && mkdir $(doctemp)
cd $(doctemp) \
- && pod2html $(abs_top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl
>pod2texi.html \
&& ln -s ../*.texi . \
&& $(gendocs_invoke) -o $(manual1) $(manual1) $(manual1_title) \
&& $(gendocs_invoke) -o $(manual2) $(manual2) $(manual2_title) \
- && $(gendocs_invoke) -o $(manual3) $(manual3) $(manual3_title)
+ && $(gendocs_invoke) -o $(manual3) $(manual3) $(manual3_title) \
+ && pod2html $(pod2texi_pl) >pod2texi.html \
@echo "Manuals for web distribution under: $(doctemp)/"
#
# At official release, we need to update:
Modified: trunk/doc/texinfo.texi
===================================================================
--- trunk/doc/texinfo.texi 2015-02-02 23:58:41 UTC (rev 6094)
+++ trunk/doc/texinfo.texi 2015-02-03 18:53:36 UTC (rev 6095)
@@ -618,7 +618,7 @@
* @t{texinfo-format} commands:: Two Info formatting commands written
in Emacs Lisp are an alternative
to @code{makeinfo}.
-* Batch Formatting:: How to format for Info in Emacs Batch mode.
+* Batch Formatting:: How to format for Info in Emacs batch mode.
* Tag and Split Files:: How tagged and split files help Info
to run better.
@@ -852,9 +852,9 @@
@cindex Patches, contributing
Patches are most welcome; if possible, please make them with
address@hidden@w{diff -c}} (@pxref{Top,,, diff, Comparing and Merging Files})
-and include @file{ChangeLog} entries (@pxref{Change Log,,, emacs, The
-GNU Emacs Manual}), and follow the existing coding style.
address@hidden@w{diff -c}} (@pxref{Top,,, diffutils, Comparing and Merging
+Files}) and include @file{ChangeLog} entries (@pxref{Change Log,,,
+emacs, The GNU Emacs Manual}), and follow the existing coding style.
@node Using Texinfo
@@ -2344,7 +2344,7 @@
The @code{texinfo-column-for-description} variable specifies the
column to which menu descriptions are indented. By default, the value
is 32 although it can be useful to reduce it to as low as 24. You
-can set the variable via customization (@pxref{Changing an Option,,,
+can set the variable via customization (@pxref{Customization,,,
emacs, The GNU Emacs Manual}) or with the @kbd{M-x set-variable}
command (@pxref{Examining, , Examining and Setting Variables, emacs,
The GNU Emacs Manual}).
@@ -5291,11 +5291,13 @@
link from the Top node to go somewhere other than @samp{dir.html}.
For example, for GNU the natural place would be
@url{http://www.gnu.org/manual/} (a web page collecting links to most
-GNU manuals). This can be specified with the @code{TOP_NODE_UP_URL}
-customization variable (@pxref{HTML Customization Variables}), as in
+GNU manuals), better specified as just @code{/manual/} if the manual
+will be installed on @code{www.gnu.org}. This can be specified with
+the @code{TOP_NODE_UP_URL} customization variable (@pxref{HTML
+Customization Variables}), as in
@example
-$ @kbd{makeinfo --html -c TOP_NODE_UP_URL=http://www.gnu.org/manual/} ...
+$ @kbd{makeinfo --html -c TOP_NODE_UP_URL=/manual/} ...
@end example
All links to @code{(dir)} will be replaced by the given url.
@@ -11532,14 +11534,13 @@
single-quotes). For the other quotation marks, @TeX{} uses European
Computer Modern (EC) fonts (@file{ecrm1000} and other variants).
These fonts are freely available, of course; you can download them
-from @url{http://@/www.ctan.org/@/tex-archive/@/fonts/ec}, among other
-places.
+from @url{http://ctan.org/pkg/ec}, among other places.
@cindex CM-Super fonts
The free EC fonts are bitmap fonts created with Metafont. Especially
for on-line viewing, address@hidden (vector) versions of the fonts are
preferable; these are available in the CM-Super font package
-(@url{http://@/www.ctan.org/@/tex-archive/@/fonts/@/ps-type1/@/cm-super}).
+(@url{http://ctan.org/pkg/cm-super}).
Both distributions include installation instructions.
@@ -11610,13 +11611,12 @@
``guillemot'' is a bird species (a type of auk).
Traditions for quotation mark usage vary to a great extent between
-languages
-(@url{http://@/en.wikipedia.org/@/wiki/@/Quotation_mark%2C_non-English_usage@/#Overview}).
-Texinfo does not provide commands for typesetting quotation marks
-according to the numerous traditions. Therefore, you have to choose
-the commands appropriate for the language of your manual. Sometimes
-aliases (@address@hidden@@alias}}) can simplify the usage and make the
-source code more readable. For example, in German,
+languages (@url{http://en.wikipedia.org/wiki/Quotation_mark}).
+Texinfo does not provide commands or configurations for typesetting
+quotation marks according to the numerous traditions. Therefore, you
+have to choose the commands appropriate for the language of your
+manual. Sometimes aliases (@address@hidden@@alias}}) can simplify the
+usage and make the source code more readable. For example, in German,
@code{@@quotedblbase} is used for the left double quote, and the right
double quote is the glyph produced by @code{@@quotedblleft}, which is
counter-intuitive. Thus, in this case the following aliases would be
@@ -11931,9 +11931,8 @@
were designed before the Euro was legislated into existence).
Therefore, @TeX{} uses an additional font, named @code{feymr10} (along
with other variables). It is freely available, of course; you can
-download it from @url{http://www.ctan.org/tex-archive/fonts/eurosym},
-among other places. The distribution includes installation
-instructions.
+download it from @url{http://ctan.org/pkg/eurosym}, among other
+places. The distribution includes installation instructions.
@node @t{@@pounds}
@@ -12498,26 +12497,13 @@
@end group
@end example
-The @code{@@/} command can often be useful within urls
-(@address@hidden@@url}}), which tend to be long and are otherwise
-unbreakable. For example:
+The @code{@@/} command can be useful within long urls or other
+identifiers where @TeX{} can't find a good place to break. @TeX{}
+will automatically break urls at the natural places (@pxref{URL Line
+Breaking}), so only use @code{@@/} if you need it. @code{@@/} has no
+effect in the other output format.
address@hidden
-The official Texinfo home page is on the GNU web site:
-@@address@hidden://www.gnu.org/@@/software/@@/gnu/@@/address@hidden
address@hidden example
address@hidden produces
-
address@hidden
-The official Texinfo home page is on the GNU web site:
address@hidden://www.gnu.org/@/software/@/gnu/@/texinfo}.
address@hidden quotation
-
address@hidden Without the @code{@@/} commands, @TeX{} would have nowhere to
-break the url. @code{@@/} has no effect in other output formats.
-
-
@node @t{@@- @@hyphenation}
@section @code{@@-} and @code{@@hyphenation}: Helping @TeX{} Hyphenate
@@ -14898,7 +14884,7 @@
manual simply to build and install the package; they can use
preformatted Info (or other) output files. This is desirable in
general, to avoid unnecessary dependencies between packages
-(@pxref{Releases,,, standard, GNU Coding Standards}).
+(@pxref{Releases,,, standards, GNU Coding Standards}).
@node Conditional Nesting
@@ -16653,7 +16639,7 @@
included in all standard GNU distributions. The latest version is
always available from the Texinfo source repository:
@smalldisplay
address@hidden://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/doc/texinfo.tex?rev=HEAD}
address@hidden://svn.savannah.gnu.org/viewvc/trunk/doc/texinfo.tex?root=texinfo&view=log}
@end smalldisplay
@pindex address@hidden, installing}
@@ -17047,7 +17033,8 @@
system.
@item
address@hidden://partners.adobe.com/asn/acrobat/sdk/public/docs/, PDF
definition}.
address@hidden://en.wikipedia.org/wiki/Portable_Document_Format, PDF at
+Wikipedia}.
@end itemize
@@ -18948,7 +18935,7 @@
* @t{texinfo-format} commands:: Two Info formatting commands written
in Emacs Lisp are an alternative
to @code{makeinfo}.
-* Batch Formatting:: How to format for Info in Emacs Batch mode.
+* Batch Formatting:: How to format for Info in Emacs batch mode.
* Tag and Split Files:: How tagged and split files help Info
to run better.
@end menu
@@ -19113,8 +19100,8 @@
@cindex Info batch formatting
You can format Texinfo files for Info using @code{batch-texinfo-format}
-and Emacs Batch mode. You can run Emacs in Batch mode from any shell,
-including a shell inside of Emacs. (@xref{Command Arguments,,,
+and Emacs batch mode. You can run Emacs in batch mode from any shell,
+including a shell inside of Emacs. (@xref{Initial Options,,,
emacs, The GNU Emacs Manual}.)
Here is a shell command to format all the files that end in
@@ -19128,8 +19115,8 @@
Emacs processes all the files listed on the command line, even if an
error occurs while attempting to format some of them.
-Run @code{batch-texinfo-format} only with Emacs in Batch mode as shown;
-it is not interactive. It kills the Batch mode Emacs on completion.
+Run @code{batch-texinfo-format} only with Emacs in batch mode as shown;
+it is not interactive. It kills the batch mode Emacs on completion.
@code{batch-texinfo-format} is convenient if you lack @code{makeinfo}
and want to format several Texinfo files at once. When you use Batch
@@ -19529,7 +19516,7 @@
recommend consulting the @uref{http://www.gnu.org/directory,
Free Software Directory}. If your program is not listed there,
or listed incorrectly or incompletely, please report the situation to
-the directory maintainers (@email{bug-directory@@gnu.org}) so that the
+the directory maintainers (@url{http://directory.fsf.org}) so that the
category names can be kept in sync.
Here are a few examples (see the @file{util/dir-example} file in the
@@ -22602,10 +22589,10 @@
@cindex RCS $Id
@cindex Documentation identification
@cindex Identification of documentation
-The @samp{$Id:} comment is for the CVS (@pxref{Top,,, cvs, Concurrent
-Versions System}), RCS (@pxref{Top,,, rcs, Revision Control System})
-and other version control systems, which expand it into a string such
-as:
+The @samp{$Id:} comment is for the CVS
+(@url{http://www.nongnu.org/cvs/}), RCS (@pxref{Top,,, rcs, Revision
+Control System}) and other version control systems, which expand it
+into a string such as:
@example
$Id$
Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am 2015-02-02 23:58:41 UTC (rev 6094)
+++ trunk/tp/Makefile.am 2015-02-03 18:53:36 UTC (rev 6095)
@@ -1,7 +1,7 @@
# $Id$
# Makefile.am for texinfo/tp.
#
-# Copyright 2011, 2012, 2013 Free Software Foundation, Inc.
+# Copyright 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -177,6 +177,10 @@
AM_T_LOG_FLAGS = -w
AM_TESTS_ENVIRONMENT = srcdir="$(srcdir)"; export srcdir;
top_srcdir="$(top_srcdir)"; export top_srcdir;
+# just a convenience for running these additional tests.
+long-checks:
+ cd tests && $(MAKE) long-checks
+
maintenance_files = \
maintain/all_tests.sh \
maintain/change_perl_modules_version.sh \
Modified: trunk/util/htmlxref.cnf
===================================================================
--- trunk/util/htmlxref.cnf 2015-02-02 23:58:41 UTC (rev 6094)
+++ trunk/util/htmlxref.cnf 2015-02-03 18:53:36 UTC (rev 6095)
@@ -1,6 +1,6 @@
# htmlxref.cnf - reference file for free Texinfo manuals on the web.
-htmlxrefversion=2015-01-30.00; # UTC
+htmlxrefversion=2015-02-03.18; # UTC
# Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
#
@@ -16,8 +16,8 @@
#
# To be included in this list, a manual must:
#
-# - have a generic url, i.e., no version numbers;
-# - have a unique file name (identifier), i.e., be related to the
+# - have a generic url, e.g., no version numbers;
+# - have a unique file name (e.g., manual identifier), i.e., be related to the
# package name. Things like "refman" or "tutorial" don't work.
# - follow the naming convention for nodes described at
# http://www.gnu.org/software/texinfo/manual/texinfo/html_node/HTML-Xref.html
@@ -618,6 +618,20 @@
xboard mono ${GS}/xboard/manual/xboard.html
xboard node ${GS}/xboard/manual/html_node/
+# emacs-page
+# Free TeX-related Texinfo manuals on tug.org.
+
+T = http://tug.org/texinfohtml
+
+dvipng mono ${T}/dvipng.html
+dvips mono ${T}/dvips.html
+eplain mono ${T}/eplain.html
+kpathsea mono ${T}/kpathsea.html
+latex2e mono ${T}/latex2e.html
+tlbuild mono ${T}/tlbuild.html
+web2c mono ${T}/web2c.html
+
+
# Local Variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "htmlxrefversion="
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6095] use TOP_NODE_UP_URL=/manual/ for our own manuals, and fix other broken links,
karl <=