Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ansifilter for openSUSE:Factory checked in at 2023-03-16 22:57:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ansifilter (Old) and /work/SRC/openSUSE:Factory/.ansifilter.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansifilter" Thu Mar 16 22:57:28 2023 rev:14 rq:1072195 version:2.19 Changes: -------- --- /work/SRC/openSUSE:Factory/ansifilter/ansifilter.changes 2021-02-07 15:23:39.278174204 +0100 +++ /work/SRC/openSUSE:Factory/.ansifilter.new.31432/ansifilter.changes 2023-03-16 22:57:46.331292334 +0100 @@ -1,0 +2,9 @@ +Wed Mar 15 20:54:22 UTC 2023 - antoine.belv...@opensuse.org + +- Update to version 2.19: + * Added stdin/stdio default stream hints in `--help` + (gl#saalen/ansifilter#34). + * Added shell completion scripts (gl#saalen/ansifilter#36). +- Update ansifilter.keyring. + +------------------------------------------------------------------- Old: ---- ansifilter-2.18.tar.bz2 ansifilter-2.18.tar.bz2.asc New: ---- ansifilter-2.19.tar.bz2 ansifilter-2.19.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ansifilter.spec ++++++ --- /var/tmp/diff_new_pack.SYtNw3/_old 2023-03-16 22:57:46.967295415 +0100 +++ /var/tmp/diff_new_pack.SYtNw3/_new 2023-03-16 22:57:46.971295434 +0100 @@ -1,7 +1,7 @@ # # spec file for package ansifilter # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2013 Pascal Bleser. # # All modifications and additions to the file contributed by third parties @@ -19,7 +19,7 @@ %bcond_without gui Name: ansifilter -Version: 2.18 +Version: 2.19 Release: 0 Summary: ANSI Terminal Escape Code Converter License: GPL-3.0-or-later @@ -46,6 +46,39 @@ This package provides a Qt Graphical User Interface to run %{name}. %endif +%package bash-completion +Summary: Bash completion for %{name} +Group: System/Shells +Requires: %{name} +Requires: bash-completion +Supplements: (bash-completion and %{name}) +BuildArch: noarch + +%description bash-completion +This package provides Bash command-line completion support for %{name}. + +%package fish-completion +Summary: Fish completion for %{name} +Group: System/Shells +Requires: %{name} +Requires: fish +Supplements: (fish and %{name}) +BuildArch: noarch + +%description fish-completion +This package provides Fish command-line completion support for %{name}. + +%package zsh-completion +Summary: Zsh completion for %{name} +Group: System/Shells +Requires: %{name} +Requires: zsh +Supplements: (zsh and %{name}) +BuildArch: noarch + +%description zsh-completion +This package provides Zsh command-line completion support for %{name}. + %prep %setup -q %if %{with gui} @@ -92,4 +125,17 @@ %{_datadir}/pixmaps/ansifilter.xpm %endif +%files bash-completion +%{_datadir}/bash-completion/completions/%{name} + +%files fish-completion +%dir %{_datadir}/fish +%dir %{_datadir}/fish/vendor_completions.d +%{_datadir}/fish/vendor_completions.d/%{name}.fish + +%files zsh-completion +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/_%{name} + %changelog ++++++ ansifilter-2.18.tar.bz2 -> ansifilter-2.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/ChangeLog.adoc new/ansifilter-2.19/ChangeLog.adoc --- old/ansifilter-2.18/ChangeLog.adoc 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/ChangeLog.adoc 2023-02-27 21:06:43.000000000 +0100 @@ -1,5 +1,12 @@ = Ansifilter ChangeLog +=== ansifilter 2.19 + +23.02.2023 + + - added stdin/stdio default stream hints in `--help` (https://gitlab.com/saalen/ansifilter/-/issues/34) + - added shell completion scripts (https://gitlab.com/saalen/ansifilter/-/issues/36) + === ansifilter 2.18 30.01.2021 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/README.adoc new/ansifilter-2.19/README.adoc --- old/ansifilter-2.18/README.adoc 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/README.adoc 2023-02-27 21:06:43.000000000 +0100 @@ -1,6 +1,6 @@ = ANSIFILTER MANUAL André Simon -v2.15, November 2019 +v2.19, February 2023 OSI Certified Open Source Software @@ -14,16 +14,17 @@ === Quick introduction ................................................................................ - Invocation: ansifilter [OPTION]... [FILE]... ansifilter handles text files containing ANSI terminal escape codes. File handling: - -i, --input=<file> Name of input file - -o, --output=<file> Name of output file + -i, --input=<file> Name of input file (default stdin) + -o, --output=<file> Name of output file (default stdout) -O, --outdir=<dir> Name of output directory -t, --tail Continue reading after end-of-file (like tail -f) + -x, --max-size=<size> Set maximum input file size + (examples: 512M, 1G; default: 256M) Output text formats: -T, --text (default) Output text @@ -43,6 +44,7 @@ -f, --fragment Omit HTML header and footer -F, --font=<font> Set HTML/RTF/SVG font face -k, --ignore-clear(=0) Do not adhere to clear (ESC K) commands (default: true) + -c, --ignore-csi Do not adhere to CSI commands (useful for UTF-8 input) -l, --line-numbers Print line numbers in output file -m, --map=<path> Read color mapping file (see README) -r, --style-ref=<rf> Set HTML/TeX/LaTeX/SVG stylesheet path @@ -76,7 +78,6 @@ Parsing XBIN files overrides --art-width, --art-height and --map options. The ANSI art file formats BIN, XBIN and TND cannot be read from stdin. - ................................................................................ === Platforms @@ -86,7 +87,7 @@ === Features Ansifilter understands most CSI sequences. Support for ANSI art files (based on -codepage 437 and ANSI.SYS sequences, BIN/XBIN and Tundra files) is enabled with +codepage 437 and ANSI.SYS sequences, BIN/XBIN and Tundra files) is enabled with the `--art-cp437` and `--art-bin` options. Parsing XBIN files overrides `--art-width`, `--art-height` and `--map` options. Parsing TND files overrides `--art-width` and `--map` options. @@ -116,12 +117,12 @@ === Color mapping -The basic ANSI color set can be adjusted with a color map file (`--map` option). +The basic ANSI color set can be adjusted with a color map file (`--map` option). This text configuration overrides these color codes: ................................................................................ -Normal: Black (0), Red (1), Green (2), Yellow (3), Blue (4), Magenta (5), +Normal: Black (0), Red (1), Green (2), Yellow (3), Blue (4), Magenta (5), Cyan (6), Gray (7) Bright: DarkGray (8), Red (9), Green (10), Yellow (11), Blue (12), Magenta (13), Cyan (14), White (15) @@ -161,5 +162,3 @@ Git project with Git repository, bug tracker: https://gitlab.com/saalen/ansifilter -sf.net project with SVN repository, download mirror, bug tracker, help forum: -http://sourceforge.net/projects/ansifilter/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/makefile new/ansifilter-2.19/makefile --- old/ansifilter-2.18/makefile 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/makefile 2023-02-27 21:06:43.000000000 +0100 @@ -4,7 +4,7 @@ # Installation directories: # Destination directory for installation (intended for packagers) -DESTDIR = +DESTDIR = # Root directory for final installation PREFIX = /usr @@ -12,15 +12,27 @@ # Location of the binary: bin_dir = ${PREFIX}/bin/ +# Data file directory +data_dir = ${PREFIX}/share/ + # Location of the man page: -man_dir = ${PREFIX}/share/man/man1/ +man_dir = ${data_dir}man/man1/ # Location of the documentation: -doc_dir = ${PREFIX}/share/doc/ansifilter/ +doc_dir = ${data_dir}doc/ansifilter/ # Location of additional gui files -desktop_apps = ${PREFIX}/share/applications/ -desktop_pixmaps = ${PREFIX}/share/pixmaps/ +desktop_apps = ${data_dir}applications/ +desktop_pixmaps = ${data_dir}pixmaps/ + +# Location of bash completions: +bash_comp_dir = ${data_dir}bash-completion/completions/ + +# Location of fish completions: +fish_comp_dir = ${data_dir}fish/vendor_completions.d/ + +# Location of zsh completions: +zsh_comp_dir = ${data_dir}zsh/site-functions/ # Commands: GZIP=gzip -9f @@ -32,7 +44,7 @@ RMDIR=rm -r -f all: - ${MAKE} -C ./src -f ./makefile + ${MAKE} -C ./src -f ./makefile all-gui gui: ${QMAKE} -makefile -o src/qt-gui/Makefile src/qt-gui/ansifilter-gui.pro @@ -46,11 +58,17 @@ @echo "Documentation directory: ${DESTDIR}${doc_dir}" @echo "Manual directory: ${DESTDIR}${man_dir}" @echo "Binary directory: ${DESTDIR}${bin_dir}" + @echo "Bash completions: ${DESTDIR}${bash_comp_dir}" + @echo "Fish completions: ${DESTDIR}${fish_comp_dir}" + @echo "Zsh completions: ${DESTDIR}${zsh_comp_dir}" @echo ${MKDIR} ${DESTDIR}${doc_dir} ${MKDIR} ${DESTDIR}${man_dir} ${MKDIR} ${DESTDIR}${bin_dir} + ${MKDIR} ${DESTDIR}${bash_comp_dir} + ${MKDIR} ${DESTDIR}${fish_comp_dir} + ${MKDIR} ${DESTDIR}${zsh_comp_dir} ${INSTALL_DATA} ./man/ansifilter.1 ${DESTDIR}${man_dir} -${GZIP} ${DESTDIR}${man_dir}ansifilter.1 @@ -58,13 +76,16 @@ ${INSTALL_DATA} ./ChangeLog.adoc ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./COPYING ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./INSTALL ${DESTDIR}${doc_dir} + ${INSTALL_DATA} ./sh-completion/ansifilter.bash ${DESTDIR}${bash_comp_dir}ansifilter + ${INSTALL_DATA} ./sh-completion/ansifilter.fish ${DESTDIR}${fish_comp_dir} + ${INSTALL_DATA} ./sh-completion/ansifilter.zsh ${DESTDIR}${zsh_comp_dir}_ansifilter ${INSTALL_PROGRAM} ./src/ansifilter ${DESTDIR}${bin_dir} @echo @echo "Done." @echo "Type ansifilter --help or man ansifilter for instructions." @echo "Do not hesitate to report problems. Unknown bugs are hard to fix." - + install-gui: ${INSTALL_PROGRAM} ./src/qt-gui/ansifilter-gui ${DESTDIR}${bin_dir} ${MKDIR} ${DESTDIR}${desktop_apps} \ @@ -84,8 +105,11 @@ $(MAKE) -C ./src -f ./makefile clean $(MAKE) -C ./src/tcl -f ./makefile clean -apidocs: - doxygen Doxyfile + +completions: + sh-completion/gen-completions bash >sh-completion/ansifilter.bash + sh-completion/gen-completions fish >sh-completion/ansifilter.fish + sh-completion/gen-completions zsh >sh-completion/ansifilter.zsh help: @echo "This makefile offers the following options:" @@ -93,6 +117,7 @@ @echo "(all) Compile." @echo "all-gui Compile Qt GUI (requires Qt 5.x)" @echo "install* Copy all data files to ${data_dir}." + @echo "completions Generate shell completion files." @echo "clean Remove object files and binary." @echo "uninstall* Remove ansifilter files from system." @echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/man/ansifilter.1 new/ansifilter-2.19/man/ansifilter.1 --- old/ansifilter-2.18/man/ansifilter.1 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/man/ansifilter.1 2023-02-27 21:06:43.000000000 +0100 @@ -1,4 +1,4 @@ -.TH ansifilter 1 "2020-09-28" "Andre Simon" "user documentation" +.TH ansifilter 1 "2023-01-08" "Andre Simon" "user documentation" .SH NAME Ansifilter - ANSI escape code processor and converter @@ -15,87 +15,88 @@ .PP See the README file for details. .SH File options -.IP "-i, --input=<file>" + +.IP "\fB-i\fR, \fB--input\fR=<\fIfile\fR> (default stdin)" Name of input file -.IP "-o, --output=<file>" +.IP "\fB-o\fR, \fB--output\fR=<\fIfile\fR> (default stdout)" Name of output file -.IP "-O, --outdir=<dir>" +.IP "\fB-O\fR, \fB--outdir\fR=<\fIdir\fR>" Name of output directory -.IP "-t, --tail" +.IP "\fB-t\fR, \fB--tail\fR" Continue reading after end-of-file (like tail -f). Use system tail if available. -.IP "-x, --max-size=<size>" -Set maximum input file size (examples: 512M, 1G; default: 256M) +.IP "\fB-x\fR, \fB--max-size\fR=<\fIsize\fR>" +Set maximum input file size (examples: 512M, 1G; default: 256M) .SH Output formats -.IP "-T, --text" +.IP "\fB-T\fR, \fB--text\fR" Output text (default) -.IP "-H, --html" +.IP "\fB-H\fR, \fB--html\fR" Output HTML -.IP "-M, --pango" +.IP "\fB-M\fR, \fB--pango\fR" Output Pango markup -.IP "-L, --latex" +.IP "\fB-L\fR, \fB--latex\fR" Output LaTeX -.IP "-P, --tex" +.IP "\fB-P\fR, \fB--tex\fR" Output Plain TeX -.IP "-R, --rtf" +.IP "\fB-R\fR, \fB--rtf\fR" Output RTF -.IP "-B, --bbcode" +.IP "\fB-B\fR, \fB--bbcode\fR" Output BBCode -.IP "-S, --svg" +.IP "\fB-S\fR, \fB--svg\fR" Output SVG .SH Format options -.IP "-a, --anchors(=self)" +.IP "\fB-a\fR, \fB--anchors\fR(=\fIself\fR)" Add HTML line anchors (opt: self referencing, assumes -l) -.IP "-d, --doc-title" +.IP "\fB-d\fR, \fB--doc-title\fR" Set HTML/LaTeX/SVG document title -.IP "-f, --fragment" +.IP "\fB-f\fR, \fB--fragment\fR" Omit HTML header and footer -.IP "-F, --font=<font>" +.IP "\fB-F\fR, \fB--font\fR=<\fIfont\fR>" Set HTML/RTF/SVG font face -.IP "-k, --ignore-clear(=false)" +.IP "\fB-k\fR, \fB--ignore-clear\fR(=\fIfalse\fR)" Do not adhere to clear (ESC K) commands (default: true) -.IP "-c, --ignore-csi" +.IP "\fB-c\fR, \fB--ignore-csi\fR" Do not adhere to CSI commands (useful for UTF-8 input) -.IP "-l, --line-numbers" +.IP "\fB-l\fR, \fB--line-numbers\fR" Print line numbers in output file -.IP "-m, --map=<path>" +.IP "\fB-m\fR, \fB--map\fR=<\fIpath\fR>" Read color mapping file (see README) -.IP "-r, --style-ref=<rf>" +.IP "\fB-r\fR, \fB--style-ref\fR=<\fIrf\fR>" Set HTML/TeX/LaTeX/SVG stylesheet path -.IP "-s, --font-size=<num?>" +.IP "\fB-s\fR, \fB--font-size\fR=<\fInum\fR>" Set HTML/RTF/SVG font size -.IP "-e, --encoding=<enc>" +.IP "\fB-e\fR, \fB--encoding\fR=<\fIenc\fR>" Set HTML encoding (must match input file encoding); omit encoding information if enc=NONE -.IP "-p, --plain" +.IP "\fB-p\fR, \fB--plain\fR" Ignore ANSI formatting information -.IP "-w, --wrap=<len>" +.IP "\fB-w\fR, \fB--wrap\fR=<\fIlen\fR>" Wrap long lines -.IP "--no-trailing-nl" +.IP "\fB--no-trailing-nl\fR" Omit trailing newline -.IP "--no-version-info" +.IP "\fB--no-version-info\fR" Omit version info comment -.IP "--wrap-no-numbers" +.IP "\fB--wrap-no-numbers\fR" Omit line numbers of wrapped lines (assumes -l) -.IP "--derived-styles" +.IP "\fB--derived-styles\fR" Output dynamic stylesheets (HTML/SVG) .SH ASCII art options -.IP "--art-cp437" +.IP "\fB--art-cp437\fR" Parse codepage 437 ASCII art (HTML and RTF output) -.IP "--art-bin" +.IP "\fB--art-bin\fR" Parse BIN/XBIN ASCII art (HTML output, no stdin) -.IP "--art-tundra" +.IP "\fB--art-tundra\fR" Parse Tundra ANSI art (HTML output, no stdin) -.IP "--art-width" +.IP "\fB--art-width\fR" Set ASCII art width (default 80) -.IP "--art-height" +.IP "\fB--art-height\fR" Set ASCII art height (default 150) .SH "OTHER OPTIONS" -.IP "-h, --help" +.IP "\fB-h\fR, \fB--help\fR" print help -.IP "-v, --version" +.IP "\fB-v\fR, \fB--version\fR" print version and license info .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/sh-completion/ansifilter.bash new/ansifilter-2.19/sh-completion/ansifilter.bash --- old/ansifilter-2.18/sh-completion/ansifilter.bash 1970-01-01 01:00:00.000000000 +0100 +++ new/ansifilter-2.19/sh-completion/ansifilter.bash 2023-02-27 21:06:43.000000000 +0100 @@ -0,0 +1,85 @@ +_ansifilter() { + local IFS=$' \t\n' + local args cur prev cmd opts arg + args=("${COMP_WORDS[@]}") + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts="-i --input -o --output -O --outdir -x --max-size -t --tail -T --text -H --html -M --pango -L --latex -P --tex -R --rtf -S --svg -B --bbcode -a --anchors -d --doc-title -e --encoding -f --fragment -F --font -k --ignore-clear -c --ignore-csi -l --line-numbers -m --map -r --style-ref -s --font-size -p --plain -w --wrap --no-trailing-nl --no-version-info --wrap-no-numbers --derived-styles --art-cp437 --art-bin --art-tundra --art-width --art-height --height --width -v --version -h --help" + + case "$prev" in + -i|--input) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -o|--output) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -O|--outdir) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -x|--max-size) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -a|--anchors) + COMPREPLY=($(compgen -W "self" -- "$cur")) + return 0 + ;; + -d|--doc-title) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -e|--encoding) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -F|--font) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -k|--ignore-clear) + COMPREPLY=($(compgen -W "0 1" -- "$cur")) + return 0 + ;; + -m|--map) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -r|--style-ref) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -s|--font-size) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + -w|--wrap) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + --art-width) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + --art-height) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + --height) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + --width) + COMPREPLY=($(compgen -f -- "$cur")) + return 0 + ;; + esac + + if [[ "$cur" = -* ]]; then + COMPREPLY=($(compgen -W "$opts" -- "$cur")) + fi +} + +complete -F _ansifilter -o bashdefault -o default ansifilter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/sh-completion/ansifilter.fish new/ansifilter-2.19/sh-completion/ansifilter.fish --- old/ansifilter-2.18/sh-completion/ansifilter.fish 1970-01-01 01:00:00.000000000 +0100 +++ new/ansifilter-2.19/sh-completion/ansifilter.fish 2023-02-27 21:06:43.000000000 +0100 @@ -0,0 +1,40 @@ + +complete -c ansifilter -s i -l input -r -d 'Name of input file' +complete -c ansifilter -s o -l output -r -d 'Name of output file' +complete -c ansifilter -s O -l outdir -r -d 'Name of output directory' +complete -c ansifilter -s x -l max-size -r -d 'Set maximum input file size (default: 256M)' +complete -c ansifilter -s t -l tail -d 'Continue reading after end-of-file (like tail -f)' +complete -c ansifilter -s T -l text -d 'Output text' +complete -c ansifilter -s H -l html -d 'Output HTML' +complete -c ansifilter -s M -l pango -d 'Output Pango Markup' +complete -c ansifilter -s L -l latex -d 'Output LaTeX' +complete -c ansifilter -s P -l tex -d 'Output Plain TeX' +complete -c ansifilter -s R -l rtf -d 'Output RTF' +complete -c ansifilter -s S -l svg -d 'Output SVG' +complete -c ansifilter -s B -l bbcode -d 'Output BBCODE' +complete -c ansifilter -s a -l anchors -xa 'self' -d 'Add HTML line anchors (opt: self referencing, assumes -l)' +complete -c ansifilter -s d -l doc-title -r -d 'Set HTML/LaTeX/SVG document title' +complete -c ansifilter -s e -l encoding -r -d 'Set HTML/RTF encoding or omit if NONE' +complete -c ansifilter -s f -l fragment -d 'Omit HTML header and footer' +complete -c ansifilter -s F -l font -r -d 'Set HTML/RTF/SVG font face' +complete -c ansifilter -s k -l ignore-clear -xa '0 1' -d 'Do not adhere to clear (ESC K) commands (default: true' +complete -c ansifilter -s c -l ignore-csi -d 'Do not adhere to CSI commands' +complete -c ansifilter -s l -l line-numbers -d 'Print line numbers in output file' +complete -c ansifilter -s m -l map -r -d 'Read color mapping file' +complete -c ansifilter -s r -l style-ref -r -d 'Set HTML/TeX/LaTeX/SVG stylesheet path' +complete -c ansifilter -s s -l font-size -r -d 'Set HTML/RTF/SVG font size' +complete -c ansifilter -s p -l plain -d 'Ignore ANSI formatting information' +complete -c ansifilter -s w -l wrap -r -d 'Wrap long lines' +complete -c ansifilter -l no-trailing-nl -d 'Omit trailing newline' +complete -c ansifilter -l no-version-info -d 'Omit version info comment' +complete -c ansifilter -l wrap-no-numbers -d 'Omit line numbers of wrapped lines' +complete -c ansifilter -l derived-styles -d 'Output dynamic stylesheets (HTML/SVG)' +complete -c ansifilter -l art-cp437 -d 'Parse codepage 437 ANSI art' +complete -c ansifilter -l art-bin -d 'Parse BIN/XBIN ANSI art' +complete -c ansifilter -l art-tundra -d 'Parse Tundra ANSI art' +complete -c ansifilter -l art-width -r -d 'Set ANSI art width' +complete -c ansifilter -l art-height -r -d 'Set ANSI art height' +complete -c ansifilter -l height -r -d 'set SVG image height' +complete -c ansifilter -l width -r -d 'set SVG image width' +complete -c ansifilter -s v -l version -d 'Print version and license info' +complete -c ansifilter -s h -l help -d 'Print help' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/sh-completion/ansifilter.zsh new/ansifilter-2.19/sh-completion/ansifilter.zsh --- old/ansifilter-2.18/sh-completion/ansifilter.zsh 1970-01-01 01:00:00.000000000 +0100 +++ new/ansifilter-2.19/sh-completion/ansifilter.zsh 2023-02-27 21:06:43.000000000 +0100 @@ -0,0 +1,53 @@ +#compdef ansifilter + +_ansifilter() { + local -a options=( + {-i,--input}"[Name of input file]: :_files" + {-o,--output}"[Name of output file]: :_files" + {-O,--outdir}"[Name of output directory]: :_files" + {-x,--max-size}"[Set maximum input file size (default\: 256M)]: :_files" + {-t,--tail}"[Continue reading after end-of-file (like tail -f)]" + {-T,--text}"[Output text]" + {-H,--html}"[Output HTML]" + {-M,--pango}"[Output Pango Markup]" + {-L,--latex}"[Output LaTeX]" + {-P,--tex}"[Output Plain TeX]" + {-R,--rtf}"[Output RTF]" + {-S,--svg}"[Output SVG]" + {-B,--bbcode}"[Output BBCODE]" + {-a,--anchors}"[Add HTML line anchors (opt\: self referencing, assumes -l)]: :(self)" + {-d,--doc-title}"[Set HTML/LaTeX/SVG document title]: :_files" + {-e,--encoding}"[Set HTML/RTF encoding or omit if NONE]: :_files" + {-f,--fragment}"[Omit HTML header and footer]" + {-F,--font}"[Set HTML/RTF/SVG font face]: :_files" + {-k,--ignore-clear}"[Do not adhere to clear (ESC K) commands (default\: true]: :(0 1)" + {-c,--ignore-csi}"[Do not adhere to CSI commands]" + {-l,--line-numbers}"[Print line numbers in output file]" + {-m,--map}"[Read color mapping file]: :_files" + {-r,--style-ref}"[Set HTML/TeX/LaTeX/SVG stylesheet path]: :_files" + {-s,--font-size}"[Set HTML/RTF/SVG font size]: :_files" + {-p,--plain}"[Ignore ANSI formatting information]" + {-w,--wrap}"[Wrap long lines]: :_files" + "--no-trailing-nl[Omit trailing newline]" + "--no-version-info[Omit version info comment]" + "--wrap-no-numbers[Omit line numbers of wrapped lines]" + "--derived-styles[Output dynamic stylesheets (HTML/SVG)]" + "--art-cp437[Parse codepage 437 ANSI art]" + "--art-bin[Parse BIN/XBIN ANSI art]" + "--art-tundra[Parse Tundra ANSI art]" + "--art-width[Set ANSI art width]: :_files" + "--art-height[Set ANSI art height]: :_files" + "--height[set SVG image height]: :_files" + "--width[set SVG image width]: :_files" + {-v,--version}"[Print version and license info]" + {-h,--help}"[Print help]" + ) + _arguments -s -S \ + $options \ + "*: :_files" \ + && return 0 + + return 1 +} + +_ansifilter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/sh-completion/gen-completions new/ansifilter-2.19/sh-completion/gen-completions --- old/ansifilter-2.18/sh-completion/gen-completions 1970-01-01 01:00:00.000000000 +0100 +++ new/ansifilter-2.19/sh-completion/gen-completions 2023-02-27 21:06:43.000000000 +0100 @@ -0,0 +1,136 @@ +#!/usr/bin/env lua + +local argparse = require "argparse" + +local parser = argparse "ansifilter" + :add_help(false) + +parser:argument "file" + :args "*" + +parser:option "-i --input" + :description "Name of input file" + +parser:option "-o --output" + :description "Name of output file" + +parser:option "-O --outdir" + :description "Name of output directory" + +parser:option "-x --max-size" + :description "Set maximum input file size (default: 256M)" + +parser:flag "-t --tail" + :description "Continue reading after end-of-file (like tail -f)" + +parser:flag "-T --text" + :description "Output text" + +parser:flag "-H --html" + :description "Output HTML" + +parser:flag "-M --pango" + :description "Output Pango Markup" + +parser:flag "-L --latex" + :description "Output LaTeX" + +parser:flag "-P --tex" + :description "Output Plain TeX" + +parser:flag "-R --rtf" + :description "Output RTF" + +parser:flag "-S --svg" + :description "Output SVG" + +parser:flag "-B --bbcode" + :description "Output BBCODE" + +parser:option "-a --anchors" + :description "Add HTML line anchors (opt: self referencing, assumes -l)" + :args "?" + :choices {"self"} + +parser:option "-d --doc-title" + :description "Set HTML/LaTeX/SVG document title" + +parser:option "-e --encoding" + :description "Set HTML/RTF encoding or omit if NONE" + +parser:flag "-f --fragment" + :description "Omit HTML header and footer" + +parser:option "-F --font" + :description "Set HTML/RTF/SVG font face" + +parser:option "-k --ignore-clear" + :description "Do not adhere to clear (ESC K) commands (default: true" + :choices {"0", "1"} + +parser:flag "-c --ignore-csi" + :description "Do not adhere to CSI commands" + +parser:flag "-l --line-numbers" + :description "Print line numbers in output file" + +parser:option "-m --map" + :description "Read color mapping file" + +parser:option "-r --style-ref" + :description "Set HTML/TeX/LaTeX/SVG stylesheet path" + +parser:option "-s --font-size" + :description "Set HTML/RTF/SVG font size" + +parser:flag "-p --plain" + :description "Ignore ANSI formatting information" + +parser:option "-w --wrap" + :description "Wrap long lines" + +parser:flag "--no-trailing-nl" + :description "Omit trailing newline" +parser:flag "--no-version-info" + :description "Omit version info comment" +parser:flag "--wrap-no-numbers" + :description "Omit line numbers of wrapped lines" +parser:flag "--derived-styles" + :description "Output dynamic stylesheets (HTML/SVG)" + +parser:flag "--art-cp437" + :description "Parse codepage 437 ANSI art" +parser:flag "--art-bin" + :description "Parse BIN/XBIN ANSI art" +parser:flag "--art-tundra" + :description "Parse Tundra ANSI art" +parser:option "--art-width" + :description "Set ANSI art width" +parser:option "--art-height" + :description "Set ANSI art height" + +parser:option "--height" + :description "set SVG image height" + +parser:option "--width" + :description "set SVG image width" + +parser:flag "-v --version" + :description "Print version and license info" + +parser:flag "-h --help" + :description "Print help" + +local p = argparse "gen-completions" +p:argument "shell" + :choices {"bash", "zsh", "fish"} + +local shell = p:parse().shell + +if shell == "bash" then + io.write(parser:get_bash_complete()) +elseif shell == "zsh" then + io.write(parser:get_zsh_complete()) +else + io.write(parser:get_fish_complete()) +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/bbcodegenerator.cpp new/ansifilter-2.19/src/bbcodegenerator.cpp --- old/ansifilter-2.18/src/bbcodegenerator.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/bbcodegenerator.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ bbcodegenerator.cpp - description ------------------- - copyright : (C) 2011 by Andre Simon + copyright : (C) 2011-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/bbcodegenerator.h new/ansifilter-2.19/src/bbcodegenerator.h --- old/ansifilter-2.18/src/bbcodegenerator.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/bbcodegenerator.h 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ bbcdegenerator.h - description ------------------- - copyright : (C) 2011 by Andre Simon + copyright : (C) 2011-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/codegenerator.cpp new/ansifilter-2.19/src/codegenerator.cpp --- old/ansifilter-2.18/src/codegenerator.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/codegenerator.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -1,7 +1,7 @@ /*************************************************************************** codegenerator.cpp - description ------------------- - copyright : (C) 2007-2021 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/codegenerator.h new/ansifilter-2.19/src/codegenerator.h --- old/ansifilter-2.18/src/codegenerator.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/codegenerator.h 2023-02-27 21:06:43.000000000 +0100 @@ -1,7 +1,7 @@ /*************************************************************************** codegenerator.h - description ------------------- - copyright : (C) 2007-2021 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/htmlgenerator.cpp new/ansifilter-2.19/src/htmlgenerator.cpp --- old/ansifilter-2.18/src/htmlgenerator.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/htmlgenerator.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ htmlgenerator.cpp - description ------------------- - copyright : (C) 2007-2018 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/htmlgenerator.h new/ansifilter-2.19/src/htmlgenerator.h --- old/ansifilter-2.18/src/htmlgenerator.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/htmlgenerator.h 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ htmlgenerator.h - description ------------------- - copyright : (C) 2007 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/main.cpp new/ansifilter-2.19/src/main.cpp --- old/ansifilter-2.18/src/main.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/main.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ main.cpp - description ------------------- - copyright : (C) 2007-2021 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org Highlight is a universal source code to HTML converter. Syntax highlighting @@ -39,7 +39,7 @@ { cout << "\n ansifilter version " << Info::getVersion() - << "\n Copyright (C) 2007-2021 Andre Simon <a dot simon at mailbox.org>" + << "\n Copyright (C) 2007-2023 Andre Simon <a dot simon at mailbox.org>" << "\n\n Argparser class" << "\n Copyright (C) 2006-2008 Antonio Diaz Diaz <ant_diaz at teleline.es>" << "\n\n This software is released under the terms of the GNU General " @@ -53,8 +53,8 @@ cout << "Invocation: ansifilter [OPTION]... [FILE]...\n\n"; cout << "ansifilter handles text files containing ANSI terminal escape codes.\n"; cout << "\nFile handling:\n"; - cout << " -i, --input=<file> Name of input file\n"; - cout << " -o, --output=<file> Name of output file\n"; + cout << " -i, --input=<file> Name of input file (default stdin)\n"; + cout << " -o, --output=<file> Name of output file (default stdout)\n"; cout << " -O, --outdir=<dir> Name of output directory\n"; cout << " -t, --tail Continue reading after end-of-file (like tail -f)\n"; cout << " -x, --max-size=<size> Set maximum input file size\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/plaintextgenerator.cpp new/ansifilter-2.19/src/plaintextgenerator.cpp --- old/ansifilter-2.18/src/plaintextgenerator.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/plaintextgenerator.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ htmlgenerator.cpp - description ------------------- - copyright : (C) 2007 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/plaintextgenerator.h new/ansifilter-2.19/src/plaintextgenerator.h --- old/ansifilter-2.18/src/plaintextgenerator.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/plaintextgenerator.h 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ htmlgenerator.h - description ------------------- - copyright : (C) 2007 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/qt-gui/moc_mydialog.cpp new/ansifilter-2.19/src/qt-gui/moc_mydialog.cpp --- old/ansifilter-2.18/src/qt-gui/moc_mydialog.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/qt-gui/moc_mydialog.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -1,7 +1,7 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mydialog.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.2) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.3) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ @@ -13,7 +13,7 @@ #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'mydialog.h' doesn't include <QObject>." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.2. It" +#error "This file was generated using the moc from 5.15.3. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -132,7 +132,7 @@ { if (_c == QMetaObject::InvokeMetaMethod) { auto *_t = static_cast<MyDialog *>(_o); - Q_UNUSED(_t) + (void)_t; switch (_id) { case 0: _t->on_pbSaveAs_clicked(); break; case 1: _t->on_pbFileOpen_clicked(); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/qt-gui/ui_ansifilter.h new/ansifilter-2.19/src/qt-gui/ui_ansifilter.h --- old/ansifilter-2.18/src/qt-gui/ui_ansifilter.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/qt-gui/ui_ansifilter.h 2023-02-27 21:06:43.000000000 +0100 @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'ansifilter.ui' ** -** Created by: Qt User Interface Compiler version 5.15.2 +** Created by: Qt User Interface Compiler version 5.15.3 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/rtfgenerator.cpp new/ansifilter-2.19/src/rtfgenerator.cpp --- old/ansifilter-2.18/src/rtfgenerator.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/rtfgenerator.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -1,7 +1,7 @@ /*************************************************************************** rtfcode.cpp - description ------------------- - copyright : (C) 2007-2017 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/rtfgenerator.h new/ansifilter-2.19/src/rtfgenerator.h --- old/ansifilter-2.18/src/rtfgenerator.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/rtfgenerator.h 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ rtfcode.h - description ------------------- - copyright : (C) 2007 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/svggenerator.cpp new/ansifilter-2.19/src/svggenerator.cpp --- old/ansifilter-2.18/src/svggenerator.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/svggenerator.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ svggenerator.cpp - description ------------------- begin : Mo 01.04.2019 - copyright : (C) 2019 by Andre Simon + copyright : (C) 2019-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ @@ -56,26 +56,26 @@ if (applyDynStyles){ attrName = "class"; - + ostringstream fgColStream; if (elementStyle.isFgColorSet()) { fgColStream << elementStyle.getFgColour().getRed(HTML) << elementStyle.getFgColour().getGreen(HTML) << elementStyle.getFgColour().getBlue(HTML); } - + ostringstream bgColStream; if (elementStyle.isBgColorSet()) { bgColStream << elementStyle.getBgColour().getRed(HTML) << elementStyle.getBgColour().getGreen(HTML) << elementStyle.getBgColour().getBlue(HTML); - } - - StyleInfo sInfo( fgColStream.str(), bgColStream.str(), - elementStyle.isBold(), elementStyle.isItalic(), elementStyle.isConceal(), + } + + StyleInfo sInfo( fgColStream.str(), bgColStream.str(), + elementStyle.isBold(), elementStyle.isItalic(), elementStyle.isConceal(), elementStyle.isBlink(), elementStyle.isUnderline() ); - + std::vector<StyleInfo>::iterator fit = std::find(documentStyles.begin(), documentStyles.end(), sInfo ); if (fit == documentStyles.end()){ documentStyles.push_back(sInfo); @@ -83,9 +83,9 @@ } else { fmtStream << "af_"<< 1+(int)std::distance(documentStyles.begin(), fit); } - + } else { - + if (elementStyle.isBold()) { fmtStream<< "font-weight:bold;"; } @@ -118,7 +118,7 @@ <<";"; }*/ } - + string fmt = fmtStream.str(); tagIsOpen = fmt.size()>0; @@ -139,7 +139,7 @@ string SVGGenerator::getGeneratorComment() { - ostringstream s; + ostringstream s; s << "<!--SVG generated by ansifilter " << ANSIFILTER_VERSION << ", " << ANSIFILTER_URL <<"-->\n"; @@ -167,19 +167,19 @@ if ( height.size() ) header << " height=\""<<height<<"\""; header << ">\n<desc>" << docTitle << "</desc>\n"; - + if ( styleSheetPath.empty() ) { header << "<defs><style type=\"text/css\">\n" << "<![CDATA[\n"; - + header << "rect { fill:#ffffff; } \n"; header << "g { font-size: " << fontSize; header << "; font-family: " << font << "; white-space: pre; }\n"; - + header << "]]>\n" << "</style></defs>"; } - + return header.str(); } @@ -188,7 +188,7 @@ *out << "<g>\n<rect x=\"0\" y=\"0\" width=\"100%\" height=\"100%\"/>"; // rect: background color int fontSizeSVG=10; StringTools::str2num<int>(fontSizeSVG, fontSize, std::dec); - + *out << "\n<text x=\"10\" y=\""<<fontSizeSVG*2<<"\">"; processInput(); *out << "</text>\n</g>\n"; @@ -199,7 +199,7 @@ { ostringstream os; os <<"</svg>\n"; - + if (true) { os << "<!-- SVG generated by ansifilter " << ANSIFILTER_VERSION @@ -242,7 +242,7 @@ if ( showLineNumbers ) { ostringstream lnum; lnum << setw ( 5 ) << right; - + if ( numberCurrentLine ) { lnum << lineNumber; *out<< "</text>\n<text x=\"10\" y=\""<< ( lineNumber*fontSizeSVG*2 ) <<"\">"; @@ -263,21 +263,21 @@ //do not overwrite std::ifstream infile(outPath.c_str()); if (infile.good()) return true; - + ofstream indexfile ( outPath.c_str() ); if ( !indexfile.fail() ) { indexfile << "/* CSS generated by ansifilter - styles derived from document formatting\n Ansifilter will not overwrite this file\n*/\n"; - - - indexfile << "rect { fill:#ffffff; }\n"; + + + indexfile << "rect { fill:#ffffff; }\n"; indexfile << "g { font-size: " << fontSize; indexfile << "; font-family: " << font << "; white-space: pre; }\n"; - + for (unsigned int i=0; i<documentStyles.size();i++){ StyleInfo sInfo = documentStyles[i]; indexfile << "tspan.af_" << (i+1) <<" {"; - + if (sInfo.isBold) { indexfile<< "font-weight:bold;"; } @@ -305,10 +305,10 @@ << sInfo.bgColor << ";"; }*/ - + indexfile << "}\n"; } - + } else { return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/svggenerator.h new/ansifilter-2.19/src/svggenerator.h --- old/ansifilter-2.18/src/svggenerator.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/svggenerator.h 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ SVGGenerator.h - description ------------------- begin : Mo 23.06.2008 - copyright : (C) 2019 by Andre Simon + copyright : (C) 2019-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ @@ -58,7 +58,7 @@ string getGeneratorComment(); void insertLineNumber (); - + bool printDynamicStyleFile ( const string &outPath ); @@ -78,7 +78,7 @@ /** \return escaped character*/ virtual string maskCharacter(unsigned char ); - + }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/texgenerator.cpp new/ansifilter-2.19/src/texgenerator.cpp --- old/ansifilter-2.18/src/texgenerator.cpp 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/texgenerator.cpp 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ texgenerator.cpp - description ------------------- - copyright : (C) 2008-2015 by Andre Simon + copyright : (C) 2008-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ @@ -63,7 +63,7 @@ << elementStyle.getFgColour().getBlue(TEX) << " 0}"; - return "{" + fmtStream.str(); + return "{" + fmtStream.str(); } string TeXGenerator::getCloseTag() @@ -98,10 +98,10 @@ { string footer; footer = "\n}\n\\bye\n"; - + if (!omitVersionInfo) footer += getGeneratorComment(); - + return footer; } @@ -242,7 +242,7 @@ ostringstream lnum; lnum << setw ( 5 ) << right; if( numberCurrentLine ) { - if (lineNumber>1) + if (lineNumber>1) *out << getCloseTag(); lnum << lineNumber; *out <<"{\\textColor{1 1 1 0} "<<lnum.str()<<spacer<<"}"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/texgenerator.h new/ansifilter-2.19/src/texgenerator.h --- old/ansifilter-2.18/src/texgenerator.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/texgenerator.h 2023-02-27 21:06:43.000000000 +0100 @@ -2,7 +2,7 @@ texgenerator.h - description ------------------- - copyright : (C) 2008 by Andre Simon + copyright : (C) 2008-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansifilter-2.18/src/version.h new/ansifilter-2.19/src/version.h --- old/ansifilter-2.18/src/version.h 2021-01-30 17:20:06.000000000 +0100 +++ new/ansifilter-2.19/src/version.h 2023-02-27 21:06:43.000000000 +0100 @@ -1,7 +1,7 @@ /*************************************************************************** version.h - description ------------------- - copyright : (C) 2007-2020 by Andre Simon + copyright : (C) 2007-2023 by Andre Simon email : a.si...@mailbox.org ***************************************************************************/ @@ -27,7 +27,7 @@ #include <string> -#define ANSIFILTER_VERSION "2.18" +#define ANSIFILTER_VERSION "2.19" #define ANSIFILTER_URL "http://www.andre-simon.de/" #define ANSIFILTER_EMAIL "a.si...@mailbox.org" ++++++ ansifilter.keyring ++++++ --- /var/tmp/diff_new_pack.SYtNw3/_old 2023-03-16 22:57:47.275296906 +0100 +++ /var/tmp/diff_new_pack.SYtNw3/_new 2023-03-16 22:57:47.275296906 +0100 @@ -34,19 +34,26 @@ aHZ9WRMOfO0n9XSsevnoxLBp5elmGQL+KgdcnI22UBm3Oe1KNzCPnyxA9fU8YqWm 080RgjFui8EtoXQBvNF1N+YPfFta8BkPSj8oGQWVTieMAwyDIrnVCqswMU2A/wqc 7Lk4feL6rZwa2IXqqKXLaVKgQZJoorEvxlX8FXoYy0ppDcVss7Hk4himeXzk3u8l -RYClQBgYqix31j1XuQENBE6UkgwBCAChsuJeb09Li7BhOp3ZCqDEDjLnxF3RW+zm -w2KxctlqaADrgnz2eBjiAG2N49mJ4sJA9kD3nEPy1PoQf+eHsEUxfE2VOnE1e1IP -FknLJv9cJF5AjvqBhkvZZ9KHJmI0tDPUcVNR9UUs6iyJjTfmJD8vaH6Kz5LCFQL8 -i50WKVrylN4hULfjtRN2dsTMwxfVkEKdohw3Pw2nmbZ3X8MwDB4EsZjvTA36kGKM -tQluZsyDkUUooTpInQr9JGGWDP7hQoxYnJElFY/0lTiyS+mNpKl/i3ZaPIzEpG+q -xRvlbugnIWyJwPTPUUtFWfuYepy5/Pu22EmpuKmlLbZ5wjZKAznrABEBAAGJASUE -GAECAA8FAk6UkgwCGwwFCQHhM4AACgkQUP4CedgFp8d3bgf/fviBp5sDt2cNn+00 -s0D5hsBan2LnkLQnh0SXifG46p2tman92ZTURIKb7x982G6xQhCTqbEyijfIDGpP -CNRJywdVAaMj4eaxIoQ503p4ubMZC+ebMqxrj2SaW0ZJDk1Fb8PrGGADWZy73XVR -XVHVA+uKkfEzPGhfqIOBYOe5x4UBDpMCUUIK3lLOvCXtkJlAcO4m8MgZ7WbRQ+T8 -FVSf8TyhiA/tCRyWki6Xfq2cOSOQIp0AAdKAAzgEflMePLg2zhS1Xb+yjJJvsyBk -7BdY9xteKfVOeU9f1x5ziFfF8m2iLzhpjQY18v00xKIh/vtLG8gok/Ir4ECVm8Rh -eMPu8w== -=7sSW +RYClQBgYqix31j1XiQFVBBMBCAA/AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX +gBYhBLjFVXQYf0kYDtx2N1D+AnnYBafHBQJj58AjBQkXNGGXAAoJEFD+AnnYBafH +LHwH/iiRQELIaypTCLp84dlLqhlXpZn69uNzz5RYvdlyZ/gB3TeqW5lF6yUIayVc +FVhAF34J1rmRBoSIO4fdVtPiWRSHK1ArCl5dAHvoi/83KhXJmud6R2pNAsXo+6bB +JOJS4XI9gEIq/5KZDl0VixkOgDohEwooTLTeb5iSGlqp+DaN49YDEaNbTuM6h2WF +NIQRfbCdh9Gw3VU7q/+5EXSc+IN8EyCYg/cnHFjmZTkcFeesKeY3+iGGzsa3jcYG +TClObWLZm9bWCKJG2TtxBzcjvrViVFeIonycKqVn5+k3yoT9sgqVtTGCL6i+5MIE +XZcm8uunn3R+77JsDnml7q0L29+5AQ0ETpSSDAEIAKGy4l5vT0uLsGE6ndkKoMQO +MufEXdFb7ObDYrFy2WpoAOuCfPZ4GOIAbY3j2YniwkD2QPecQ/LU+hB/54ewRTF8 +TZU6cTV7Ug8WScsm/1wkXkCO+oGGS9ln0ocmYjS0M9RxU1H1RSzqLImNN+YkPy9o +forPksIVAvyLnRYpWvKU3iFQt+O1E3Z2xMzDF9WQQp2iHDc/DaeZtndfwzAMHgSx +mO9MDfqQYoy1CW5mzIORRSihOkidCv0kYZYM/uFCjFickSUVj/SVOLJL6Y2kqX+L +dlo8jMSkb6rFG+Vu6CchbInA9M9RS0VZ+5h6nLn8+7bYSam4qaUttnnCNkoDOesA +EQEAAYkBJQQYAQIADwUCTpSSDAIbDAUJAeEzgAAKCRBQ/gJ52AWnx3duB/9++IGn +mwO3Zw2f7TSzQPmGwFqfYueQtCeHRJeJ8bjqna2Zqf3ZlNREgpvvH3zYbrFCEJOp +sTKKN8gMak8I1EnLB1UBoyPh5rEihDnTeni5sxkL55syrGuPZJpbRkkOTUVvw+sY +YANZnLvddVFdUdUD64qR8TM8aF+og4Fg57nHhQEOkwJRQgreUs68Je2QmUBw7ibw +yBntZtFD5PwVVJ/xPKGID+0JHJaSLpd+rZw5I5AinQAB0oADOAR+Ux48uDbOFLVd +v7KMkm+zIGTsF1j3G14p9U55T1/XHnOIV8XybaIvOGmNBjXy/TTEoiH++0sbyCiT +8ivgQJWbxGF4w+7z +=Nc7N -----END PGP PUBLIC KEY BLOCK-----