hendrik
/
patacrep
mirror of https://github.com/patacrep/patacrep.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Generated LaTeX file contains nicer spaces 

No weird indentation, no trailing whitespaces, no long long paragraph breaks (one line or two are sufficient), etc.
pull/79/head
Louis 10 years ago
parent
47e4f96099
commit
ea1b382f5f
9 changed files with 229 additions and 217 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      patacrep/data/examples/example-all.sb
  2. 63
      patacrep/data/templates/default.tex
  3. 44
      patacrep/data/templates/layout.tex
  4. 63
      patacrep/data/templates/patacrep.tex
  5. 53
      patacrep/data/templates/songs.tex
  6. 7
      patacrep/songs/chordpro/data/latex/chordpro.tex
  7. 4
      patacrep/songs/chordpro/data/latex/content_line.tex
  8. 3
      patacrep/songs/chordpro/data/latex/content_verse.tex
  9. 8
      patacrep/templates.py

1
patacrep/data/examples/example-all.sb
View File

@ -6,6 +6,7 @@
"pictures" "pictures"
], ],
"booktype" : "chorded", "booktype" : "chorded",
"template" : "patacrep.tex",
"lang" : "french", "lang" : "french",
"encoding": "utf8", "encoding": "utf8",
"authwords" : { "authwords" : {

63
patacrep/data/templates/default.tex
View File

@ -1,23 +1,22 @@
%! Copyright (C) 2014 The Patacrep team (www.patacrep.com) %!- Copyright (C) 2014 The Patacrep team (www.patacrep.com)
%! %!-
%! This program is free software; you can redistribute it and/or %!- This program is free software; you can redistribute it and/or
%! modify it under the terms of the GNU General Public License %!- modify it under the terms of the GNU General Public License
%! as published by the Free Software Foundation; either version 2 %!- as published by the Free Software Foundation; either version 2
%! of the License, or (at your option) any later version. %!- of the License, or (at your option) any later version.
%! %!-
%! This program is distributed in the hope that it will be useful, %!- This program is distributed in the hope that it will be useful,
%! but WITHOUT ANY WARRANTY; without even the implied warranty of %!- but WITHOUT ANY WARRANTY; without even the implied warranty of
%! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %!- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
%! GNU General Public License for more details. %!- GNU General Public License for more details.
%! %!-
%! You should have received a copy of the GNU General Public License %!- You should have received a copy of the GNU General Public License
%! along with this program; if not, write to the Free Software %!- along with this program; if not, write to the Free Software
%! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, %!- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
%! MA 02110-1301, USA. %!- MA 02110-1301, USA.
%! %!-
%! The latest version of this program can be obtained from %!- The latest version of this program can be obtained from
%! https://github.com/patacrep/ %!- https://github.com/patacrep/
(* variables *) (* variables *)
{ {
@ -40,15 +39,17 @@
"default": {"default": "alphascale", "french": "solfedge"} "default": {"default": "alphascale", "french": "solfedge"}
} }
} }
(* endvariables *) (* endvariables -*)
(* extends "songs.tex" *) (*- extends "songs.tex" -*)
(* set indexes = "titleidx,authidx" *) (*- set indexes = "titleidx,authidx" -*)
(* block documentclass *) (* block documentclass *)
\documentclass[(* for option in classoptions *) \documentclass[
(* for option in classoptions *)
((option)), ((option)),
(* endfor *)]{article} (* endfor *)
]{article}
(* endblock *) (* endblock *)
@ -63,22 +64,22 @@
\newindex{titleidx}{((filename))_title} \newindex{titleidx}{((filename))_title}
\newauthorindex{authidx}{((filename))_auth} \newauthorindex{authidx}{((filename))_auth}
(* for prefix in titleprefixwords *) (* for prefix in titleprefixwords -*)
\titleprefixword{((prefix))} \titleprefixword{((prefix))}
(* endfor*) (* endfor*)
(* for word in authwords.ignore *) (* for word in authwords.ignore -*)
\authignoreword{((word))} \authignoreword{((word))}
(* endfor *) (* endfor *)
(* for word in authwords.after *) (* for word in authwords.after -*)
\authbyword{((word))} \authbyword{((word))}
(* endfor *) (* endfor *)
(* for word in authwords.sep *) (* for word in authwords.sep -*)
\authsepword{((word))} \authsepword{((word))}
(* endfor *) (* endfor *)
(* if notenamesout=="alphascale" *) (* if notenamesout=="alphascale" -*)
\notenamesout{A}{B}{C}{D}{E}{F}{G} \notenamesout{A}{B}{C}{D}{E}{F}{G}
(* else *) (* else -*)
\notenamesout{La}{Si}{Do}{R\'e}{Mi}{Fa}{Sol} \notenamesout{La}{Si}{Do}{R\'e}{Mi}{Fa}{Sol}
(* endif *) (* endif *)
(* endblock *) (* endblock *)

44
patacrep/data/templates/layout.tex
View File

@ -1,23 +1,22 @@
%! Copyright (C) 2014 The Patacrep team (www.patacrep.com) %!- Copyright (C) 2014 The Patacrep team (www.patacrep.com)
%! %!-
%! This program is free software; you can redistribute it and/or %!- This program is free software; you can redistribute it and/or
%! modify it under the terms of the GNU General Public License %!- modify it under the terms of the GNU General Public License
%! as published by the Free Software Foundation; either version 2 %!- as published by the Free Software Foundation; either version 2
%! of the License, or (at your option) any later version. %!- of the License, or (at your option) any later version.
%! %!-
%! This program is distributed in the hope that it will be useful, %!- This program is distributed in the hope that it will be useful,
%! but WITHOUT ANY WARRANTY; without even the implied warranty of %!- but WITHOUT ANY WARRANTY; without even the implied warranty of
%! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %!- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
%! GNU General Public License for more details. %!- GNU General Public License for more details.
%! %!-
%! You should have received a copy of the GNU General Public License %!- You should have received a copy of the GNU General Public License
%! along with this program; if not, write to the Free Software %!- along with this program; if not, write to the Free Software
%! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, %!- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
%! MA 02110-1301, USA. %!- MA 02110-1301, USA.
%! %!-
%! The latest version of this program can be obtained from %!- The latest version of this program can be obtained from
%! https://github.com/patacrep/ %!- https://github.com/patacrep/
%% Automatically generated document. %% Automatically generated document.
%% You may edit this file but all changes will be overwritten. %% You may edit this file but all changes will be overwritten.
@ -27,7 +26,8 @@
%% Generated using Songbook <http://www.patacrep.com> %% Generated using Songbook <http://www.patacrep.com>
\makeatletter \makeatletter
\def\input@path{(* for dir in datadir *) \def\input@path{ %
(* for dir in datadir *)
{(( path2posix(dir) ))/latex/} % {(( path2posix(dir) ))/latex/} %
(* endfor *) (* endfor *)
} }
@ -71,4 +71,4 @@
\end{document} \end{document}
%! End of file %!- End of file

63
patacrep/data/templates/patacrep.tex
View File

@ -1,23 +1,22 @@
%! Copyright (C) 2014 The Patacrep team (www.patacrep.com) %!- Copyright (C) 2014 The Patacrep team (www.patacrep.com)
%! %!-
%! This program is free software; you can redistribute it and/or %!- This program is free software; you can redistribute it and/or
%! modify it under the terms of the GNU General Public License %!- modify it under the terms of the GNU General Public License
%! as published by the Free Software Foundation; either version 2 %!- as published by the Free Software Foundation; either version 2
%! of the License, or (at your option) any later version. %!- of the License, or (at your option) any later version.
%! %!-
%! This program is distributed in the hope that it will be useful, %!- This program is distributed in the hope that it will be useful,
%! but WITHOUT ANY WARRANTY; without even the implied warranty of %!- but WITHOUT ANY WARRANTY; without even the implied warranty of
%! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %!- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
%! GNU General Public License for more details. %!- GNU General Public License for more details.
%! %!-
%! You should have received a copy of the GNU General Public License %!- You should have received a copy of the GNU General Public License
%! along with this program; if not, write to the Free Software %!- along with this program; if not, write to the Free Software
%! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, %!- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
%! MA 02110-1301, USA. %!- MA 02110-1301, USA.
%! %!-
%! The latest version of this program can be obtained from %!- The latest version of this program can be obtained from
%! https://github.com/patacrep/ %!- https://github.com/patacrep/
(* variables *) (* variables *)
{ {
@ -61,17 +60,21 @@
"Des", "El", "Les", "Ma", "Mon", "Un"]} "Des", "El", "Les", "Ma", "Mon", "Un"]}
} }
} }
(* endvariables *) (* endvariables -*)
(* extends "default.tex" *) (*- extends "default.tex" -*)
(* block songbookpackages *) (* block songbookpackages *)
%! booktype, bookoptions and instruments are defined in "songs.tex" %! booktype, bookoptions and instruments are defined in "songs.tex"
\usepackage[((booktype)), \usepackage[
(* for option in bookoptions *)((option)), ((booktype)),
(* for option in bookoptions *)
((option)),
(* endfor *) (* endfor *)
(* for instrument in instruments *)((instrument)), (* for instrument in instruments *)
(* endfor *)]{crepbook} ((instrument)),
(* endfor *)
]{crepbook}
(* endblock *) (* endblock *)
(* block songbookpreambule *) (* block songbookpreambule *)
@ -98,16 +101,18 @@
\definecolor{tango-green-3}{HTML}{4e9a06} \definecolor{tango-green-3}{HTML}{4e9a06}
\definecolor{tango-blue-3}{HTML}{204a87} \definecolor{tango-blue-3}{HTML}{204a87}
\usepackage[bookmarks, \usepackage[
bookmarks,
bookmarksopen, bookmarksopen,
hyperfigures=true, hyperfigures=true,
colorlinks=true, colorlinks=true,
linkcolor=tango-green-3, linkcolor=tango-green-3,
urlcolor=tango-blue-3]{hyperref} urlcolor=tango-blue-3
]{hyperref}
\subtitle{((subtitle))} \subtitle{((subtitle))}
(* if version!="undefined" *) (* if version!="undefined" -*)
\version{((version))} \version{((version))}
(* endif *) (* endif *)
\mail{((mail))} \mail{((mail))}

53
patacrep/data/templates/songs.tex
View File

@ -1,22 +1,22 @@
%! Copyright (C) 2014 The Patacrep team (www.patacrep.com) %!- Copyright (C) 2014 The Patacrep team (www.patacrep.com)
%! %!-
%! This program is free software; you can redistribute it and/or %!- This program is free software; you can redistribute it and/or
%! modify it under the terms of the GNU General Public License %!- modify it under the terms of the GNU General Public License
%! as published by the Free Software Foundation; either version 2 %!- as published by the Free Software Foundation; either version 2
%! of the License, or (at your option) any later version. %!- of the License, or (at your option) any later version.
%! %!-
%! This program is distributed in the hope that it will be useful, %!- This program is distributed in the hope that it will be useful,
%! but WITHOUT ANY WARRANTY; without even the implied warranty of %!- but WITHOUT ANY WARRANTY; without even the implied warranty of
%! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the %!- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
%! GNU General Public License for more details. %!- GNU General Public License for more details.
%! %!-
%! You should have received a copy of the GNU General Public License %!- You should have received a copy of the GNU General Public License
%! along with this program; if not, write to the Free Software %!- along with this program; if not, write to the Free Software
%! Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, %!- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
%! MA 02110-1301, USA. %!- MA 02110-1301, USA.
%! %!-
%! The latest version of this program can be obtained from %!- The latest version of this program can be obtained from
%! https://github.com/patacrep/ %!- https://github.com/patacrep/
(* variables *) (* variables *)
{ {
@ -63,29 +63,32 @@
"default": {"default": {}} "default": {"default": {}}
} }
} }
(* endvariables *) (* endvariables -*)
(* extends "layout.tex" *) (*- extends "layout.tex" -*)
(* block songbookpackages *) (* block songbookpackages *)
\usepackage[((booktype)), \usepackage[
((booktype)),
(* for option in bookoptions *)((option)), (* for option in bookoptions *)((option)),
(* endfor *) (* endfor *)
(* for instrument in instruments *)((instrument)), (* for instrument in instruments *)((instrument)),
(* endfor *)]{patacrep} (* endfor *)
]{patacrep}
(* endblock *) (* endblock *)
(* block songbookpreambule *) (* block songbookpreambule *)
(( super() )) (( super() ))
(* for lang in _languages *) (* for lang in _languages -*)
\PassOptionsToPackage{((lang))}{babel} \PassOptionsToPackage{((lang))}{babel}
(* endfor *) (* endfor *)
\usepackage[((lang))]{babel} \usepackage[((lang))]{babel}
\lang{((lang))} \lang{((lang))}
\usepackage{graphicx} \usepackage{graphicx}
\graphicspath{(* for dir in datadir *) \graphicspath{ %
(* for dir in datadir *)
{(( path2posix(dir) ))/img/} % {(( path2posix(dir) ))/img/} %
(* endfor *) (* endfor *)
} }

7
patacrep/songs/chordpro/data/latex/chordpro.tex
View File

@ -1,8 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% ((path)) % ((path))
(* if language is defined *) (* if language is defined -*)
\selectlanguage{((language))} \selectlanguage{((language))}
(* endif *) (* endif *)
\songcolumns{((metadata.columns))} \songcolumns{((metadata.columns))}
@ -16,9 +17,9 @@
(* if (metadata.cov is defined) or (metadata.vcov is defined) *) (* if (metadata.cov is defined) or (metadata.vcov is defined) *)
\cover \cover
(* endif *) (* endif -*)
(* for item in content *) (* for item in content -*)
(( render(item) )) (( render(item) ))
(* endfor *) (* endfor *)

4
patacrep/songs/chordpro/data/latex/content_line.tex
View File

@ -1 +1,3 @@
(* for item in content.line *)(( render(item) ))(* endfor *) (* for item in content.line -*)
(( render(item) ))
(*- endfor *)

3
patacrep/songs/chordpro/data/latex/content_verse.tex
View File

@ -1,6 +1,5 @@
\begin{(( content.type ))} \begin{(( content.type ))}
(* for line in content.lines *) (* for line in content.lines -*)
(( render(line) )) (( render(line) ))
(* endfor *) (* endfor *)
\end{(( content.type ))} \end{(( content.type ))}

8
patacrep/templates.py
View File

@ -22,22 +22,22 @@ _LATEX_SUBS = (
_VARIABLE_REGEXP = re.compile( _VARIABLE_REGEXP = re.compile(
r""" r"""
\(\*\ *variables\ *\*\) # Match (* variables *) \(\*-?\ *variables\ *\*\) # Match (* variables *) or (*- variables *)
( # Match and capture the following: ( # Match and capture the following:
(?: # Start of non-capturing group, used to match a single character (?: # Start of non-capturing group, used to match a single character
(?! # only if it's impossible to match the following: (?! # only if it's impossible to match the following:
\(\*\ * # - a literal (* \(\*-?\ * # - a literal (* or (*-
(?: # Inner non-capturing group, used for the following alternation: (?: # Inner non-capturing group, used for the following alternation:
variables # - Either match the word variables variables # - Either match the word variables
| # or | # or
endvariables # - the word endvariables endvariables # - the word endvariables
) # End of inner non-capturing group ) # End of inner non-capturing group
\ *\*\) # - a literal *) \ *-?\*\) # - a literal *) or -*)
) # End of negative lookahead assertion ) # End of negative lookahead assertion
. # Match any single character . # Match any single character
)* # Repeat as often as possible )* # Repeat as often as possible
) # End of capturing group 1 ) # End of capturing group 1
\(\*\ *endvariables\ *\*\) # until (* endvariables *) is matched. \(\*\ *endvariables\ *-?\*\) # until (* endvariables *) or (* endvariables -*) is matched.
""", """,
re.VERBOSE|re.DOTALL) re.VERBOSE|re.DOTALL)

Write Preview
Loading…
Cancel
Save