Mercurial > octave-nkf
comparison src/help.h @ 14614:4e9dc46d4125
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 |
comparison
equal
deleted
inserted
replaced
14613:e7c8e31f8e5d | 14614:4e9dc46d4125 |
---|---|
34 | 34 |
35 // Name of the doc cache file specified on the command line. | 35 // Name of the doc cache file specified on the command line. |
36 // (--doc-cache-file file) | 36 // (--doc-cache-file file) |
37 extern std::string Vdoc_cache_file; | 37 extern std::string Vdoc_cache_file; |
38 | 38 |
39 // Name of the file containing local Texinfo macros that are prepended | |
40 // to doc strings before processing. | |
41 // (--texi-macros-file) | |
42 extern std::string Vtexi_macros_file; | |
43 | |
39 // Name of the info file specified on command line. | 44 // Name of the info file specified on command line. |
40 // (--info-file file) | 45 // (--info-file file) |
41 extern std::string Vinfo_file; | 46 extern std::string Vinfo_file; |
42 | 47 |
43 // Name of the info reader we'd like to use. | 48 // Name of the info reader we'd like to use. |