Browse Source

latexpath is actually path2posix

pull/142/head
Oliverpool 9 years ago
parent
commit
8fec83ea91
  1. 4
      patacrep/latex/__init__.py
  2. 5
      patacrep/songs/chordpro/__init__.py
  3. 2
      patacrep/songs/chordpro/data/latex/content_image
  4. 2
      patacrep/songs/chordpro/data/latex/content_partition
  5. 2
      patacrep/songs/chordpro/data/latex/song

4
patacrep/latex/__init__.py

@ -29,7 +29,3 @@ def lang2babel(lang):
available = ", ".join(BABEL_LANGUAGES.keys()) available = ", ".join(BABEL_LANGUAGES.keys())
LOGGER.error('Unknown lang code: ' + lang + '. Supported: ' + available) LOGGER.error('Unknown lang code: ' + lang + '. Supported: ' + available)
return 'english' return 'english'
def latexpath(path):
"""In LaTeX paths use '/' even on windows"""
return path.replace('\\', '/')

5
patacrep/songs/chordpro/__init__.py

@ -10,7 +10,8 @@ from patacrep import encoding, files
from patacrep.songs import Song from patacrep.songs import Song
from patacrep.songs.chordpro.syntax import parse_song from patacrep.songs.chordpro.syntax import parse_song
from patacrep.templates import Renderer from patacrep.templates import Renderer
from patacrep.latex import lang2babel, latexpath from patacrep.latex import lang2babel
from patacrep.files import path2posix
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
@ -54,7 +55,7 @@ class ChordproSong(Song):
jinjaenv.filters['search_image'] = self.search_image jinjaenv.filters['search_image'] = self.search_image
jinjaenv.filters['search_partition'] = self.search_partition jinjaenv.filters['search_partition'] = self.search_partition
jinjaenv.filters['lang2babel'] = lang2babel jinjaenv.filters['lang2babel'] = lang2babel
jinjaenv.filters['latexpath'] = latexpath jinjaenv.filters['path2posix'] = path2posix
try: try:
return Renderer( return Renderer(

2
patacrep/songs/chordpro/data/latex/content_image

@ -1,5 +1,5 @@
(* block image *) (* block image *)
(* set image = content.argument|search_image|latexpath *) (* set image = content.argument|search_image|path2posix *)
(* if image *) (* if image *)
\image{(( image ))} \image{(( image ))}
(*- endif *) (*- endif *)

2
patacrep/songs/chordpro/data/latex/content_partition

@ -1,5 +1,5 @@
(* block partition *) (* block partition *)
(* set partition = content.argument|search_partition|latexpath *) (* set partition = content.argument|search_partition|path2posix *)
(* if partition *) (* if partition *)
\lilypond{ ((- partition -)) } \lilypond{ ((- partition -)) }
(*- endif -*) (*- endif -*)

2
patacrep/songs/chordpro/data/latex/song

@ -29,7 +29,7 @@
(* endfor *) (* endfor *)
(* if 'cov' in metadata *) (* if 'cov' in metadata *)
(* block cov *) (* block cov *)
(* set cov = metadata["cov"].argument|search_image|latexpath *) (* set cov = metadata["cov"].argument|search_image|path2posix *)
(* if cov *) (* if cov *)
cov={(( cov ))}, cov={(( cov ))},
(* endif *) (* endif *)

Loading…
Cancel
Save