Passage au nom Patacrep

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)

songbook_core/build.py → patacrep/build.py

@@ -10,12 +10,12 @@ import os.path
 import re
 from subprocess import Popen, PIPE, call
 
-from songbook_core import __DATADIR__
+from patacrep import __DATADIR__
-from songbook_core import errors
+from patacrep import errors
-from songbook_core.files import recursive_find
+from patacrep.files import recursive_find
-from songbook_core.index import process_sxd
+from patacrep.index import process_sxd
-from songbook_core.songs import Song, SongbookContent
+from patacrep.songs import Song, SongbookContent
-from songbook_core.templates import TexRenderer
+from patacrep.templates import TexRenderer
 
 LOGGER = logging.getLogger(__name__)
 EOL = "\n"

songbook_core/data/latex/crepbook.sty → 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
+% Remaining options are passed to the main Patacrep package
-\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{SongbookUtils}}
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{patacrep}}
 
 \ProcessOptions\relax
 
-\RequirePackage{SongbookUtils}
+\RequirePackage{patacrep}
 
 \ifpictures
     \fancycapotrue

songbook_core/data/latex/SongbookUtils.sty → 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} %

songbook_core/data/templates/songs.tex → 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 *)

songbook_core/index.py → patacrep/index.py

@@ -13,8 +13,8 @@ import locale
 import re
 import codecs
 
-from songbook_core.authors import processauthors
+from patacrep.authors import processauthors
-from songbook_core.plastex import simpleparse
+from patacrep.plastex import simpleparse
 
 EOL = u"\n"
 

songbook_core/plastex_songs.py → 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):

songbook_core/songs.py → patacrep/songs.py

@@ -10,8 +10,8 @@ import os.path
 import re
 import logging
 
-from songbook_core.authors import processauthors
+from patacrep.authors import processauthors
-from songbook_core.plastex import parsetex
+from patacrep.plastex import parsetex
 
 LOGGER = logging.getLogger(__name__)
 

songbook_core/templates.py → 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'),

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/patacrep/patacrep.git
->     git clone git://github.com/crep4ever/songbook-data.git
+>     git clone git://github.com/patacrep/patadata.git
 
 # Run
 
->     <songbook-core>/songbook <songbook_file.sb>
+>     <patacrep>/songbook <songbook_file.sb>
 >     <pdfreader> <songbook_file.pdf>
 
-Look for existing songbook files in <songbook-data>/books. For example:
+Look for existing songbook files in `<patadata>/books/`. For example:
 
->     <songbook-core>/songbook <songbook-data>/books/songbook_en.sb
+>     <patacrep>/songbook <patadata>/books/songbook_en.sb
 >     <pdfreader> songbook_en.pdf
 
 # Quick and dirty deb packages

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',
+        url='https://github.com/patacrep/patacrep',
-        packages=['songbook_core'],
+        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',

songbook

@@ -12,9 +12,9 @@ import os.path
 import textwrap
 import sys
 
-from songbook_core.build import SongbookBuilder, DEFAULT_STEPS
+from patacrep.build import SongbookBuilder, DEFAULT_STEPS
-from songbook_core import __STR_VERSION__
+from patacrep import __STR_VERSION__
-from songbook_core import errors
+from patacrep import errors
 
 # Logging configuration
 logging.basicConfig(level=logging.INFO)