From 2effacc8524df267e4eeab639a7f94066a297b30 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:56:56 +0000 Subject: [PATCH] lilypond-0.1.1 --- bin/make_patch | 57 ---------------------------- lily/groupregs.cc | 0 lily/wordwrap.cc | 94 ----------------------------------------------- 3 files changed, 151 deletions(-) delete mode 100755 bin/make_patch delete mode 100644 lily/groupregs.cc delete mode 100644 lily/wordwrap.cc diff --git a/bin/make_patch b/bin/make_patch deleted file mode 100755 index 4c98e9f35a..0000000000 --- a/bin/make_patch +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -case $# in -0) echo make_patch old new name - exit 1;; -esac - -old=$1 -new=$2 -nm=$3- - -newarc=../releases/$nm$new.tar.gz -oldarc=../releases/$nm$old.tar.gz - - -if [ ! -x $nm$new ] -then - echo untarring .. - if [ ! -f $newarc ] - then - echo cant find $newarc - exit - fi - tar zfx $newarc -fi -if [ ! -x $nm$old ] -then - echo untarring - - if [ ! -f $oldarc ] - then - echo cant find $oldarc - exit - fi - tar zfx $oldarc -fi - -# not interested in auto generated files. -for a in lilypond.lsm INSTALL.text AUTHORS.text lilypond.spec configure; do - rm `find $nm$old $nm$new -name $a` -done - -cat < patch-$new -Generated with - - make_patch $1 $2 $3 - -usage - - cd lilypond-source-dir; patch -E -p0 < patch-$new - -Patches do not contain automatically generated files, -i.e. you should rerun configure -EOF - -(cd $nm$new; diff -urN ../$nm$old . >> ../patch-$new) -rm -rf $nm$old $nm$new diff --git a/lily/groupregs.cc b/lily/groupregs.cc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/wordwrap.cc b/lily/wordwrap.cc deleted file mode 100644 index 7d25bb9e94..0000000000 --- a/lily/wordwrap.cc +++ /dev/null @@ -1,94 +0,0 @@ -/* - wordwrap.cc -- implement Word_wrap - - source file of the LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "word-wrap.hh" -#include "p-score.hh" -#include "debug.hh" -#include "p-col.hh" -#include "spring-spacer.hh" - - -/** el stupido. This should be done more accurately: - - It would be nice to have a Dynamic Programming type of algorithm - similar to TeX's - - */ -Array -Word_wrap::do_solve()const -{ - problem_OK(); - iter_top(pscore_l_->col_p_list_,curcol); - Array breaking; - Line_of_cols breakpoints(find_breaks()); - assert(breakpoints.size()>=2); - - int break_idx_i=0; - while ( break_idx_i < breakpoints.size() -1) { - Col_hpositions minimum; - Col_hpositions current; - - // do another line - PCol *post = breakpoints[break_idx_i]->postbreak_p_; - current.add( post); - curcol++; // skip the breakable. - break_idx_i++; - - while (break_idx_i < breakpoints.size()) { - - // add another measure. - while (breakpoints[break_idx_i] != curcol.ptr()){ - current.add(curcol); - curcol++; - } - current.add(breakpoints[break_idx_i]->prebreak_p_ ); - - // try to solve - if (!feasible(current.cols)) { - if (!minimum.cols.size()) { - warning("Ugh, this measure is too long, breakpoint: " - + String(break_idx_i) + - " (generating stupido solution)"); - current = stupid_solution(current.cols); - current.energy = - 1; // make sure we break out. - } else - current.energy = INFTY_f; // make sure we go back - } else { - current = solve_line(current.cols); - current.print(); - } - - // update minimum, or backup. - if (current.energy < minimum.energy || current.energy < 0) { - minimum = current; - } else { // we're one col too far. - break_idx_i--; - while (curcol.ptr() != breakpoints[break_idx_i]) - curcol --; - break; // do the next line. - } - - - // add nobreak version of breakable column - current.cols.top()=breakpoints[break_idx_i]; - curcol ++; - break_idx_i++; - } - - *mlog << "[" <