|  | @@ -3,7 +3,7 @@ import {StaffLine} from "./StaffLine";
 | 
	
		
			
				|  |  |  import {GraphicalMusicSheet} from "./GraphicalMusicSheet";
 | 
	
		
			
				|  |  |  import {EngravingRules} from "./EngravingRules";
 | 
	
		
			
				|  |  |  import {Tie} from "../VoiceData/Tie";
 | 
	
		
			
				|  |  | -import {Fraction} from "../../Common/DataObjects/fraction";
 | 
	
		
			
				|  |  | +import {Fraction} from "../../Common/DataObjects/Fraction";
 | 
	
		
			
				|  |  |  import {Note} from "../VoiceData/Note";
 | 
	
		
			
				|  |  |  import {MusicSheet} from "../MusicSheet";
 | 
	
		
			
				|  |  |  import {StaffMeasure} from "./StaffMeasure";
 | 
	
	
		
			
				|  | @@ -13,7 +13,7 @@ import {SourceMeasure} from "../VoiceData/SourceMeasure";
 | 
	
		
			
				|  |  |  import {GraphicalMusicPage} from "./GraphicalMusicPage";
 | 
	
		
			
				|  |  |  import {GraphicalNote} from "./GraphicalNote";
 | 
	
		
			
				|  |  |  import {Beam} from "../VoiceData/Beam";
 | 
	
		
			
				|  |  | -import {OctaveEnum} from "../VoiceData/Expressions/ContinuousExpressions/octaveShift";
 | 
	
		
			
				|  |  | +import {OctaveEnum} from "../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
 | 
	
		
			
				|  |  |  import {LyricsEntry} from "../VoiceData/Lyrics/LyricsEntry";
 | 
	
		
			
				|  |  |  import {VoiceEntry} from "../VoiceData/VoiceEntry";
 | 
	
		
			
				|  |  |  import {OrnamentContainer} from "../VoiceData/OrnamentContainer";
 | 
	
	
		
			
				|  | @@ -22,10 +22,10 @@ import {Tuplet} from "../VoiceData/Tuplet";
 | 
	
		
			
				|  |  |  import {MusicSystem} from "./MusicSystem";
 | 
	
		
			
				|  |  |  import {GraphicalTie} from "./GraphicalTie";
 | 
	
		
			
				|  |  |  import {RepetitionInstruction} from "../VoiceData/Instructions/RepetitionInstruction";
 | 
	
		
			
				|  |  | -import {MultiExpression} from "../VoiceData/Expressions/multiExpression";
 | 
	
		
			
				|  |  | +import {MultiExpression} from "../VoiceData/Expressions/MultiExpression";
 | 
	
		
			
				|  |  |  import {StaffEntryLink} from "../VoiceData/StaffEntryLink";
 | 
	
		
			
				|  |  |  import {MusicSystemBuilder} from "./MusicSystemBuilder";
 | 
	
		
			
				|  |  | -import {MultiTempoExpression} from "../VoiceData/Expressions/multiTempoExpression";
 | 
	
		
			
				|  |  | +import {MultiTempoExpression} from "../VoiceData/Expressions/MultiTempoExpression";
 | 
	
		
			
				|  |  |  import {Repetition} from "../MusicSource/Repetition";
 | 
	
		
			
				|  |  |  import {PointF2D} from "../../Common/DataObjects/PointF2D";
 | 
	
		
			
				|  |  |  import {SourceStaffEntry} from "../VoiceData/SourceStaffEntry";
 | 
	
	
		
			
				|  | @@ -38,7 +38,7 @@ import {KeyInstruction} from "../VoiceData/Instructions/KeyInstruction";
 | 
	
		
			
				|  |  |  import {AbstractNotationInstruction} from "../VoiceData/Instructions/AbstractNotationInstruction";
 | 
	
		
			
				|  |  |  import {ClefEnum} from "../VoiceData/Instructions/ClefInstruction";
 | 
	
		
			
				|  |  |  import {TechnicalInstruction} from "../VoiceData/Instructions/TechnicalInstruction";
 | 
	
		
			
				|  |  | -import {Pitch} from "../../Common/DataObjects/pitch";
 | 
	
		
			
				|  |  | +import {Pitch} from "../../Common/DataObjects/Pitch";
 | 
	
		
			
				|  |  |  import {LinkedVoice} from "../VoiceData/LinkedVoice";
 | 
	
		
			
				|  |  |  import {ColDirEnum} from "./BoundingBox";
 | 
	
		
			
				|  |  |  import {IGraphicalSymbolFactory} from "../Interfaces/IGraphicalSymbolFactory";
 | 
	
	
		
			
				|  | @@ -48,10 +48,10 @@ import {OctaveShiftParams} from "./OctaveShiftParams";
 | 
	
		
			
				|  |  |  import {AccidentalCalculator} from "./AccidentalCalculator";
 | 
	
		
			
				|  |  |  import {MidiInstrument} from "../VoiceData/Instructions/ClefInstruction";
 | 
	
		
			
				|  |  |  import {Staff} from "../VoiceData/Staff";
 | 
	
		
			
				|  |  | -import {OctaveShift} from "../VoiceData/Expressions/ContinuousExpressions/octaveShift";
 | 
	
		
			
				|  |  | +import {OctaveShift} from "../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
 | 
	
		
			
				|  |  |  import {Logging} from "../../Common/Logging";
 | 
	
		
			
				|  |  |  import Dictionary from "typescript-collections/dist/lib/Dictionary";
 | 
	
		
			
				|  |  | -import {CollectionUtil} from "../../Util/collectionUtil";
 | 
	
		
			
				|  |  | +import {CollectionUtil} from "../../Util/CollectionUtil";
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  export abstract class MusicSheetCalculator {
 | 
	
		
			
				|  |  |      public static transposeCalculator: ITransposeCalculator;
 |