From: Richard Kreckel Date: Sat, 11 Feb 2023 17:51:08 +0000 (+0100) Subject: Revert "Work around Tex Live 2012 versus doxygen problem." X-Git-Tag: release_1-8-7~10 X-Git-Url: https://ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=7ffad3308edc07133f86feef15725756e8366df2 Revert "Work around Tex Live 2012 versus doxygen problem." The bug seems to have disappeared many years ago, at least since Debian 9 Stretch (ca. 2017). This reverts commit af3801eb5e40bb3717bf207470252172a0af2559. --- diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 5f17dc27..e38e2a19 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -35,7 +35,6 @@ macro(pdflatex_process texfile) set(_idx ${_dirname}/${_basename}.idx) set(_ind ${_dirname}/${_basename}.ind) set(_pdf ${_dirname}/${_basename}.pdf) - set(_fixupind ${CMAKE_SOURCE_DIR}/scripts/fixupind.py) add_custom_command( OUTPUT ${_idx} COMMAND ${PDFLATEX_COMPILER} ${texfile} @@ -45,7 +44,6 @@ macro(pdflatex_process texfile) add_custom_command( OUTPUT ${_ind} COMMAND ${MAKEINDEX_COMPILER} ${_idx} - COMMAND ${PYTHON} ${_fixupind} ${_idx} WORKING_DIRECTORY ${_dirname} DEPENDS ${texfile} ${_idx} COMMENT "MAKEINDEX ${_basename}.idx") diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 445eeb72..5ad8a000 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -53,7 +53,6 @@ pdflatex/reference.pdf: pdflatex/reference.tex cd pdflatex; \ ${PDFLATEX} reference.tex ;\ ${MAKEINDEX} reference.idx ;\ - ${PYTHON} $(abs_top_srcdir)/scripts/fixupind.py reference.ind; \ ${PDFLATEX} reference.tex reference.dvi: latex latex/reference.dvi diff --git a/scripts/fixupind.py b/scripts/fixupind.py deleted file mode 100644 index 0e781c09..00000000 --- a/scripts/fixupind.py +++ /dev/null @@ -1,30 +0,0 @@ - -# encoding: utf-8 -# TeX Live 2012 seems to dislike files produces by doxygen (1.8.x.y) -# In particular, makeindex(1) program creates invalid index entries like -# \hyperpage{NNN_} -# (note the trailing underscore in the page number). This breaks automatic -# builds and is very annoying. Hence this script. It replaces (broken) -# \hyperpage{NNN_} with \hyperpage{NNN}. -# Note: this is an ugly work around, a proper fix is welcome. -import sys, os, re - -def fixupind(fname): - """ Fix \\hyperpage{NNN_} entries in the ind file @var{fname} """ - tmpout = fname + '.tmp' - inp = open(fname) - out = open(tmpout, 'wt') - rx = re.compile('(hyperpage)[{]([0-9]+)[_][}]') - for line in inp: - out.write(re.sub(rx, '\\1{\\2}', line)) - out.flush() - out.close() - inp.close() - os.rename(tmpout, fname) - -if __name__ == '__main__': - if len(sys.argv) <= 1: - sys.exit(1) - fixupind(sys.argv[1]) - sys.exit(0) -