Browse Source

Merge pull request #228 from patacrep/tex_content_fix

Tex content fix
pull/230/head
oliverpool 9 years ago
committed by GitHub
parent
commit
a2c5d21185
  1. 6
      patacrep/content/tex.py
  2. 1
      test/test_content/tex.control
  3. 2
      test/test_content/tex.source

6
patacrep/content/tex.py

@ -1,6 +1,5 @@
"""Include LaTeX raw code in the songbook.""" """Include LaTeX raw code in the songbook."""
import itertools
import logging import logging
import os import os
@ -43,9 +42,8 @@ def parse(keyword, argument, config):
argument = [argument] argument = [argument]
filelist = ContentList() filelist = ContentList()
basefolders = itertools.chain( basefolders = [path.fullpath for path in config['_songdir']] + list(
(path.fullpath for path in config['_songdir']), files.iter_datadirs(config['_datadir'], 'latex')
files.iter_datadirs(config['_datadir'], 'latex'),
) )
for filename in argument: for filename in argument:
checked_file = None checked_file = None

1
test/test_content/tex.control

@ -1,2 +1,3 @@
- test/test_content/datadir/songs/texfile.tex - test/test_content/datadir/songs/texfile.tex
- test/test_content/datadir/songs/texfile.tex
- test/test_content/datadir/songs/texfile.tex - test/test_content/datadir/songs/texfile.tex

2
test/test_content/tex.source

@ -1,4 +1,4 @@
- tex: - tex:
- texfile.tex - texfile.tex
- chordpro.csg - texfile.tex
- tex: texfile.tex - tex: texfile.tex
Loading…
Cancel
Save