From 85008674bec48f41910096e40ee6668d3cbcbfad Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Sun, 8 May 2016 20:17:10 +0200 Subject: [PATCH 1/3] Always pass french option to babel --- patacrep/data/templates/songbook/songs.tex | 1 + test/test_book/content.tex.control | 1 + test/test_book/datadir.tex.control | 1 + test/test_book/lang_default.tex.control | 1 + test/test_book/lang_en.tex.control | 1 + test/test_book/lang_fr.tex.control | 1 + test/test_book/languages.tex.control | 1 + test/test_book/onthefly/content.onthefly.tex.control | 1 + test/test_book/special.tex.control | 1 + test/test_book/syntax.tex.control | 1 + test/test_book/unicode.tex.control | 1 + 11 files changed, 11 insertions(+) diff --git a/patacrep/data/templates/songbook/songs.tex b/patacrep/data/templates/songbook/songs.tex index 50e23ec4..ec947b60 100644 --- a/patacrep/data/templates/songbook/songs.tex +++ b/patacrep/data/templates/songbook/songs.tex @@ -30,6 +30,7 @@ (* block songbookpreambule *) (( super() )) +\PassOptionsToPackage{french}{babel} (* for lang in _langs|sort -*) \PassOptionsToPackage{(( lang | lang2babel ))}{babel} (* endfor *) diff --git a/test/test_book/content.tex.control b/test/test_book/content.tex.control index 38a79074..81b62e06 100644 --- a/test/test_book/content.tex.control +++ b/test/test_book/content.tex.control @@ -33,6 +33,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} diff --git a/test/test_book/datadir.tex.control b/test/test_book/datadir.tex.control index 687a6096..af6f4f83 100644 --- a/test/test_book/datadir.tex.control +++ b/test/test_book/datadir.tex.control @@ -35,6 +35,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} diff --git a/test/test_book/lang_default.tex.control b/test/test_book/lang_default.tex.control index 40391656..d4cc59b0 100644 --- a/test/test_book/lang_default.tex.control +++ b/test/test_book/lang_default.tex.control @@ -42,6 +42,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \usepackage[english]{babel} \lang{english} diff --git a/test/test_book/lang_en.tex.control b/test/test_book/lang_en.tex.control index 55573ddd..0abeb1a8 100644 --- a/test/test_book/lang_en.tex.control +++ b/test/test_book/lang_en.tex.control @@ -42,6 +42,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \usepackage[english]{babel} \lang{english} diff --git a/test/test_book/lang_fr.tex.control b/test/test_book/lang_fr.tex.control index aca45a48..0e78844c 100644 --- a/test/test_book/lang_fr.tex.control +++ b/test/test_book/lang_fr.tex.control @@ -42,6 +42,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \usepackage[french]{babel} \lang{french} diff --git a/test/test_book/languages.tex.control b/test/test_book/languages.tex.control index a1cfa123..fd31893e 100644 --- a/test/test_book/languages.tex.control +++ b/test/test_book/languages.tex.control @@ -34,6 +34,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \PassOptionsToPackage{spanish}{babel} \PassOptionsToPackage{french}{babel} diff --git a/test/test_book/onthefly/content.onthefly.tex.control b/test/test_book/onthefly/content.onthefly.tex.control index 3ee52e2e..b9041eb7 100644 --- a/test/test_book/onthefly/content.onthefly.tex.control +++ b/test/test_book/onthefly/content.onthefly.tex.control @@ -32,6 +32,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} diff --git a/test/test_book/special.tex.control b/test/test_book/special.tex.control index 8f7d845a..0dbd9614 100644 --- a/test/test_book/special.tex.control +++ b/test/test_book/special.tex.control @@ -43,6 +43,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} \lang{english} diff --git a/test/test_book/syntax.tex.control b/test/test_book/syntax.tex.control index af7acb06..a7518d1d 100644 --- a/test/test_book/syntax.tex.control +++ b/test/test_book/syntax.tex.control @@ -34,6 +34,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} \lang{english} diff --git a/test/test_book/unicode.tex.control b/test/test_book/unicode.tex.control index 38ce6118..5968244d 100644 --- a/test/test_book/unicode.tex.control +++ b/test/test_book/unicode.tex.control @@ -34,6 +34,7 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} \lang{english} From a5be3647b387a2cc702e7e78ad544676975e7f0e Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Sun, 8 May 2016 20:32:53 +0200 Subject: [PATCH 2/3] Add german support --- patacrep/latex/__init__.py | 4 +- test/test_book/lang_de.tex.control | 132 +++++++++++++++++++++++++++++ test/test_book/lang_de.yaml | 5 ++ 3 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 test/test_book/lang_de.tex.control create mode 100644 test/test_book/lang_de.yaml diff --git a/patacrep/latex/__init__.py b/patacrep/latex/__init__.py index d2a57fc8..34954a15 100644 --- a/patacrep/latex/__init__.py +++ b/patacrep/latex/__init__.py @@ -16,7 +16,7 @@ LOGGER = logging.getLogger(__name__) DEFAULT_LANGUAGE = "en_us" BABEL_LANGUAGES = OrderedDict(( - ('de_de', 'german'), + ('de_de', 'ngerman'), # german (old), germanb (like german) ('de_at', 'austrian'), ('eo_uy', 'esperanto'), ('en_us', 'english'), # USenglish, american @@ -53,8 +53,6 @@ BABEL_LANGUAGES = OrderedDict(( # ('??_??', 'finnish'), # ('??_??', 'acadian'), # ('??_??', 'galician'), - # ('??_??', 'germanb'), - # ('??_??', 'ngerman'), # ('??_??', 'naustrian'), # ('??_??', 'greek'), # ('??_??', 'polutonikogreek'), diff --git a/test/test_book/lang_de.tex.control b/test/test_book/lang_de.tex.control new file mode 100644 index 00000000..9e2feae1 --- /dev/null +++ b/test/test_book/lang_de.tex.control @@ -0,0 +1,132 @@ + + + + + + +%% Automatically generated document. +%% You may edit this file but all changes will be overwritten. +%% If you want to change this document, have a look at +%% the templating system. +%% +%% Generated using Songbook + +\makeatletter +\def\input@path{ % + {@TEST_FOLDER@/templates/styles/} % + {@DATA_FOLDER@/templates/styles/} % +} +\makeatother + +\documentclass[ + ]{article} + +\usepackage[ +chorded, +pictures, +repeatchords, +importantdiagramonly, +diagrampage, +guitar, + ]{crepbook} + +\usepackage[ + a4paper % paper size + ,includeheadfoot % include header and footer into text size + ,hmarginratio=1:1 % ratio between inner and outer margin (default) + ,outer=1.8cm % outer margin (right) + ,vmarginratio=1:1 % ratio between top and bottom margin + ,bmargin=1.3cm % bottom margin + ]{geometry} + +\usepackage{lmodern} + + +\PassOptionsToPackage{french}{babel} +\usepackage[ngerman]{babel} +\lang{ngerman} + +\usepackage{graphicx} +\graphicspath{ % + {@TEST_FOLDER@/} % + {@DATA_FOLDER@/} % +} + + +\makeatletter +\@ifpackageloaded{hyperref}{}{ + \usepackage{url} + \newcommand{\phantomsection}{} + \newcommand{\hyperlink}[2]{#2} + \newcommand{\href}[2]{\expandafter\url\expandafter{#1}} +} +\makeatother + + +\usepackage{chords} + +\title{Guitar songbook} +\author{The Patacrep Team} + +\newindex{titleidx}{lang_de_title} +\newauthorindex{authidx}{lang_de_auth} + +\authignoreword{unknown} +\authbyword{by} +\authsepword{and} + +\notenamesout{A}{B}{C}{D}{E}{F}{G} + + +\pagestyle{empty}\definecolor{SongNumberBgColor}{HTML}{D1E4AE} +\definecolor{NoteBgColor}{HTML}{D1E4AE} +\definecolor{IndexBgColor}{HTML}{D1E4AE} + +\renewcommand{\snumbgcolor}{SongNumberBgColor} +\renewcommand{\notebgcolor}{NoteBgColor} +\renewcommand{\idxbgcolor}{IndexBgColor} + +\definecolor{tango-green-3}{HTML}{4e9a06} +\definecolor{tango-blue-3}{HTML}{204a87} +\usepackage[ + bookmarks, + bookmarksopen, + hyperfigures=true, + colorlinks=true, + linkcolor=tango-green-3, + urlcolor=tango-blue-3 + ]{hyperref} + + +\subtitle{} +\mail{crep@team-on-fire.com} +\web{http://www.patacrep.com} +\picture{img/treble_a} +\picturecopyright{Dbolton \url{http://commons.wikimedia.org/wiki/User:Dbolton}} +\footer{Generated using Songbook (\url{http://www.patacrep.com})} + + +\begin{document} + +\maketitle + + +\showindex{\songindexname}{titleidx} +\showindex{\authorindexname}{authidx} + +% list of chords +\ifdiagrampage + \phantomsection + \addcontentsline{toc}{section}{\chordlistname} + \chords +\fi +\setcounter{songnum}{1}% + +\phantomsection +\addcontentsline{toc}{section}{\songlistname} + + + + + +\end{document} diff --git a/test/test_book/lang_de.yaml b/test/test_book/lang_de.yaml new file mode 100644 index 00000000..12ba0364 --- /dev/null +++ b/test/test_book/lang_de.yaml @@ -0,0 +1,5 @@ +book: + lang: de + +content: + - sort: \ No newline at end of file From 53d0c29ab53f9de9b1355b9352efb4dd7df6fd5c Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Sun, 8 May 2016 23:09:23 +0200 Subject: [PATCH 3/3] More elegant bugfix --- patacrep/data/templates/songbook/songs.tex | 1 - patacrep/data/templates/styles/patacrep.sty | 8 ++++++-- test/test_book/content.tex.control | 1 - test/test_book/datadir.tex.control | 1 - test/test_book/lang_de.tex.control | 1 - test/test_book/lang_default.tex.control | 1 - test/test_book/lang_en.tex.control | 1 - test/test_book/lang_fr.tex.control | 1 - test/test_book/languages.tex.control | 1 - test/test_book/onthefly/content.onthefly.tex.control | 1 - test/test_book/special.tex.control | 1 - test/test_book/syntax.tex.control | 1 - test/test_book/unicode.tex.control | 1 - 13 files changed, 6 insertions(+), 14 deletions(-) diff --git a/patacrep/data/templates/songbook/songs.tex b/patacrep/data/templates/songbook/songs.tex index ec947b60..50e23ec4 100644 --- a/patacrep/data/templates/songbook/songs.tex +++ b/patacrep/data/templates/songbook/songs.tex @@ -30,7 +30,6 @@ (* block songbookpreambule *) (( super() )) -\PassOptionsToPackage{french}{babel} (* for lang in _langs|sort -*) \PassOptionsToPackage{(( lang | lang2babel ))}{babel} (* endfor *) diff --git a/patacrep/data/templates/styles/patacrep.sty b/patacrep/data/templates/styles/patacrep.sty index 8b88af75..1712cd90 100644 --- a/patacrep/data/templates/styles/patacrep.sty +++ b/patacrep/data/templates/styles/patacrep.sty @@ -400,7 +400,9 @@ \renewcommand{\textnote}[2][]{% \vspace{.1cm} \IfStrEq{}{#1}{\@textnoteold{#2}}{ - \iflanguage{#1}{\@textnoteold{#2}}{} + \IfStrEq{\mainlanguage}{#1}{ + \@textnoteold{#2} + }{} } } @@ -408,7 +410,9 @@ \renewcommand{\musicnote}[2][]{% \vspace{.1cm} \IfStrEq{}{#1}{\@musicnoteold{#2}}{ - \iflanguage{#1}{\@musicnoteold{#2}}{} + \IfStrEq{\mainlanguage}{#1}{ + \@musicnoteold{#2} + }{} } } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/test/test_book/content.tex.control b/test/test_book/content.tex.control index 81b62e06..38a79074 100644 --- a/test/test_book/content.tex.control +++ b/test/test_book/content.tex.control @@ -33,7 +33,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} diff --git a/test/test_book/datadir.tex.control b/test/test_book/datadir.tex.control index af6f4f83..687a6096 100644 --- a/test/test_book/datadir.tex.control +++ b/test/test_book/datadir.tex.control @@ -35,7 +35,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} diff --git a/test/test_book/lang_de.tex.control b/test/test_book/lang_de.tex.control index 9e2feae1..5ed6126b 100644 --- a/test/test_book/lang_de.tex.control +++ b/test/test_book/lang_de.tex.control @@ -42,7 +42,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \usepackage[ngerman]{babel} \lang{ngerman} diff --git a/test/test_book/lang_default.tex.control b/test/test_book/lang_default.tex.control index d4cc59b0..40391656 100644 --- a/test/test_book/lang_default.tex.control +++ b/test/test_book/lang_default.tex.control @@ -42,7 +42,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \usepackage[english]{babel} \lang{english} diff --git a/test/test_book/lang_en.tex.control b/test/test_book/lang_en.tex.control index 0abeb1a8..55573ddd 100644 --- a/test/test_book/lang_en.tex.control +++ b/test/test_book/lang_en.tex.control @@ -42,7 +42,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \usepackage[english]{babel} \lang{english} diff --git a/test/test_book/lang_fr.tex.control b/test/test_book/lang_fr.tex.control index 0e78844c..aca45a48 100644 --- a/test/test_book/lang_fr.tex.control +++ b/test/test_book/lang_fr.tex.control @@ -42,7 +42,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \usepackage[french]{babel} \lang{french} diff --git a/test/test_book/languages.tex.control b/test/test_book/languages.tex.control index fd31893e..a1cfa123 100644 --- a/test/test_book/languages.tex.control +++ b/test/test_book/languages.tex.control @@ -34,7 +34,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \PassOptionsToPackage{spanish}{babel} \PassOptionsToPackage{french}{babel} diff --git a/test/test_book/onthefly/content.onthefly.tex.control b/test/test_book/onthefly/content.onthefly.tex.control index b9041eb7..3ee52e2e 100644 --- a/test/test_book/onthefly/content.onthefly.tex.control +++ b/test/test_book/onthefly/content.onthefly.tex.control @@ -32,7 +32,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} diff --git a/test/test_book/special.tex.control b/test/test_book/special.tex.control index 0dbd9614..8f7d845a 100644 --- a/test/test_book/special.tex.control +++ b/test/test_book/special.tex.control @@ -43,7 +43,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} \lang{english} diff --git a/test/test_book/syntax.tex.control b/test/test_book/syntax.tex.control index a7518d1d..af7acb06 100644 --- a/test/test_book/syntax.tex.control +++ b/test/test_book/syntax.tex.control @@ -34,7 +34,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} \lang{english} diff --git a/test/test_book/unicode.tex.control b/test/test_book/unicode.tex.control index 5968244d..38ce6118 100644 --- a/test/test_book/unicode.tex.control +++ b/test/test_book/unicode.tex.control @@ -34,7 +34,6 @@ guitar, \usepackage{lmodern} -\PassOptionsToPackage{french}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} \lang{english}