From c6a7ea21c930182292d7ad7f4f3d69035bb73346 Mon Sep 17 00:00:00 2001 From: Luthaf Date: Tue, 17 Jun 2014 14:41:03 +0100 Subject: [PATCH] Passage au nom Patacrep --- NEWS | 2 +- {songbook_core => patacrep}/__init__.py | 0 {songbook_core => patacrep}/authors.py | 0 {songbook_core => patacrep}/build.py | 12 ++++++------ {songbook_core => patacrep}/data/examples/README | 0 .../data/examples/example-all.sb | 0 .../data/examples/example-layout.sb | 0 .../data/examples/example-patacrep.sb | 0 .../data/examples/example-songs.sb | 0 .../data/examples/example.sb | 0 .../data/examples/img/README | 0 .../data/examples/img/treble_a.png | Bin .../data/examples/latex/README | 0 .../data/examples/songs/README | 0 .../data/examples/songs/_lilypond/header | 0 .../examples/songs/chevaliers_de_la_table_ronde.sg | 0 .../data/examples/songs/example-en.sg | 0 .../data/examples/songs/example-fr.sg | 0 .../data/examples/songs/greensleeves.ly | 0 .../data/examples/songs/greensleeves.sg | 0 .../data/examples/songs/traditionnel.jpg | Bin .../data/examples/songs/vent_frais.sg | 0 .../data/examples/templates/README | 0 {songbook_core => patacrep}/data/latex/chords.sty | 0 {songbook_core => patacrep}/data/latex/crepbook.sty | 10 +++++----- .../data/latex/patacrep.sty | 4 ++-- {songbook_core => patacrep}/data/latex/songs.sty | 0 {songbook_core => patacrep}/data/latex/tabs.sty | 0 .../data/templates/default.tex | 0 .../data/templates/layout.tex | 0 .../data/templates/patacrep.tex | 0 .../data/templates/songs.tex | 2 +- {songbook_core => patacrep}/errors.py | 0 {songbook_core => patacrep}/files.py | 0 {songbook_core => patacrep}/index.py | 4 ++-- {songbook_core => patacrep}/plastex.py | 0 {songbook_core => patacrep}/plastex_chord.py | 0 {songbook_core => patacrep}/plastex_patchedbabel.py | 0 {songbook_core => patacrep}/plastex_songs.py | 2 +- {songbook_core => patacrep}/songs.py | 4 ++-- {songbook_core => patacrep}/templates.py | 2 +- readme.md | 12 ++++++------ setup.py | 10 +++++----- songbook | 6 +++--- 44 files changed, 35 insertions(+), 35 deletions(-) rename {songbook_core => patacrep}/__init__.py (100%) rename {songbook_core => patacrep}/authors.py (100%) rename {songbook_core => patacrep}/build.py (97%) rename {songbook_core => patacrep}/data/examples/README (100%) rename {songbook_core => patacrep}/data/examples/example-all.sb (100%) rename {songbook_core => patacrep}/data/examples/example-layout.sb (100%) rename {songbook_core => patacrep}/data/examples/example-patacrep.sb (100%) rename {songbook_core => patacrep}/data/examples/example-songs.sb (100%) rename {songbook_core => patacrep}/data/examples/example.sb (100%) rename {songbook_core => patacrep}/data/examples/img/README (100%) rename {songbook_core => patacrep}/data/examples/img/treble_a.png (100%) rename {songbook_core => patacrep}/data/examples/latex/README (100%) rename {songbook_core => patacrep}/data/examples/songs/README (100%) rename {songbook_core => patacrep}/data/examples/songs/_lilypond/header (100%) rename {songbook_core => patacrep}/data/examples/songs/chevaliers_de_la_table_ronde.sg (100%) rename {songbook_core => patacrep}/data/examples/songs/example-en.sg (100%) rename {songbook_core => patacrep}/data/examples/songs/example-fr.sg (100%) rename {songbook_core => patacrep}/data/examples/songs/greensleeves.ly (100%) rename {songbook_core => patacrep}/data/examples/songs/greensleeves.sg (100%) rename {songbook_core => patacrep}/data/examples/songs/traditionnel.jpg (100%) rename {songbook_core => patacrep}/data/examples/songs/vent_frais.sg (100%) rename {songbook_core => patacrep}/data/examples/templates/README (100%) rename {songbook_core => patacrep}/data/latex/chords.sty (100%) rename {songbook_core => patacrep}/data/latex/crepbook.sty (95%) rename songbook_core/data/latex/SongbookUtils.sty => patacrep/data/latex/patacrep.sty (98%) rename {songbook_core => patacrep}/data/latex/songs.sty (100%) rename {songbook_core => patacrep}/data/latex/tabs.sty (100%) rename {songbook_core => patacrep}/data/templates/default.tex (100%) rename {songbook_core => patacrep}/data/templates/layout.tex (100%) rename {songbook_core => patacrep}/data/templates/patacrep.tex (100%) rename {songbook_core => patacrep}/data/templates/songs.tex (99%) rename {songbook_core => patacrep}/errors.py (100%) rename {songbook_core => patacrep}/files.py (100%) rename {songbook_core => patacrep}/index.py (98%) rename {songbook_core => patacrep}/plastex.py (100%) rename {songbook_core => patacrep}/plastex_chord.py (100%) rename {songbook_core => patacrep}/plastex_patchedbabel.py (100%) rename {songbook_core => patacrep}/plastex_songs.py (97%) mode change 100644 => 100755 rename {songbook_core => patacrep}/songs.py (98%) mode change 100644 => 100755 rename {songbook_core => patacrep}/templates.py (99%) mode change 100644 => 100755 diff --git a/NEWS b/NEWS index 21a6af78..62413cc8 100644 --- a/NEWS +++ b/NEWS @@ -4,7 +4,7 @@ songbook 3.7.2 songbook 3.4.7 to 3.7.1 - Mainly new songs in the data (which was included in songbook-core at this + Mainly new songs in the data (which was included in songbook at this time), and a few undocumented bug corrections and improvements. songbook (v0.8) diff --git a/songbook_core/__init__.py b/patacrep/__init__.py similarity index 100% rename from songbook_core/__init__.py rename to patacrep/__init__.py diff --git a/songbook_core/authors.py b/patacrep/authors.py similarity index 100% rename from songbook_core/authors.py rename to patacrep/authors.py diff --git a/songbook_core/build.py b/patacrep/build.py similarity index 97% rename from songbook_core/build.py rename to patacrep/build.py index 4101341b..d60c5674 100755 --- a/songbook_core/build.py +++ b/patacrep/build.py @@ -10,12 +10,12 @@ import os.path import re from subprocess import Popen, PIPE, call -from songbook_core import __DATADIR__ -from songbook_core import errors -from songbook_core.files import recursive_find -from songbook_core.index import process_sxd -from songbook_core.songs import Song, SongbookContent -from songbook_core.templates import TexRenderer +from patacrep import __DATADIR__ +from patacrep import errors +from patacrep.files import recursive_find +from patacrep.index import process_sxd +from patacrep.songs import Song, SongbookContent +from patacrep.templates import TexRenderer LOGGER = logging.getLogger(__name__) EOL = "\n" diff --git a/songbook_core/data/examples/README b/patacrep/data/examples/README similarity index 100% rename from songbook_core/data/examples/README rename to patacrep/data/examples/README diff --git a/songbook_core/data/examples/example-all.sb b/patacrep/data/examples/example-all.sb similarity index 100% rename from songbook_core/data/examples/example-all.sb rename to patacrep/data/examples/example-all.sb diff --git a/songbook_core/data/examples/example-layout.sb b/patacrep/data/examples/example-layout.sb similarity index 100% rename from songbook_core/data/examples/example-layout.sb rename to patacrep/data/examples/example-layout.sb diff --git a/songbook_core/data/examples/example-patacrep.sb b/patacrep/data/examples/example-patacrep.sb similarity index 100% rename from songbook_core/data/examples/example-patacrep.sb rename to patacrep/data/examples/example-patacrep.sb diff --git a/songbook_core/data/examples/example-songs.sb b/patacrep/data/examples/example-songs.sb similarity index 100% rename from songbook_core/data/examples/example-songs.sb rename to patacrep/data/examples/example-songs.sb diff --git a/songbook_core/data/examples/example.sb b/patacrep/data/examples/example.sb similarity index 100% rename from songbook_core/data/examples/example.sb rename to patacrep/data/examples/example.sb diff --git a/songbook_core/data/examples/img/README b/patacrep/data/examples/img/README similarity index 100% rename from songbook_core/data/examples/img/README rename to patacrep/data/examples/img/README diff --git a/songbook_core/data/examples/img/treble_a.png b/patacrep/data/examples/img/treble_a.png similarity index 100% rename from songbook_core/data/examples/img/treble_a.png rename to patacrep/data/examples/img/treble_a.png diff --git a/songbook_core/data/examples/latex/README b/patacrep/data/examples/latex/README similarity index 100% rename from songbook_core/data/examples/latex/README rename to patacrep/data/examples/latex/README diff --git a/songbook_core/data/examples/songs/README b/patacrep/data/examples/songs/README similarity index 100% rename from songbook_core/data/examples/songs/README rename to patacrep/data/examples/songs/README diff --git a/songbook_core/data/examples/songs/_lilypond/header b/patacrep/data/examples/songs/_lilypond/header similarity index 100% rename from songbook_core/data/examples/songs/_lilypond/header rename to patacrep/data/examples/songs/_lilypond/header diff --git a/songbook_core/data/examples/songs/chevaliers_de_la_table_ronde.sg b/patacrep/data/examples/songs/chevaliers_de_la_table_ronde.sg similarity index 100% rename from songbook_core/data/examples/songs/chevaliers_de_la_table_ronde.sg rename to patacrep/data/examples/songs/chevaliers_de_la_table_ronde.sg diff --git a/songbook_core/data/examples/songs/example-en.sg b/patacrep/data/examples/songs/example-en.sg similarity index 100% rename from songbook_core/data/examples/songs/example-en.sg rename to patacrep/data/examples/songs/example-en.sg diff --git a/songbook_core/data/examples/songs/example-fr.sg b/patacrep/data/examples/songs/example-fr.sg similarity index 100% rename from songbook_core/data/examples/songs/example-fr.sg rename to patacrep/data/examples/songs/example-fr.sg diff --git a/songbook_core/data/examples/songs/greensleeves.ly b/patacrep/data/examples/songs/greensleeves.ly similarity index 100% rename from songbook_core/data/examples/songs/greensleeves.ly rename to patacrep/data/examples/songs/greensleeves.ly diff --git a/songbook_core/data/examples/songs/greensleeves.sg b/patacrep/data/examples/songs/greensleeves.sg similarity index 100% rename from songbook_core/data/examples/songs/greensleeves.sg rename to patacrep/data/examples/songs/greensleeves.sg diff --git a/songbook_core/data/examples/songs/traditionnel.jpg b/patacrep/data/examples/songs/traditionnel.jpg similarity index 100% rename from songbook_core/data/examples/songs/traditionnel.jpg rename to patacrep/data/examples/songs/traditionnel.jpg diff --git a/songbook_core/data/examples/songs/vent_frais.sg b/patacrep/data/examples/songs/vent_frais.sg similarity index 100% rename from songbook_core/data/examples/songs/vent_frais.sg rename to patacrep/data/examples/songs/vent_frais.sg diff --git a/songbook_core/data/examples/templates/README b/patacrep/data/examples/templates/README similarity index 100% rename from songbook_core/data/examples/templates/README rename to patacrep/data/examples/templates/README diff --git a/songbook_core/data/latex/chords.sty b/patacrep/data/latex/chords.sty similarity index 100% rename from songbook_core/data/latex/chords.sty rename to patacrep/data/latex/chords.sty diff --git a/songbook_core/data/latex/crepbook.sty b/patacrep/data/latex/crepbook.sty similarity index 95% rename from songbook_core/data/latex/crepbook.sty rename to patacrep/data/latex/crepbook.sty index 879c4d9e..b26c384d 100644 --- a/songbook_core/data/latex/crepbook.sty +++ b/patacrep/data/latex/crepbook.sty @@ -3,10 +3,10 @@ % This package is intended to be used with the songbook Python program (and its % interfaces). % It defines some layout for automatic songbook generation. -% See http://github.com/patacrep/songbook-core/ +% See http://github.com/patacrep/patacrep/ \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesPackage{crepbook}[2014/04/13 Crepbook Package, version 0.1] +\ProvidesPackage{crepbook}[2014/06/17 Crepbook Package, version 1] % fancy-capo: When a capo is necessary, use a picture instead of text. \newif{\iffancycapo} @@ -22,12 +22,12 @@ \customfontstrue \DeclareOption{nocustomfonts}{\customfontsfalse} -% Remaining options are passed to the SongbookUtils package -\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{SongbookUtils}} +% Remaining options are passed to the main Patacrep package +\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{patacrep}} \ProcessOptions\relax -\RequirePackage{SongbookUtils} +\RequirePackage{patacrep} \ifpictures \fancycapotrue diff --git a/songbook_core/data/latex/SongbookUtils.sty b/patacrep/data/latex/patacrep.sty similarity index 98% rename from songbook_core/data/latex/SongbookUtils.sty rename to patacrep/data/latex/patacrep.sty index 756c2d14..d070ec2b 100644 --- a/songbook_core/data/latex/SongbookUtils.sty +++ b/patacrep/data/latex/patacrep.sty @@ -1,10 +1,10 @@ % Songbook Package -- version 0.1 for LaTeX2e % % This package provides macro for automatic songbook -% generation. See http://github.com/patacrep/songbook-core/ +% generation. See http://github.com/patacrep/patacrep/ \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesPackage{SongbookUtils}[2014/04/13 Songbook Package, version 0.1] +\ProvidesPackage{patacrep}[2014/06/17 Patacrep Package, version 1] \RequirePackage{graphicx,xcolor} % \RequirePackage{epstopdf} % diff --git a/songbook_core/data/latex/songs.sty b/patacrep/data/latex/songs.sty similarity index 100% rename from songbook_core/data/latex/songs.sty rename to patacrep/data/latex/songs.sty diff --git a/songbook_core/data/latex/tabs.sty b/patacrep/data/latex/tabs.sty similarity index 100% rename from songbook_core/data/latex/tabs.sty rename to patacrep/data/latex/tabs.sty diff --git a/songbook_core/data/templates/default.tex b/patacrep/data/templates/default.tex similarity index 100% rename from songbook_core/data/templates/default.tex rename to patacrep/data/templates/default.tex diff --git a/songbook_core/data/templates/layout.tex b/patacrep/data/templates/layout.tex similarity index 100% rename from songbook_core/data/templates/layout.tex rename to patacrep/data/templates/layout.tex diff --git a/songbook_core/data/templates/patacrep.tex b/patacrep/data/templates/patacrep.tex similarity index 100% rename from songbook_core/data/templates/patacrep.tex rename to patacrep/data/templates/patacrep.tex diff --git a/songbook_core/data/templates/songs.tex b/patacrep/data/templates/songs.tex similarity index 99% rename from songbook_core/data/templates/songs.tex rename to patacrep/data/templates/songs.tex index 2b208f08..28836768 100644 --- a/songbook_core/data/templates/songs.tex +++ b/patacrep/data/templates/songs.tex @@ -64,7 +64,7 @@ (* for option in bookoptions *)((option)), (* endfor *) (* for instrument in instruments *)((instrument)), - (* endfor *)]{SongbookUtils} + (* endfor *)]{patacrep} (* endblock *) (* block songbookpreambule *) diff --git a/songbook_core/errors.py b/patacrep/errors.py similarity index 100% rename from songbook_core/errors.py rename to patacrep/errors.py diff --git a/songbook_core/files.py b/patacrep/files.py similarity index 100% rename from songbook_core/files.py rename to patacrep/files.py diff --git a/songbook_core/index.py b/patacrep/index.py similarity index 98% rename from songbook_core/index.py rename to patacrep/index.py index 78b64165..145d4945 100755 --- a/songbook_core/index.py +++ b/patacrep/index.py @@ -13,8 +13,8 @@ import locale import re import codecs -from songbook_core.authors import processauthors -from songbook_core.plastex import simpleparse +from patacrep.authors import processauthors +from patacrep.plastex import simpleparse EOL = u"\n" diff --git a/songbook_core/plastex.py b/patacrep/plastex.py similarity index 100% rename from songbook_core/plastex.py rename to patacrep/plastex.py diff --git a/songbook_core/plastex_chord.py b/patacrep/plastex_chord.py similarity index 100% rename from songbook_core/plastex_chord.py rename to patacrep/plastex_chord.py diff --git a/songbook_core/plastex_patchedbabel.py b/patacrep/plastex_patchedbabel.py similarity index 100% rename from songbook_core/plastex_patchedbabel.py rename to patacrep/plastex_patchedbabel.py diff --git a/songbook_core/plastex_songs.py b/patacrep/plastex_songs.py old mode 100644 new mode 100755 similarity index 97% rename from songbook_core/plastex_songs.py rename to patacrep/plastex_songs.py index d3c30b2c..37536ef6 --- a/songbook_core/plastex_songs.py +++ b/patacrep/plastex_songs.py @@ -6,7 +6,7 @@ import plasTeX -from songbook_core.plastex import process_unbr_spaces +from patacrep.plastex import process_unbr_spaces def split_linebreak(texlist): diff --git a/songbook_core/songs.py b/patacrep/songs.py old mode 100644 new mode 100755 similarity index 98% rename from songbook_core/songs.py rename to patacrep/songs.py index 2bd1fc2e..bbfa164f --- a/songbook_core/songs.py +++ b/patacrep/songs.py @@ -10,8 +10,8 @@ import os.path import re import logging -from songbook_core.authors import processauthors -from songbook_core.plastex import parsetex +from patacrep.authors import processauthors +from patacrep.plastex import parsetex LOGGER = logging.getLogger(__name__) diff --git a/songbook_core/templates.py b/patacrep/templates.py old mode 100644 new mode 100755 similarity index 99% rename from songbook_core/templates.py rename to patacrep/templates.py index 05f2ba3d..e197ddbe --- a/songbook_core/templates.py +++ b/patacrep/templates.py @@ -11,7 +11,7 @@ import os import re import json -from songbook_core import errors +from patacrep import errors _LATEX_SUBS = ( (re.compile(r'\\'), r'\\textbackslash'), diff --git a/readme.md b/readme.md index f07e4787..9755913a 100644 --- a/readme.md +++ b/readme.md @@ -16,24 +16,24 @@ is precised in the header. # Python version -Songbook is compatible with Python 2.7 (no Python3 since [one of the +Patacrep is compatible with Python 2.7 (no Python3 since [one of the library](http://plastex.sourceforge.net/) we are using is not). # Download Clone Patacrep repos: -> git clone git://github.com/crep4ever/songbook-core.git -> git clone git://github.com/crep4ever/songbook-data.git +> git clone git://github.com/patacrep/patacrep.git +> git clone git://github.com/patacrep/patadata.git # Run -> /songbook +> /songbook > -Look for existing songbook files in /books. For example: +Look for existing songbook files in `/books/`. For example: -> /songbook /books/songbook_en.sb +> /songbook /books/songbook_en.sb > songbook_en.pdf # Quick and dirty deb packages diff --git a/setup.py b/setup.py index 9afb38db..4909fdd8 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ $ python setup.py install """ from distutils.core import setup from distutils.command.install import install as _install -from songbook_core import __STR_VERSION__ +from patacrep import __STR_VERSION__ import sys import os @@ -44,13 +44,13 @@ class install(_install): setup(cmdclass={'install': install}, - name='songbook-core', + name='patacrep', version=__STR_VERSION__, description='Songbook compilation chain', author='The Songbook team', author_email='crep@team-on-fire.com', - url='https://github.com/patacrep/songbook-core', - packages=['songbook_core'], + url='https://github.com/patacrep/patacrep', + packages=['patacrep'], license="GPLv2 or any later version", scripts=['songbook'], requires=[ @@ -58,7 +58,7 @@ setup(cmdclass={'install': install}, "locale", "logging", "os", "plasTeX", "re", "subprocess", "sys", "textwrap", "unidecode", "jinja2" ], - package_data={'songbook_core': ['data/latex/*', + package_data={'patacrep': ['data/latex/*', 'data/templates/*', 'data/examples/*.sb', 'data/examples/*/*.sg', diff --git a/songbook b/songbook index 40c3958a..b49a5d03 100755 --- a/songbook +++ b/songbook @@ -12,9 +12,9 @@ import os.path import textwrap import sys -from songbook_core.build import SongbookBuilder, DEFAULT_STEPS -from songbook_core import __STR_VERSION__ -from songbook_core import errors +from patacrep.build import SongbookBuilder, DEFAULT_STEPS +from patacrep import __STR_VERSION__ +from patacrep import errors # Logging configuration logging.basicConfig(level=logging.INFO)