diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2018-07-23 13:51:11 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2018-07-23 13:51:11 (GMT) |
commit | 2824cad3164e2def0a8fdc09f9e5990d11b1a60c (patch) | |
tree | 327881e60179eaec074017c00141a95961be59d5 | |
parent | ae25f5c41545e17b37d67ab7dabf422f0eb757aa (diff) | |
parent | fd851668bb00f0a36ccb1a7dbd83b3286aed30c1 (diff) | |
download | Doxygen-2824cad3164e2def0a8fdc09f9e5990d11b1a60c.zip Doxygen-2824cad3164e2def0a8fdc09f9e5990d11b1a60c.tar.gz Doxygen-2824cad3164e2def0a8fdc09f9e5990d11b1a60c.tar.bz2 |
Merge branch 'albert-github-feature/bug_latex_index'
-rw-r--r-- | src/config.xml | 14 | ||||
-rwxr-xr-x | src/configgen.py | 4 | ||||
-rw-r--r-- | src/latexgen.cpp | 18 |
3 files changed, 31 insertions, 5 deletions
diff --git a/src/config.xml b/src/config.xml index 94376f5..c863ac7 100644 --- a/src/config.xml +++ b/src/config.xml @@ -2553,6 +2553,20 @@ EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... <![CDATA[ The \c MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate index for \f$\mbox{\LaTeX}\f$. + + @note This tag is used in the `Makefile` / `make.bat`. + \sa \ref cfg_latex_makeindex_cmd "LATEX_MAKEINDEX_CMD" for the part in the generated output file (`.tex`). +]]> + </docs> + </option> + <option type='string' id='LATEX_MAKEINDEX_CMD' defval='\makeindex' depends='GENERATE_LATEX'> + <docs> +<![CDATA[ + The \c LATEX_MAKEINDEX_CMD tag can be used to specify the command name to + generate index for \f$\mbox{\LaTeX}\f$. + + @note This tag is used in the generated output file (`.tex`). + \sa \ref cfg_makeindex_cmd_name "MAKEINDEX_CMD_NAME" for the part in the `Makefile` / `make.bat`. ]]> </docs> </option> diff --git a/src/configgen.py b/src/configgen.py index 33857b7..ca2a5d1 100755 --- a/src/configgen.py +++ b/src/configgen.py @@ -272,7 +272,7 @@ def parseOption(node): print(" \"%s\"" % (line)) print(" );") if defval != '': - print(" cs->setDefaultValue(\"%s\");" % (defval)) + print(" cs->setDefaultValue(\"%s\");" % (defval.replace('\\','\\\\'))) if format == 'file': print(" cs->setWidgetType(ConfigString::File);") elif format == 'image': @@ -529,7 +529,7 @@ def parseOptionDoc(node, first): if defval != '': print("") print("The default value is: <code>%s</code>." % ( - defval)) + defval.replace('\\','\\\\'))) print("") # depends handling if (node.hasAttribute('depends')): diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 0e52914..474d368 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -647,9 +647,21 @@ static void writeDefaultHeaderPart1(FTextStream &t) "\\usepackage{natbib}\n" "\\usepackage[titles]{tocloft}\n" "\\setcounter{tocdepth}{3}\n" - "\\setcounter{secnumdepth}{5}\n" - "\\makeindex\n" - "\n"; + "\\setcounter{secnumdepth}{5}\n"; + + QCString latex_mkidx_command = Config_getString(LATEX_MAKEINDEX_CMD); + if (!latex_mkidx_command.isEmpty()) + { + if (latex_mkidx_command[0] == '\\') + t << latex_mkidx_command << "\n"; + else + t << '\\' << latex_mkidx_command << "\n"; + } + else + { + t << "\\makeindex\n"; + } + t << "\n"; writeExtraLatexPackages(t); writeLatexSpecialFormulaChars(t); |