From 8fec83ea91c5b450127dd24c41cfc23d54a65041 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Thu, 29 Oct 2015 22:25:56 +0100 Subject: [PATCH] latexpath is actually path2posix --- patacrep/latex/__init__.py | 4 ---- patacrep/songs/chordpro/__init__.py | 5 +++-- patacrep/songs/chordpro/data/latex/content_image | 2 +- patacrep/songs/chordpro/data/latex/content_partition | 2 +- patacrep/songs/chordpro/data/latex/song | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/patacrep/latex/__init__.py b/patacrep/latex/__init__.py index 3ca10d3c..d01cfbe5 100644 --- a/patacrep/latex/__init__.py +++ b/patacrep/latex/__init__.py @@ -29,7 +29,3 @@ def lang2babel(lang): available = ", ".join(BABEL_LANGUAGES.keys()) LOGGER.error('Unknown lang code: ' + lang + '. Supported: ' + available) return 'english' - -def latexpath(path): - """In LaTeX paths use '/' even on windows""" - return path.replace('\\', '/') diff --git a/patacrep/songs/chordpro/__init__.py b/patacrep/songs/chordpro/__init__.py index 137ca3f4..3fbed1a7 100644 --- a/patacrep/songs/chordpro/__init__.py +++ b/patacrep/songs/chordpro/__init__.py @@ -10,7 +10,8 @@ from patacrep import encoding, files from patacrep.songs import Song from patacrep.songs.chordpro.syntax import parse_song 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__) @@ -54,7 +55,7 @@ class ChordproSong(Song): jinjaenv.filters['search_image'] = self.search_image jinjaenv.filters['search_partition'] = self.search_partition jinjaenv.filters['lang2babel'] = lang2babel - jinjaenv.filters['latexpath'] = latexpath + jinjaenv.filters['path2posix'] = path2posix try: return Renderer( diff --git a/patacrep/songs/chordpro/data/latex/content_image b/patacrep/songs/chordpro/data/latex/content_image index 71d24f4f..a567730d 100644 --- a/patacrep/songs/chordpro/data/latex/content_image +++ b/patacrep/songs/chordpro/data/latex/content_image @@ -1,5 +1,5 @@ (* block image *) -(* set image = content.argument|search_image|latexpath *) +(* set image = content.argument|search_image|path2posix *) (* if image *) \image{(( image ))} (*- endif *) diff --git a/patacrep/songs/chordpro/data/latex/content_partition b/patacrep/songs/chordpro/data/latex/content_partition index b2e4a756..6942492a 100644 --- a/patacrep/songs/chordpro/data/latex/content_partition +++ b/patacrep/songs/chordpro/data/latex/content_partition @@ -1,5 +1,5 @@ (* block partition *) -(* set partition = content.argument|search_partition|latexpath *) +(* set partition = content.argument|search_partition|path2posix *) (* if partition *) \lilypond{ ((- partition -)) } (*- endif -*) diff --git a/patacrep/songs/chordpro/data/latex/song b/patacrep/songs/chordpro/data/latex/song index fffc512d..472f3d3c 100644 --- a/patacrep/songs/chordpro/data/latex/song +++ b/patacrep/songs/chordpro/data/latex/song @@ -29,7 +29,7 @@ (* endfor *) (* if 'cov' in metadata *) (* block cov *) - (* set cov = metadata["cov"].argument|search_image|latexpath *) + (* set cov = metadata["cov"].argument|search_image|path2posix *) (* if cov *) cov={(( cov ))}, (* endif *)