obnox/wiki2beamer.git
12 years agofix: one small typo fix and one clarification
Valentin Haenel [Fri, 10 Jun 2011 20:02:05 +0000 (22:02 +0200)]
fix: one small typo fix and one clarification

Reported-by: Chris Mayfield <csmayfield@gmail.com>
Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de>
13 years agoadd clone url to website, people were asking about it
Valentin Haenel [Thu, 26 May 2011 17:32:16 +0000 (19:32 +0200)]
add clone url to website, people were asking about it

13 years agoopened changelog for next release
Kai Dietrich [Sun, 15 May 2011 18:47:53 +0000 (20:47 +0200)]
opened changelog for next release

13 years agoMerge branch 'feature-option-o'
Kai Dietrich [Sun, 15 May 2011 18:45:38 +0000 (20:45 +0200)]
Merge branch 'feature-option-o'

13 years agofix: usage string syntax improved
Kai Dietrich [Sun, 15 May 2011 18:40:58 +0000 (20:40 +0200)]
fix: usage string syntax improved

13 years agoadd: document -o in manpage
Kai Dietrich [Sun, 15 May 2011 18:38:25 +0000 (20:38 +0200)]
add: document -o in manpage

13 years agoadd: help message for -o
Kai Dietrich [Sun, 15 May 2011 18:32:02 +0000 (20:32 +0200)]
add: help message for -o

13 years agoadd: -o/--output for writing output to a file
Kai Dietrich [Sun, 15 May 2011 18:26:09 +0000 (20:26 +0200)]
add: -o/--output for writing output to a file

13 years agoMerge branch 'master' of ssh://wiki2beamer.git.sourceforge.net/gitroot/wiki2beamer...
Kai Dietrich [Tue, 10 May 2011 03:10:39 +0000 (05:10 +0200)]
Merge branch 'master' of ssh://wiki2beamer.git.sourceforge.net/gitroot/wiki2beamer/wiki2beamer

13 years agoimprove performance of make_sorted
Kai Dietrich [Tue, 10 May 2011 03:09:32 +0000 (05:09 +0200)]
improve performance of make_sorted

13 years agotypo
Valentin Haenel [Mon, 9 May 2011 09:28:31 +0000 (11:28 +0200)]
typo

13 years agoMerge branch 'prepare-release-0.9.4'
Kai Dietrich [Mon, 9 May 2011 05:36:53 +0000 (07:36 +0200)]
Merge branch 'prepare-release-0.9.4'

13 years agoupdated version numbers
Kai Dietrich [Mon, 9 May 2011 05:15:27 +0000 (07:15 +0200)]
updated version numbers

13 years agoupdated changelog
Kai Dietrich [Sun, 8 May 2011 19:12:16 +0000 (21:12 +0200)]
updated changelog

13 years agofix: sentence in example
Kai Dietrich [Sun, 8 May 2011 19:01:01 +0000 (21:01 +0200)]
fix: sentence in example

13 years agofix: >>>include<<< stoped working after [code] section
Kai Dietrich [Sun, 8 May 2011 18:56:17 +0000 (20:56 +0200)]
fix: >>>include<<< stoped working after [code] section

13 years agotest: discover bug where >>>include<<< doesn't work right after [code]
Kai Dietrich [Sun, 8 May 2011 18:49:34 +0000 (20:49 +0200)]
test: discover bug where >>>include<<< doesn't work right after [code]

13 years agoupdated some meta files
Kai Dietrich [Sun, 8 May 2011 18:49:11 +0000 (20:49 +0200)]
updated some meta files

13 years agoreplaced sorted built-in with portable hand-built function
Kai Dietrich [Sun, 8 May 2011 17:45:05 +0000 (19:45 +0200)]
replaced sorted built-in with portable hand-built function

13 years agoreplaced list(set()) by a real make_unique method (2.3 has no set)
Kai Dietrich [Sun, 8 May 2011 17:37:40 +0000 (19:37 +0200)]
replaced list(set()) by a real make_unique method (2.3 has no set)

13 years agoMerge branch 'python3k-compat'
Kai Dietrich [Sun, 8 May 2011 16:54:22 +0000 (18:54 +0200)]
Merge branch 'python3k-compat'

13 years ago2to3 and some minor tweaks (\u has to be escaped to \\u)
Kai Dietrich [Sun, 8 May 2011 16:50:51 +0000 (18:50 +0200)]
2to3 and some minor tweaks (\u has to be escaped to \\u)

13 years agoremoving unimportant and problematic version print
Kai Dietrich [Sun, 8 May 2011 16:47:40 +0000 (18:47 +0200)]
removing unimportant and problematic version print

13 years agomissing simple 2to3 refactorings
Kai Dietrich [Sun, 8 May 2011 16:43:48 +0000 (18:43 +0200)]
missing simple 2to3 refactorings

13 years agoadded print wrapper which should work everywhere
Kai Dietrich [Sun, 8 May 2011 16:28:02 +0000 (18:28 +0200)]
added print wrapper which should work everywhere

13 years agopy3k print syntax adopted
Kai Dietrich [Sun, 8 May 2011 16:16:53 +0000 (18:16 +0200)]
py3k print syntax adopted

13 years agoreplace xrange for range because 3k has no xrange anymore
Kai Dietrich [Sun, 8 May 2011 16:08:14 +0000 (18:08 +0200)]
replace xrange for range because 3k has no xrange anymore

13 years agoreimplement hex->alpha conversion by hand for 2.4/3k compat
Kai Dietrich [Sun, 8 May 2011 16:04:46 +0000 (18:04 +0200)]
reimplement hex->alpha conversion by hand for 2.4/3k compat

13 years agoremove 2.4/3k incompatible except syntax
Kai Dietrich [Sun, 8 May 2011 15:45:23 +0000 (17:45 +0200)]
remove 2.4/3k incompatible except syntax

Python 3k requires 'except Exception as e:' while 2.4 requires
'except Exception, e:'
I have no idea how to write something that works on both and still
transports the error to the user, other then just letting the exception
pass through to the runtime.

13 years agoMerge branch 'prepare-release-0.9.3'
Kai Dietrich [Fri, 6 May 2011 18:45:01 +0000 (20:45 +0200)]
Merge branch 'prepare-release-0.9.3'

13 years agoversion number in distutils setup.py
Kai Dietrich [Fri, 6 May 2011 18:37:28 +0000 (20:37 +0200)]
version number in distutils setup.py

13 years agoversion number in README
Kai Dietrich [Fri, 6 May 2011 18:36:27 +0000 (20:36 +0200)]
version number in README

13 years agoin-code version number updated
Kai Dietrich [Fri, 6 May 2011 18:34:07 +0000 (20:34 +0200)]
in-code version number updated

13 years agoupdated changelog and makefile
Kai Dietrich [Fri, 6 May 2011 18:30:41 +0000 (20:30 +0200)]
updated changelog and makefile

13 years agodelete grammar tests in master
Kai Dietrich [Fri, 6 May 2011 18:24:57 +0000 (20:24 +0200)]
delete grammar tests in master

grammar test code and playground can live on in a branch

13 years agoMerge branch 'fix-3294518'
Valentin Haenel [Thu, 28 Apr 2011 18:43:27 +0000 (20:43 +0200)]
Merge branch 'fix-3294518'

* fix-3294518:
  bugfix: 3294518
  test: expose bug with ID 3294518
  test: add trivial test for color transform

13 years agobugfix: 3294518
Georges Khaznadar [Thu, 28 Apr 2011 18:33:36 +0000 (20:33 +0200)]
bugfix: 3294518

wiki2beamer: math expressions with indices are randomly parsed as textcolor

a math expression like \frac{V_1}{R_1}=\frac{V_2}{R_2} is wrongly
translated to \frac{V\textcolor{1}{R}{1}=\frac{V}2}{R_2}

Adding some {} in the regular expression used in the source allows to
break this misbehavior in most cases. Imho, a credible color name
should be parsed out before allowing the weird usage of \textcolor

First reported via dbts:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624347

Sent-upstream-from-Debian-by: Jan Hauke Rahm <jhr@debian.org>
Acked-by: Valentin Haenel <valentin.haenel@gmx.de>
13 years agotest: expose bug with ID 3294518
Valentin Haenel [Thu, 28 Apr 2011 18:21:39 +0000 (20:21 +0200)]
test: expose bug with ID 3294518

13 years agotest: add trivial test for color transform
Valentin Haenel [Thu, 28 Apr 2011 18:20:06 +0000 (20:20 +0200)]
test: add trivial test for color transform

13 years agoBugfix: ID: 3168510
Valentin Haenel [Fri, 4 Feb 2011 15:28:11 +0000 (16:28 +0100)]
Bugfix: ID: 3168510

13 years agomoved to subdir as i will try antlr
Kai Dietrich [Sat, 15 Jan 2011 22:58:23 +0000 (23:58 +0100)]
moved to subdir as i will try antlr

13 years agoimproved clean target
Kai Dietrich [Sat, 15 Jan 2011 22:57:41 +0000 (23:57 +0100)]
improved clean target

13 years agoparsing of content inside !alert! markup
Kai Dietrich [Sat, 15 Jan 2011 22:55:12 +0000 (23:55 +0100)]
parsing of content inside !alert! markup

13 years agoremoved obsolete dist targets
Kai Dietrich [Sat, 15 Jan 2011 22:54:00 +0000 (23:54 +0100)]
removed obsolete dist targets

debian has native packages in experimental
gentoo has an ebuild in the betagarden overlay

13 years agofixed missing unicode tokens
Kai Dietrich [Thu, 13 Jan 2011 06:47:11 +0000 (07:47 +0100)]
fixed missing unicode tokens

13 years agoutf8 input support, environment matching in parser
Kai Dietrich [Thu, 13 Jan 2011 06:44:30 +0000 (07:44 +0100)]
utf8 input support, environment matching in parser

13 years agoenvironment matching in parser
Kai Dietrich [Tue, 11 Jan 2011 05:49:02 +0000 (06:49 +0100)]
environment matching in parser

13 years agosome progress with the wiki2beamer grammar
Kai Dietrich [Mon, 10 Jan 2011 21:27:54 +0000 (22:27 +0100)]
some progress with the wiki2beamer grammar

13 years agogentoo ebuild for 0.9.2
Kai Dietrich [Sat, 1 Jan 2011 15:04:33 +0000 (16:04 +0100)]
gentoo ebuild for 0.9.2

13 years agoVersion 0.9.2 preparations
Kai Dietrich [Fri, 31 Dec 2010 10:33:57 +0000 (11:33 +0100)]
Version 0.9.2 preparations

13 years agomore makefile automation for releases
Kai Dietrich [Fri, 31 Dec 2010 10:28:58 +0000 (11:28 +0100)]
more makefile automation for releases

13 years agoadded more self-praise
Kai Dietrich [Thu, 30 Dec 2010 23:14:30 +0000 (00:14 +0100)]
added more self-praise

13 years agoautomatic web publishing
Kai Dietrich [Thu, 30 Dec 2010 18:00:58 +0000 (19:00 +0100)]
automatic web publishing

13 years agotypo fixes and small additiony
Kai Dietrich [Thu, 30 Dec 2010 17:01:30 +0000 (18:01 +0100)]
typo fixes and small additiony

13 years agofinished example
Kai Dietrich [Thu, 30 Dec 2010 14:49:45 +0000 (15:49 +0100)]
finished example

13 years agoenvironments and escaping added
Kai Dietrich [Thu, 30 Dec 2010 11:22:09 +0000 (12:22 +0100)]
environments and escaping added

13 years agocolumns and vspace added
Kai Dietrich [Wed, 29 Dec 2010 23:19:26 +0000 (00:19 +0100)]
columns and vspace added

13 years agomore example text
Kai Dietrich [Wed, 29 Dec 2010 20:31:02 +0000 (21:31 +0100)]
more example text

13 years agodisable caching of static html
Kai Dietrich [Wed, 29 Dec 2010 12:06:47 +0000 (13:06 +0100)]
disable caching of static html

13 years agolink html manpage
Kai Dietrich [Wed, 29 Dec 2010 12:04:59 +0000 (13:04 +0100)]
link html manpage

13 years agomore links and text for webpage
Kai Dietrich [Wed, 29 Dec 2010 11:47:18 +0000 (12:47 +0100)]
more links and text for webpage

13 years agoour shiny new web page
Kai Dietrich [Wed, 29 Dec 2010 11:08:29 +0000 (12:08 +0100)]
our shiny new web page

13 years agosome more text for the great example
Kai Dietrich [Sun, 21 Nov 2010 20:30:54 +0000 (21:30 +0100)]
some more text for the great example

13 years agoremoved spaces before \end{frame} in testcases
Kai Dietrich [Sun, 21 Nov 2010 18:45:23 +0000 (19:45 +0100)]
removed spaces before \end{frame} in testcases

13 years agofix test_subexp_footer (testcase had invalid latex as input)
Kai Dietrich [Sun, 21 Nov 2010 18:40:17 +0000 (19:40 +0100)]
fix test_subexp_footer (testcase had invalid latex as input)

13 years agoMerge branch 'new-example'
Kai Dietrich [Sun, 21 Nov 2010 18:32:25 +0000 (19:32 +0100)]
Merge branch 'new-example'

13 years agoadd FRAMEHEADER and FRAMEFOOTER example
Kai Dietrich [Sun, 21 Nov 2010 18:29:59 +0000 (19:29 +0100)]
add FRAMEHEADER and FRAMEFOOTER example

13 years agoAdded fragile usecase
Kai Dietrich [Sun, 21 Nov 2010 17:59:26 +0000 (18:59 +0100)]
Added fragile usecase

13 years agonew example for use as documentation and test-case
Kai Dietrich [Sun, 21 Nov 2010 17:34:42 +0000 (18:34 +0100)]
new example for use as documentation and test-case

13 years agoFixed bug with fragile as I reported here: http://www-user.tu-chemnitz.de/~mren/wiki2...
Volker Mische [Tue, 16 Nov 2010 10:59:41 +0000 (11:59 +0100)]
Fixed bug with fragile as I reported here: www-user.tu-chemnitz.de/~mren/wiki2beamer/doku.php?id=bug_reports

13 years agotest for bug converting fragile frames
Valentin Haenel [Sat, 20 Nov 2010 11:07:38 +0000 (12:07 +0100)]
test for bug converting fragile frames

As reported on:
  http://www-user.tu-chemnitz.de/~mren/wiki2beamer/doku.php?id=bug_reports
there is one space too much when closing a frame with the [fragile] option. This
causes pdflatex to bail out with the error message: "! File ended while scanning
use of \next."

13 years agoversion.minor++
Kai Dietrich [Mon, 15 Nov 2010 05:30:23 +0000 (06:30 +0100)]
version.minor++

13 years agofix the bug in the file inclusion
Valentin Haenel [Mon, 8 Nov 2010 13:53:42 +0000 (14:53 +0100)]
fix the bug in the file inclusion

As exposed by unit tests: the file inclusion was not correctly escaped for
'code' environment. This commit fixes that bug, unit tests now pass again.

13 years agorefactor unit test to expose bug in file inclusion
Valentin Haenel [Mon, 8 Nov 2010 13:46:47 +0000 (14:46 +0100)]
refactor unit test to expose bug in file inclusion

It seems like two of the unit tests were not quite right. The unit tests in
question test to see if file inclusion is disabled inside the 'code'
environment. The problem is that they checked this works by giving input to the
'convert2beamer' function, but there is never any file inclusion in this
function. As a result the unit tests passed, even though wiki2beamer would have
failed on real[TM] input. All the file inclusion takes place earlier in the
include_file_recursive function. The unit tests were refactored to first run the
include_file_recursive function, and then the convert2beamer. They now correctly
expose the bug.

13 years agoprepare metafiles for release
Kai Dietrich [Mon, 8 Nov 2010 06:11:37 +0000 (07:11 +0100)]
prepare metafiles for release

13 years agofix attribution
Kai Dietrich [Mon, 8 Nov 2010 05:55:53 +0000 (06:55 +0100)]
fix attribution

13 years agodocumenting -h --help and >>>include<<< behaviour
Kai Dietrich [Mon, 8 Nov 2010 05:41:24 +0000 (06:41 +0100)]
documenting -h --help and >>>include<<< behaviour

13 years agominor syntactic changes
Kai Dietrich [Sun, 7 Nov 2010 16:01:17 +0000 (17:01 +0100)]
minor syntactic changes

13 years agoupdate version and author information for setup
Kai Dietrich [Sun, 7 Nov 2010 16:00:31 +0000 (17:00 +0100)]
update version and author information for setup

13 years agofix test (actually >>>include<<< shouldn't work inside code environments)
Kai Dietrich [Sun, 7 Nov 2010 15:54:47 +0000 (16:54 +0100)]
fix test (actually >>>include<<< shouldn't work inside code environments)

13 years agoMerge remote branch 'esc/fix-include-files'
Kai Dietrich [Sun, 7 Nov 2010 15:26:11 +0000 (16:26 +0100)]
Merge remote branch 'esc/fix-include-files'

13 years agofixed attribution
Kai Dietrich [Sun, 7 Nov 2010 15:25:37 +0000 (16:25 +0100)]
fixed attribution

13 years agoplaying with LL(1) grammar
Kai Dietrich [Thu, 4 Nov 2010 20:46:15 +0000 (21:46 +0100)]
playing with LL(1) grammar

13 years agoproper error message for include loop
Valentin Haenel [Wed, 3 Nov 2010 18:38:56 +0000 (19:38 +0100)]
proper error message for include loop

13 years agoadapt test case for inclusion loops
Valentin Haenel [Mon, 1 Nov 2010 23:10:08 +0000 (00:10 +0100)]
adapt test case for inclusion loops

Instead of waiting for one seconde, we now check that an Exception is raised, if
a recursive loop in the file inclusion is detected. Of course the Exception
should be adapted, and the offending filename reported to the user!

13 years agoadapt test cases for new include_file_recursive
Valentin Haenel [Mon, 1 Nov 2010 23:06:44 +0000 (00:06 +0100)]
adapt test cases for new include_file_recursive

Since the new include_file_recursive works on a given input file, instead of on
a list of input lines, the test cases are adapted accordingly. Monkey patching
the file cache works great btw.

13 years agoremove redundant test case
Valentin Haenel [Mon, 1 Nov 2010 22:57:56 +0000 (23:57 +0100)]
remove redundant test case

This was checking the same condition as
test_include_file_recursive_honors_nowiki, but using strings instead of files.

13 years agodelete old include_files_recursive and activate new one
Valentin Haenel [Mon, 1 Nov 2010 22:57:10 +0000 (23:57 +0100)]
delete old include_files_recursive and activate new one

The old (and buggy) include_files_recursive is removed and the new and shiny
include_files is renamed to include_files_recursive to take its place.

13 years agoadapt test case for new include_file
Valentin Haenel [Mon, 1 Nov 2010 22:53:24 +0000 (23:53 +0100)]
adapt test case for new include_file

13 years agodocstring for new include_file
Valentin Haenel [Mon, 1 Nov 2010 22:52:19 +0000 (23:52 +0100)]
docstring for new include_file

13 years agoinclude_file has new semantics
Valentin Haenel [Mon, 1 Nov 2010 22:47:54 +0000 (23:47 +0100)]
include_file has new semantics

We remove the old include_file and rename include_filename -> include_file

13 years agoremove old test_files
Valentin Haenel [Mon, 1 Nov 2010 23:44:27 +0000 (00:44 +0100)]
remove old test_files

These are no longer needed since we have the shiny new file cacheā„¢.

13 years agoactivate file cache for testing
Valentin Haenel [Mon, 1 Nov 2010 22:45:23 +0000 (23:45 +0100)]
activate file cache for testing

Before adapting the tests we start using the file cache.

13 years agoactivate new recursive include
Valentin Haenel [Mon, 1 Nov 2010 22:33:49 +0000 (23:33 +0100)]
activate new recursive include

We activate the new recursive include, renaming and removing the old code will
be done late.

13 years agoactivate file cache when including files recursively
Valentin Haenel [Mon, 1 Nov 2010 22:33:20 +0000 (23:33 +0100)]
activate file cache when including files recursively

13 years agolayz cache for file content
Valentin Haenel [Mon, 1 Nov 2010 22:16:48 +0000 (23:16 +0100)]
layz cache for file content

In preperation for including content from stdin and from files, as well as easy
testing using monkey patching, a lazy cache for file content has been added.
By default get_lines_from_cache should be used, this will either return the
lines in a file if it has already been loaded, or load the file from disk.

It can also be used to initialise a file cache, using pretend names and content,
using add_lines_to_cache. This is great for monkey patching content into the
cache without actually having any files on disk. A method clear_file_cache is
also provided, just in case.

As a side node, this also means that for the use case of multiple includes, the
code should be marginally faster since the file need not be loaded from disk
twice.

13 years agoremove call to include_file_recursive
Valentin Haenel [Tue, 2 Nov 2010 00:03:26 +0000 (01:03 +0100)]
remove call to include_file_recursive

In preperation for switching to the new algorithm the call to
include_file_recursive in the conversion has been deactivated. Warning this
breaks unit tests.

13 years agonew function to enable recursive inclusion
Valentin Haenel [Tue, 2 Nov 2010 00:03:19 +0000 (01:03 +0100)]
new function to enable recursive inclusion

As opposed to the old include_file_recursive, this one keeps track of which
files have been included, and can thus detect loops. It works using a stack of
included files and a depth first search. If a loop is detected an Exception is
raised. It will later replace the old include_file_recursive.

13 years agofunction to just extract the filename
Valentin Haenel [Mon, 1 Nov 2010 22:07:36 +0000 (23:07 +0100)]
function to just extract the filename

Instead of returning the lines contained in the file like the current
include_file does, include_filename returns the filename instead. This will
replace include_file later.

13 years agoadded test for recursive file inclusion detection
Kai Dietrich [Sat, 30 Oct 2010 17:57:56 +0000 (19:57 +0200)]
added test for recursive file inclusion detection