From b906f1aeb7ed444f58d082b7bc382efc0ec57fc7 Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Tue, 17 Jan 2012 21:08:07 -0500 Subject: [PATCH 1/1] lilypond-book: Group line-width settings together (issue 2222). The line-width is adjusted to add some padding. However we can only do so if the line-width was defined. So the code for adjusting the line-width is tied to the definition of line-width. --- python/book_snippets.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/python/book_snippets.py b/python/book_snippets.py index 7e5e946863..127453d6af 100644 --- a/python/book_snippets.py +++ b/python/book_snippets.py @@ -109,11 +109,19 @@ snippet_options = { }, ## + # TODO: Remove the 1mm additional padding in the line-width + # once lilypond creates tighter cropped images! PAPER: { PAPERSIZE: r'''#(set-paper-size "%(papersize)s")''', INDENT: r'''indent = %(indent)s''', - LINE_WIDTH: r'''line-width = %(line-width)s''', - QUOTE: r'''line-width = %(line-width)s - 2.0 * %(exampleindent)s''', + LINE_WIDTH: r'''line-width = %(line-width)s + %% offset the left padding, also add 1mm as lilypond creates cropped + %% images with a little space on the right + line-width = #(- line-width (* mm %(padding_mm)f) (* mm 1))''', + QUOTE: r'''line-width = %(line-width)s - 2.0 * %(exampleindent)s + %% offset the left padding, also add 1mm as lilypond creates cropped + %% images with a little space on the right + line-width = #(- line-width (* mm %(padding_mm)f) (* mm 1))''', RAGGED_RIGHT: r'''ragged-right = ##t''', NORAGGED_RIGHT: r'''ragged-right = ##f''', }, @@ -164,8 +172,6 @@ def classic_lilypond_book_compatibility (key, value): return (None, None) -# TODO: Remove the 1mm additional padding in the line-width, once lilypond -# creates tighter cropped images! PREAMBLE_LY = '''%%%% Generated by %(program_name)s %%%% Options: [%(option_string)s] \\include "lilypond-book-preamble.ly" @@ -179,9 +185,6 @@ PREAMBLE_LY = '''%%%% Generated by %(program_name)s \paper { %(paper_string)s - %% offset the left padding, also add 1mm as lilypond creates cropped - %% images with a little space on the right - line-width = #(- line-width (* mm %(padding_mm)f) (* mm 1)) } \layout { @@ -500,6 +503,7 @@ class LilypondSnippet (Snippet): override[EXAMPLEINDENT] = r'0.4\in' override[LINE_WIDTH] = '5\\in' override.update (self.formatter.default_snippet_options) + override['padding_mm'] = self.global_options.padding_mm option_string = ','.join (self.get_outputrelevant_option_strings ()) compose_dict = {} -- 2.39.2