Mercurial > octave-nkf

comparison run-octave.in @ 14614:4e9dc46d4125

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
handle texinfo macros consistently in help system and manual * macros.texi: New file. Move macro definitions here from octave.texi. * doc/interpreter/Makefile.am (octetc_DATA): Include it in the list. (doc-cache): Pass macros.texi to mk_doc_cache.m. * octave.texi: Include macros.texi. * mk_doc_cache.m, __makeinfo__.m: Copy macros file to makeinfo input instead of handling macros specially. * configure.ac (texi_macros_file): New variable. * build-aux/common.mk (texi_macros_file, do_subst_default_vals): Substitute it. * run-octave.in (TEXIMACROSFILE): New variable. Pass --texi-macros-file to Octave. * defaults.in.h (OCTAVE_DEFAULT_TEXI_MACROS_FILE): New variable. * default.cc (set_default_texi_macros_file): New function. (install_defaults): Call it. * help.cc (Vtexi_macros_file): New variable. (Ftexi_macros_file): New function. * help.h (Vtexi_macros_file): Provide decl. * octave.cc (TEXI_MACROS_FILE_OPTION): New long option value. (long_opts): Include --texi-macros-file in the list. (octave_main): Handle TEXI_MACROS_FILE_OPTION.
author John W. Eaton <jwe@octave.org>
date Thu, 10 May 2012 12:01:42 -0400
parents 72c96de7a403
children 16a6b0a6855d
comparison
equal deleted inserted replaced
14613:e7c8e31f8e5d 14614:4e9dc46d4125
43 d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'` 43 d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`
44 44
45 LOADPATH="$d1_path:$d2_path:$d3_path" 45 LOADPATH="$d1_path:$d2_path:$d3_path"
46 IMAGEPATH="$top_srcdir/scripts/image" 46 IMAGEPATH="$top_srcdir/scripts/image"
47 DOCFILE="$builddir/doc/interpreter/doc-cache" 47 DOCFILE="$builddir/doc/interpreter/doc-cache"
48 TEXIMACROSFILE="$top_srcdir/doc/interpreter/macros.texi"
48 INFOFILE="$top_srcdir/doc/interpreter/octave.info" 49 INFOFILE="$top_srcdir/doc/interpreter/octave.info"
49 50
50 ## Checking for string equality below with prepended x's in order to 51 ## Checking for string equality below with prepended x's in order to
51 ## handle problems with empty strings. 52 ## handle problems with empty strings.
52 if [ $# -gt 0 ]; then 53 if [ $# -gt 0 ]; then
68 69
69 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \ 70 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile" \
70 exec $builddir/libtool --mode=execute $driver \ 71 exec $builddir/libtool --mode=execute $driver \
71 "$builddir/src/octave" --no-init-path --path="$LOADPATH" \ 72 "$builddir/src/octave" --no-init-path --path="$LOADPATH" \
72 --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \ 73 --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \
73 --info-file="$INFOFILE" "$@" 74 --texi-macros-file="$TEXIMACROSFILE" --info-file="$INFOFILE" "$@"