Selaa lähdekoodia

Renaming files to reflect class names (fixes #36)

Andrea Condoluci 9 vuotta sitten
vanhempi
commit
c5e42fdfdb
96 muutettua tiedostoa jossa 163 lisäystä ja 163 poistoa
  1. 0 0
      src/Common/DataObjects/Fraction.ts
  2. 0 0
      src/Common/DataObjects/OSMDColor.ts
  3. 0 0
      src/Common/DataObjects/Pitch.ts
  4. 1 1
      src/Common/DataObjects/PointF2D.ts
  5. 1 1
      src/Common/DataObjects/RectangleF2D.ts
  6. 1 1
      src/Common/DataObjects/SizeF2D.ts
  7. 1 1
      src/MusicalScore/Graphical/AbstractGraphicalInstruction.ts
  8. 4 4
      src/MusicalScore/Graphical/AccidentalCalculator.ts
  9. 1 1
      src/MusicalScore/Graphical/BoundingBox.ts
  10. 1 1
      src/MusicalScore/Graphical/Clickable.ts
  11. 1 1
      src/MusicalScore/Graphical/DrawingEnums.ts
  12. 1 1
      src/MusicalScore/Graphical/DrawingMode.ts
  13. 1 1
      src/MusicalScore/Graphical/DrawingParameters.ts
  14. 1 1
      src/MusicalScore/Graphical/EngravingRules.ts
  15. 1 1
      src/MusicalScore/Graphical/GraphicalChordSymbolContainer.ts
  16. 1 1
      src/MusicalScore/Graphical/GraphicalComment.ts
  17. 1 1
      src/MusicalScore/Graphical/GraphicalLabel.ts
  18. 1 1
      src/MusicalScore/Graphical/GraphicalLine.ts
  19. 1 1
      src/MusicalScore/Graphical/GraphicalLyricEntry.ts
  20. 1 1
      src/MusicalScore/Graphical/GraphicalLyricWord.ts
  21. 1 1
      src/MusicalScore/Graphical/GraphicalMarkedArea.ts
  22. 1 1
      src/MusicalScore/Graphical/GraphicalMusicPage.ts
  23. 2 2
      src/MusicalScore/Graphical/GraphicalMusicSheet.ts
  24. 4 4
      src/MusicalScore/Graphical/GraphicalNote.ts
  25. 1 1
      src/MusicalScore/Graphical/GraphicalObject.ts
  26. 2 2
      src/MusicalScore/Graphical/GraphicalOctaveShift.ts
  27. 1 1
      src/MusicalScore/Graphical/GraphicalRectangle.ts
  28. 3 3
      src/MusicalScore/Graphical/GraphicalStaffEntry.ts
  29. 1 1
      src/MusicalScore/Graphical/GraphicalStaffEntryLink.ts
  30. 1 1
      src/MusicalScore/Graphical/GraphicalTie.ts
  31. 7 7
      src/MusicalScore/Graphical/MusicSheetCalculator.ts
  32. 1 1
      src/MusicalScore/Graphical/MusicSheetDrawer.ts
  33. 1 1
      src/MusicalScore/Graphical/MusicSymbol.ts
  34. 3 3
      src/MusicalScore/Graphical/MusicSystem.ts
  35. 2 2
      src/MusicalScore/Graphical/MusicSystemBuilder.ts
  36. 2 2
      src/MusicalScore/Graphical/OctaveShiftParams.ts
  37. 2 2
      src/MusicalScore/Graphical/SelectionEndSymbol.ts
  38. 2 2
      src/MusicalScore/Graphical/SelectionStartSymbol.ts
  39. 1 1
      src/MusicalScore/Graphical/StaffLine.ts
  40. 1 1
      src/MusicalScore/Graphical/StaffLineActivitySymbol.ts
  41. 1 1
      src/MusicalScore/Graphical/StaffMeasure.ts
  42. 1 1
      src/MusicalScore/Graphical/SystemLine.ts
  43. 1 1
      src/MusicalScore/Graphical/SystemLinePosition.ts
  44. 1 1
      src/MusicalScore/Graphical/SystemLinesEnum.ts
  45. 1 1
      src/MusicalScore/Graphical/VerticalGraphicalStaffEntryContainer.ts
  46. 4 4
      src/MusicalScore/Graphical/VexFlow/VexFlowConverter.ts
  47. 1 1
      src/MusicalScore/Graphical/VexFlow/VexFlowGraphicalNote.ts
  48. 3 3
      src/MusicalScore/Graphical/VexFlow/VexFlowGraphicalSymbolFactory.ts
  49. 3 3
      src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator.ts
  50. 1 1
      src/MusicalScore/Graphical/VexFlow/VexFlowStaffEntry.ts
  51. 1 1
      src/MusicalScore/Graphical/VexFlow/VexFlowStaffLine.ts
  52. 3 3
      src/MusicalScore/Interfaces/IGraphicalSymbolFactory.ts
  53. 1 1
      src/MusicalScore/Interfaces/ITextMeasurer.ts
  54. 1 1
      src/MusicalScore/Interfaces/ITransposeCalculator.ts
  55. 1 1
      src/MusicalScore/Label.ts
  56. 1 1
      src/MusicalScore/MusicParts/MusicPartManager.ts
  57. 5 5
      src/MusicalScore/MusicParts/MusicPartManagerIterator.ts
  58. 2 2
      src/MusicalScore/MusicSheet.ts
  59. 1 1
      src/MusicalScore/MusicSource/MappingSourceMusicPart.ts
  60. 1 1
      src/MusicalScore/MusicSource/PartListEntry.ts
  61. 1 1
      src/MusicalScore/MusicSource/Repetition.ts
  62. 1 1
      src/MusicalScore/MusicSource/SourceMusicPart.ts
  63. 1 1
      src/MusicalScore/ScoreIO/InstrumentReader.ts
  64. 1 1
      src/MusicalScore/ScoreIO/MusicSheetReader.ts
  65. 5 5
      src/MusicalScore/ScoreIO/VoiceGenerator.ts
  66. 2 2
      src/MusicalScore/VoiceData/ChordSymbolContainer.ts
  67. 0 0
      src/MusicalScore/VoiceData/Expressions/AbstractExpression.ts
  68. 2 2
      src/MusicalScore/VoiceData/Expressions/AbstractTempoExpression.ts
  69. 3 3
      src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/ContinuousDynamicExpression.ts
  70. 4 4
      src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/ContinuousTempoExpression.ts
  71. 1 1
      src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/OctaveShift.ts
  72. 1 1
      src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/Slur.ts
  73. 0 0
      src/MusicalScore/VoiceData/Expressions/DynamicExpressionSymbolEnum.ts
  74. 3 3
      src/MusicalScore/VoiceData/Expressions/InstantaniousDynamicExpression.ts
  75. 4 4
      src/MusicalScore/VoiceData/Expressions/InstantaniousTempoExpression.ts
  76. 1 1
      src/MusicalScore/VoiceData/Expressions/MoodExpression.ts
  77. 8 8
      src/MusicalScore/VoiceData/Expressions/MultiExpression.ts
  78. 5 5
      src/MusicalScore/VoiceData/Expressions/MultiTempoExpression.ts
  79. 1 1
      src/MusicalScore/VoiceData/Expressions/UnknownExpression.ts
  80. 3 3
      src/MusicalScore/VoiceData/HelperObjects/DynamicsContainer.ts
  81. 3 3
      src/MusicalScore/VoiceData/Instructions/ClefInstruction.ts
  82. 3 3
      src/MusicalScore/VoiceData/Instructions/KeyInstruction.ts
  83. 1 1
      src/MusicalScore/VoiceData/Instructions/RhythmInstruction.ts
  84. 2 2
      src/MusicalScore/VoiceData/Note.ts
  85. 1 1
      src/MusicalScore/VoiceData/OrnamentContainer.ts
  86. 3 3
      src/MusicalScore/VoiceData/SourceMeasure.ts
  87. 1 1
      src/MusicalScore/VoiceData/SourceStaffEntry.ts
  88. 1 1
      src/MusicalScore/VoiceData/Tie.ts
  89. 1 1
      src/MusicalScore/VoiceData/Tuplet.ts
  90. 1 1
      src/MusicalScore/VoiceData/VerticalSourceStaffEntryContainer.ts
  91. 3 3
      src/MusicalScore/VoiceData/VoiceEntry.ts
  92. 0 0
      src/Util/CollectionUtil.ts
  93. 0 0
      src/Util/PSMath.ts
  94. 1 1
      test/Common/DataObjects/Fraction.ts
  95. 1 1
      test/Common/DataObjects/Pitch.ts
  96. 1 1
      test/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetDrawer.ts

+ 0 - 0
src/Common/DataObjects/fraction.ts → src/Common/DataObjects/Fraction.ts


+ 0 - 0
src/Common/DataObjects/osmdColor.ts → src/Common/DataObjects/OSMDColor.ts


+ 0 - 0
src/Common/DataObjects/pitch.ts → src/Common/DataObjects/Pitch.ts


+ 1 - 1
src/Common/DataObjects/PointF2D.ts

@@ -1,4 +1,4 @@
-export class PointF2D {
+export class PointF2D {
     public x: number = 0;
     public y: number = 0;
 

+ 1 - 1
src/Common/DataObjects/RectangleF2D.ts

@@ -1,4 +1,4 @@
-import {SizeF2D} from "./SizeF2D";
+import {SizeF2D} from "./SizeF2D";
 import {PointF2D} from "./PointF2D";
 
 export class RectangleF2D {

+ 1 - 1
src/Common/DataObjects/SizeF2D.ts

@@ -1,4 +1,4 @@
-export class SizeF2D {
+export class SizeF2D {
     public width: number;
     public height: number;
 

+ 1 - 1
src/MusicalScore/Graphical/AbstractGraphicalInstruction.ts

@@ -1,4 +1,4 @@
-import {GraphicalStaffEntry} from "./GraphicalStaffEntry";
+import {GraphicalStaffEntry} from "./GraphicalStaffEntry";
 import {GraphicalObject} from "./GraphicalObject";
 
 export abstract class AbstractGraphicalInstruction extends GraphicalObject {

+ 4 - 4
src/MusicalScore/Graphical/AccidentalCalculator.ts

@@ -1,9 +1,9 @@
-import {IGraphicalSymbolFactory} from "../Interfaces/IGraphicalSymbolFactory";
-import {AccidentalEnum} from "../../Common/DataObjects/pitch";
+import {IGraphicalSymbolFactory} from "../Interfaces/IGraphicalSymbolFactory";
+import {AccidentalEnum} from "../../Common/DataObjects/Pitch";
 import {KeyInstruction} from "../VoiceData/Instructions/KeyInstruction";
 import {GraphicalNote} from "./GraphicalNote";
-import {Pitch} from "../../Common/DataObjects/pitch";
-import {NoteEnum} from "../../Common/DataObjects/pitch";
+import {Pitch} from "../../Common/DataObjects/Pitch";
+import {NoteEnum} from "../../Common/DataObjects/Pitch";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
 
 export class AccidentalCalculator {

+ 1 - 1
src/MusicalScore/Graphical/BoundingBox.ts

@@ -1,4 +1,4 @@
-import {ArgumentOutOfRangeException} from "../Exceptions";
+import {ArgumentOutOfRangeException} from "../Exceptions";
 import {PointF2D} from "../../Common/DataObjects/PointF2D";
 import {SizeF2D} from "../../Common/DataObjects/SizeF2D";
 import {RectangleF2D} from "../../Common/DataObjects/RectangleF2D";

+ 1 - 1
src/MusicalScore/Graphical/Clickable.ts

@@ -1,4 +1,4 @@
-import {GraphicalObject} from "./GraphicalObject";
+import {GraphicalObject} from "./GraphicalObject";
 
 export class Clickable extends GraphicalObject {
     public dataObject: Object;

+ 1 - 1
src/MusicalScore/Graphical/DrawingEnums.ts

@@ -1,4 +1,4 @@
-export enum OutlineAndFillStyleEnum {
+export enum OutlineAndFillStyleEnum {
     BaseWritingColor,
     FollowingCursor,
     AlternativeFollowingCursor,

+ 1 - 1
src/MusicalScore/Graphical/DrawingMode.ts

@@ -1,4 +1,4 @@
-export enum DrawingMode {
+export enum DrawingMode {
     All,
     NoOverlays,
     Leadsheet

+ 1 - 1
src/MusicalScore/Graphical/DrawingParameters.ts

@@ -1,4 +1,4 @@
-export class DrawingParameters {
+export class DrawingParameters {
     public drawHighlights: boolean;
     public drawErrors: boolean;
     public drawSelectionStartSymbol: boolean;

+ 1 - 1
src/MusicalScore/Graphical/EngravingRules.ts

@@ -1,4 +1,4 @@
-import {PagePlacementEnum} from "./GraphicalMusicPage";
+import {PagePlacementEnum} from "./GraphicalMusicPage";
 //import {MusicSymbol} from "./MusicSymbol";
 import {Logging} from "../../Common/Logging";
 

+ 1 - 1
src/MusicalScore/Graphical/GraphicalChordSymbolContainer.ts

@@ -1,4 +1,4 @@
-import {TextAlignment} from "../../Common/Enums/TextAlignment";
+import {TextAlignment} from "../../Common/Enums/TextAlignment";
 import {Label} from "../Label";
 import {GraphicalLabel} from "./GraphicalLabel";
 import {ChordSymbolContainer} from "../VoiceData/ChordSymbolContainer";

+ 1 - 1
src/MusicalScore/Graphical/GraphicalComment.ts

@@ -1,4 +1,4 @@
-import {GraphicalLabel} from "./GraphicalLabel";
+import {GraphicalLabel} from "./GraphicalLabel";
 export class GraphicalComment {
     constructor(label: GraphicalLabel, settingsLabel: GraphicalLabel) {
         this.label = label;

+ 1 - 1
src/MusicalScore/Graphical/GraphicalLabel.ts

@@ -1,4 +1,4 @@
-import {Label} from "../Label";
+import {Label} from "../Label";
 import {TextAlignment} from "../../Common/Enums/TextAlignment";
 import {Clickable} from "./Clickable";
 import {BoundingBox} from "./BoundingBox";

+ 1 - 1
src/MusicalScore/Graphical/GraphicalLine.ts

@@ -1,4 +1,4 @@
-import {OutlineAndFillStyleEnum} from "./DrawingEnums";
+import {OutlineAndFillStyleEnum} from "./DrawingEnums";
 import {PointF2D} from "../../Common/DataObjects/PointF2D";
 
 export class GraphicalLine {

+ 1 - 1
src/MusicalScore/Graphical/GraphicalLyricEntry.ts

@@ -1,4 +1,4 @@
-import {LyricsEntry} from "../VoiceData/Lyrics/LyricsEntry";
+import {LyricsEntry} from "../VoiceData/Lyrics/LyricsEntry";
 import {GraphicalLyricWord} from "./GraphicalLyricWord";
 import {GraphicalLabel} from "./GraphicalLabel";
 import {GraphicalStaffEntry} from "./GraphicalStaffEntry";

+ 1 - 1
src/MusicalScore/Graphical/GraphicalLyricWord.ts

@@ -1,4 +1,4 @@
-import {LyricWord} from "../VoiceData/Lyrics/LyricsWord";
+import {LyricWord} from "../VoiceData/Lyrics/LyricsWord";
 import {GraphicalLyricEntry} from "./GraphicalLyricEntry";
 
 export class GraphicalLyricWord {

+ 1 - 1
src/MusicalScore/Graphical/GraphicalMarkedArea.ts

@@ -1,4 +1,4 @@
-import {GraphicalLabel} from "./GraphicalLabel";
+import {GraphicalLabel} from "./GraphicalLabel";
 import {GraphicalRectangle} from "./GraphicalRectangle";
 export class GraphicalMarkedArea {
     constructor(systemRectangle: GraphicalRectangle, labelRectangle: GraphicalRectangle = undefined, label: GraphicalLabel = undefined,

+ 1 - 1
src/MusicalScore/Graphical/GraphicalMusicPage.ts

@@ -1,4 +1,4 @@
-import {BoundingBox} from "./BoundingBox";
+import {BoundingBox} from "./BoundingBox";
 import {GraphicalObject} from "./GraphicalObject";
 import {GraphicalLabel} from "./GraphicalLabel";
 import {MusicSystem} from "./MusicSystem";

+ 2 - 2
src/MusicalScore/Graphical/GraphicalMusicSheet.ts

@@ -12,7 +12,7 @@ import {PointF2D} from "../../Common/DataObjects/PointF2D";
 import {ClefInstruction} from "../VoiceData/Instructions/ClefInstruction";
 import {AbstractNotationInstruction} from "../VoiceData/Instructions/AbstractNotationInstruction";
 import {KeyInstruction} from "../VoiceData/Instructions/KeyInstruction";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {GraphicalNote} from "./GraphicalNote";
 import {Instrument} from "../Instrument";
 import {BoundingBox} from "./BoundingBox";
@@ -20,7 +20,7 @@ import {Note} from "../VoiceData/Note";
 import {MusicSheetCalculator} from "./MusicSheetCalculator";
 import {Logging} from "../../Common/Logging";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
-import {CollectionUtil} from "../../Util/collectionUtil";
+import {CollectionUtil} from "../../Util/CollectionUtil";
 import {SelectionStartSymbol} from "./SelectionStartSymbol";
 import {SelectionEndSymbol} from "./SelectionEndSymbol";
 import {OutlineAndFillStyleEnum} from "./DrawingEnums";

+ 4 - 4
src/MusicalScore/Graphical/GraphicalNote.ts

@@ -1,9 +1,9 @@
-import {Note} from "../VoiceData/Note";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Note} from "../VoiceData/Note";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {KeyInstruction} from "../VoiceData/Instructions/KeyInstruction";
 import {ClefInstruction} from "../VoiceData/Instructions/ClefInstruction";
-import {OctaveEnum} from "../VoiceData/Expressions/ContinuousExpressions/octaveShift";
-import {Pitch} from "../../Common/DataObjects/pitch";
+import {OctaveEnum} from "../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
+import {Pitch} from "../../Common/DataObjects/Pitch";
 import {GraphicalStaffEntry} from "./GraphicalStaffEntry";
 import {GraphicalObject} from "./GraphicalObject";
 import {MusicSheetCalculator} from "./MusicSheetCalculator";

+ 1 - 1
src/MusicalScore/Graphical/GraphicalObject.ts

@@ -1,4 +1,4 @@
-import {BoundingBox} from "./BoundingBox";
+import {BoundingBox} from "./BoundingBox";
 
 export class GraphicalObject {
     protected boundingBox: BoundingBox;

+ 2 - 2
src/MusicalScore/Graphical/GraphicalOctaveShift.ts

@@ -1,5 +1,5 @@
-import {GraphicalObject} from "./GraphicalObject";
-import {OctaveShift, OctaveEnum} from "../VoiceData/Expressions/ContinuousExpressions/octaveShift";
+import {GraphicalObject} from "./GraphicalObject";
+import {OctaveShift, OctaveEnum} from "../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
 import {BoundingBox} from "./BoundingBox";
 import {MusicSymbol} from "./MusicSymbol";
 import {ArgumentOutOfRangeException} from "../Exceptions";

+ 1 - 1
src/MusicalScore/Graphical/GraphicalRectangle.ts

@@ -1,4 +1,4 @@
-import {OutlineAndFillStyleEnum} from "./DrawingEnums";
+import {OutlineAndFillStyleEnum} from "./DrawingEnums";
 import {BoundingBox} from "./BoundingBox";
 import {PointF2D} from "../../Common/DataObjects/PointF2D";
 import {GraphicalObject} from "./GraphicalObject";

+ 3 - 3
src/MusicalScore/Graphical/GraphicalStaffEntry.ts

@@ -1,6 +1,6 @@
-import {SourceStaffEntry} from "../VoiceData/SourceStaffEntry";
+import {SourceStaffEntry} from "../VoiceData/SourceStaffEntry";
 import {BoundingBox} from "./BoundingBox";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {VerticalGraphicalStaffEntryContainer} from "./VerticalGraphicalStaffEntryContainer";
 import {Note} from "../VoiceData/Note";
 import {Slur} from "../VoiceData/Expressions/ContinuousExpressions/Slur";
@@ -15,7 +15,7 @@ import {GraphicalChordSymbolContainer} from "./GraphicalChordSymbolContainer";
 import {GraphicalLyricEntry} from "./GraphicalLyricEntry";
 import {AbstractGraphicalInstruction} from "./AbstractGraphicalInstruction";
 import {GraphicalStaffEntryLink} from "./GraphicalStaffEntryLink";
-import {CollectionUtil} from "../../Util/collectionUtil";
+import {CollectionUtil} from "../../Util/CollectionUtil";
 
 export abstract class GraphicalStaffEntry extends GraphicalObject {
     constructor(parentMeasure: StaffMeasure, sourceStaffEntry: SourceStaffEntry = undefined, staffEntryParent: GraphicalStaffEntry = undefined) {

+ 1 - 1
src/MusicalScore/Graphical/GraphicalStaffEntryLink.ts

@@ -1,4 +1,4 @@
-import {StaffEntryLink} from "../VoiceData/StaffEntryLink";
+import {StaffEntryLink} from "../VoiceData/StaffEntryLink";
 import {GraphicalStaffEntry} from "./GraphicalStaffEntry";
 import {GraphicalNote} from "./GraphicalNote";
 

+ 1 - 1
src/MusicalScore/Graphical/GraphicalTie.ts

@@ -1,4 +1,4 @@
-import {Tie} from "../VoiceData/Tie";
+import {Tie} from "../VoiceData/Tie";
 import {GraphicalNote} from "./GraphicalNote";
 
 export class GraphicalTie {

+ 7 - 7
src/MusicalScore/Graphical/MusicSheetCalculator.ts

@@ -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;

+ 1 - 1
src/MusicalScore/Graphical/MusicSheetDrawer.ts

@@ -1,4 +1,4 @@
-import {EngravingRules} from "./EngravingRules";
+import {EngravingRules} from "./EngravingRules";
 import {ITextMeasurer} from "../Interfaces/ITextMeasurer";
 import {GraphicalMusicSheet} from "./GraphicalMusicSheet";
 import {BoundingBox} from "./BoundingBox";

+ 1 - 1
src/MusicalScore/Graphical/MusicSymbol.ts

@@ -1,4 +1,4 @@
-export enum MusicSymbol {
+export enum MusicSymbol {
     Unused_first_Symbol,
     BLACK_HEAD,
     UPWARDS_TAIL,

+ 3 - 3
src/MusicalScore/Graphical/MusicSystem.ts

@@ -1,7 +1,7 @@
-import {StaffLine} from "./StaffLine";
+import {StaffLine} from "./StaffLine";
 import {Instrument} from "../Instrument";
 import {BoundingBox} from "./BoundingBox";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {SourceMeasure} from "../VoiceData/SourceMeasure";
 import {InstrumentalGroup} from "../InstrumentalGroup";
 import {TextAlignment} from "../../Common/Enums/TextAlignment";
@@ -14,7 +14,7 @@ import {PointF2D} from "../../Common/DataObjects/PointF2D";
 import {GraphicalStaffEntry} from "./GraphicalStaffEntry";
 import {SystemLinesEnum} from "./SystemLinesEnum";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
-import {CollectionUtil} from "../../Util/collectionUtil";
+import {CollectionUtil} from "../../Util/CollectionUtil";
 import {GraphicalComment} from "./GraphicalComment";
 import {GraphicalMarkedArea} from "./GraphicalMarkedArea";
 import {SystemLine} from "./SystemLine";

+ 2 - 2
src/MusicalScore/Graphical/MusicSystemBuilder.ts

@@ -1,4 +1,4 @@
-import {StaffMeasure} from "./StaffMeasure";
+import {StaffMeasure} from "./StaffMeasure";
 import {GraphicalMusicPage} from "./GraphicalMusicPage";
 import {EngravingRules} from "./EngravingRules";
 import {RhythmInstruction} from "../VoiceData/Instructions/RhythmInstruction";
@@ -19,7 +19,7 @@ import {GraphicalMusicSheet} from "./GraphicalMusicSheet";
 import {IGraphicalSymbolFactory} from "../Interfaces/IGraphicalSymbolFactory";
 import {MusicSheetCalculator} from "./MusicSheetCalculator";
 import {MidiInstrument} from "../VoiceData/Instructions/ClefInstruction";
-import {CollectionUtil} from "../../Util/collectionUtil";
+import {CollectionUtil} from "../../Util/CollectionUtil";
 import {SystemLinePosition} from "./SystemLinePosition";
 
 export class MusicSystemBuilder {

+ 2 - 2
src/MusicalScore/Graphical/OctaveShiftParams.ts

@@ -1,5 +1,5 @@
-import {Fraction} from "../../Common/DataObjects/fraction";
-import {OctaveShift} from "../VoiceData/Expressions/ContinuousExpressions/octaveShift";
+import {Fraction} from "../../Common/DataObjects/Fraction";
+import {OctaveShift} from "../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
 
 export class OctaveShiftParams {
     constructor(openOctaveShift: OctaveShift, absoluteStartTimestamp: Fraction, absoluteEndTimestamp: Fraction) {

+ 2 - 2
src/MusicalScore/Graphical/SelectionEndSymbol.ts

@@ -1,11 +1,11 @@
-import {GraphicalObject} from "./GraphicalObject";
+import {GraphicalObject} from "./GraphicalObject";
 import {MusicSystem} from "./MusicSystem";
 import {OutlineAndFillStyleEnum} from "./DrawingEnums";
 import {StaffLine} from "./StaffLine";
 import {PointF2D} from "../../Common/DataObjects/PointF2D";
 import {BoundingBox} from "./BoundingBox";
 import {GraphicalLine} from "./GraphicalLine";
-import {CollectionUtil} from "../../Util/collectionUtil";
+import {CollectionUtil} from "../../Util/CollectionUtil";
 
 export class SelectionEndSymbol extends GraphicalObject {
     constructor(system: MusicSystem, xPosition: number) {

+ 2 - 2
src/MusicalScore/Graphical/SelectionStartSymbol.ts

@@ -1,11 +1,11 @@
-import {PointF2D} from "../../Common/DataObjects/PointF2D";
+import {PointF2D} from "../../Common/DataObjects/PointF2D";
 import {StaffLine} from "./StaffLine";
 import {OutlineAndFillStyleEnum} from "./DrawingEnums";
 import {GraphicalLine} from "./GraphicalLine";
 import {MusicSystem} from "./MusicSystem";
 import {GraphicalObject} from "./GraphicalObject";
 import {BoundingBox} from "./BoundingBox";
-import {CollectionUtil} from "../../Util/collectionUtil";
+import {CollectionUtil} from "../../Util/CollectionUtil";
 
 export class SelectionStartSymbol extends GraphicalObject {
     constructor(system: MusicSystem, xPosition: number) {

+ 1 - 1
src/MusicalScore/Graphical/StaffLine.ts

@@ -1,4 +1,4 @@
-import {Staff} from "../VoiceData/Staff";
+import {Staff} from "../VoiceData/Staff";
 import {BoundingBox} from "./BoundingBox";
 import {Instrument} from "../Instrument";
 import {GraphicalLine} from "./GraphicalLine";

+ 1 - 1
src/MusicalScore/Graphical/StaffLineActivitySymbol.ts

@@ -1,4 +1,4 @@
-import {GraphicalObject} from "./GraphicalObject";
+import {GraphicalObject} from "./GraphicalObject";
 import {StaffLine} from "./StaffLine";
 import {BoundingBox} from "./BoundingBox";
 

+ 1 - 1
src/MusicalScore/Graphical/StaffMeasure.ts

@@ -7,7 +7,7 @@ import {GraphicalObject} from "./GraphicalObject";
 import {ClefInstruction} from "../VoiceData/Instructions/ClefInstruction";
 import {KeyInstruction} from "../VoiceData/Instructions/KeyInstruction";
 import {RhythmInstruction} from "../VoiceData/Instructions/RhythmInstruction";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {Voice} from "../VoiceData/Voice";
 import {VoiceEntry} from "../VoiceData/VoiceEntry";
 import {GraphicalNote} from "./GraphicalNote";

+ 1 - 1
src/MusicalScore/Graphical/SystemLine.ts

@@ -1,4 +1,4 @@
-import {StaffMeasure} from "./StaffMeasure";
+import {StaffMeasure} from "./StaffMeasure";
 import {StaffLine} from "./StaffLine";
 import {MusicSystem} from "./MusicSystem";
 import {SystemLinePosition} from "./SystemLinePosition";

+ 1 - 1
src/MusicalScore/Graphical/SystemLinePosition.ts

@@ -1,4 +1,4 @@
-export enum SystemLinePosition {
+export enum SystemLinePosition {
     MeasureBegin,
     MeasureEnd
 }

+ 1 - 1
src/MusicalScore/Graphical/SystemLinesEnum.ts

@@ -1,4 +1,4 @@
-export enum SystemLinesEnum {
+export enum SystemLinesEnum {
     SingleThin = 0,
     DoubleThin = 1,
     ThinBold = 2,

+ 1 - 1
src/MusicalScore/Graphical/VerticalGraphicalStaffEntryContainer.ts

@@ -1,4 +1,4 @@
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {GraphicalStaffEntry} from "./GraphicalStaffEntry";
 
 export class VerticalGraphicalStaffEntryContainer {

+ 4 - 4
src/MusicalScore/Graphical/VexFlow/VexFlowConverter.ts

@@ -1,14 +1,14 @@
 import Vex = require("vexflow");
 import {ClefEnum} from "../../VoiceData/Instructions/ClefInstruction";
 import {ClefInstruction} from "../../VoiceData/Instructions/ClefInstruction";
-import {Pitch} from "../../../Common/DataObjects/pitch";
-import {Fraction} from "../../../Common/DataObjects/fraction";
+import {Pitch} from "../../../Common/DataObjects/Pitch";
+import {Fraction} from "../../../Common/DataObjects/Fraction";
 import {RhythmInstruction} from "../../VoiceData/Instructions/RhythmInstruction";
 import {RhythmSymbolEnum} from "../../VoiceData/Instructions/RhythmInstruction";
 import {KeyInstruction} from "../../VoiceData/Instructions/KeyInstruction";
 import {KeyEnum} from "../../VoiceData/Instructions/KeyInstruction";
-import {AccidentalEnum} from "../../../Common/DataObjects/pitch";
-import {NoteEnum} from "../../../Common/DataObjects/pitch";
+import {AccidentalEnum} from "../../../Common/DataObjects/Pitch";
+import {NoteEnum} from "../../../Common/DataObjects/Pitch";
 import {VexFlowGraphicalNote} from "./VexFlowGraphicalNote";
 import {GraphicalNote} from "../GraphicalNote";
 import {SystemLinesEnum} from "../SystemLinesEnum";

+ 1 - 1
src/MusicalScore/Graphical/VexFlow/VexFlowGraphicalNote.ts

@@ -4,7 +4,7 @@ import {Note} from "../../VoiceData/Note";
 import {GraphicalStaffEntry} from "../GraphicalStaffEntry";
 import {ClefInstruction} from "../../VoiceData/Instructions/ClefInstruction";
 import {VexFlowConverter} from "./VexFlowConverter";
-import {Pitch} from "../../../Common/DataObjects/pitch";
+import {Pitch} from "../../../Common/DataObjects/Pitch";
 
 export class VexFlowGraphicalNote extends GraphicalNote {
     constructor(note: Note, parent: GraphicalStaffEntry, activeClef: ClefInstruction) {

+ 3 - 3
src/MusicalScore/Graphical/VexFlow/VexFlowGraphicalSymbolFactory.ts

@@ -1,4 +1,4 @@
-import {IGraphicalSymbolFactory} from "../../Interfaces/IGraphicalSymbolFactory";
+import {IGraphicalSymbolFactory} from "../../Interfaces/IGraphicalSymbolFactory";
 import {GraphicalMusicPage} from "../GraphicalMusicPage";
 import {MusicSystem} from "../MusicSystem";
 import {VexFlowMusicSystem} from "./VexFlowMusicSystem";
@@ -13,9 +13,9 @@ import {GraphicalStaffEntry} from "../GraphicalStaffEntry";
 import {VexFlowStaffEntry} from "./VexFlowStaffEntry";
 import {Note} from "../../VoiceData/Note";
 import {ClefInstruction} from "../../VoiceData/Instructions/ClefInstruction";
-import {OctaveEnum} from "../../VoiceData/Expressions/ContinuousExpressions/octaveShift";
+import {OctaveEnum} from "../../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
 import {GraphicalNote} from "../GraphicalNote";
-import {Pitch} from "../../../Common/DataObjects/pitch";
+import {Pitch} from "../../../Common/DataObjects/Pitch";
 import {TechnicalInstruction} from "../../VoiceData/Instructions/TechnicalInstruction";
 import {VexFlowGraphicalNote} from "./VexFlowGraphicalNote";
 

+ 3 - 3
src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator.ts

@@ -10,12 +10,12 @@ import {GraphicalMusicPage} from "../GraphicalMusicPage";
 import {GraphicalTie} from "../GraphicalTie";
 import {Tie} from "../../VoiceData/Tie";
 import {SourceMeasure} from "../../VoiceData/SourceMeasure";
-import {MultiExpression} from "../../VoiceData/Expressions/multiExpression";
+import {MultiExpression} from "../../VoiceData/Expressions/MultiExpression";
 import {RepetitionInstruction} from "../../VoiceData/Instructions/RepetitionInstruction";
 import {Beam} from "../../VoiceData/Beam";
 import {ClefInstruction} from "../../VoiceData/Instructions/ClefInstruction";
-import {OctaveEnum} from "../../VoiceData/Expressions/ContinuousExpressions/octaveShift";
-import {Fraction} from "../../../Common/DataObjects/fraction";
+import {OctaveEnum} from "../../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
+import {Fraction} from "../../../Common/DataObjects/Fraction";
 import {LyricsEntry} from "../../VoiceData/Lyrics/LyricsEntry";
 import {LyricWord} from "../../VoiceData/Lyrics/LyricsWord";
 import {OrnamentContainer} from "../../VoiceData/OrnamentContainer";

+ 1 - 1
src/MusicalScore/Graphical/VexFlow/VexFlowStaffEntry.ts

@@ -1,4 +1,4 @@
-import {GraphicalStaffEntry} from "../GraphicalStaffEntry";
+import {GraphicalStaffEntry} from "../GraphicalStaffEntry";
 import {VexFlowMeasure} from "./VexFlowMeasure";
 import {SourceStaffEntry} from "../../VoiceData/SourceStaffEntry";
 import {GraphicalNote} from "../GraphicalNote";

+ 1 - 1
src/MusicalScore/Graphical/VexFlow/VexFlowStaffLine.ts

@@ -1,4 +1,4 @@
-import {StaffLine} from "../StaffLine";
+import {StaffLine} from "../StaffLine";
 import {MusicSystem} from "../MusicSystem";
 import {Staff} from "../../VoiceData/Staff";
 

+ 3 - 3
src/MusicalScore/Interfaces/IGraphicalSymbolFactory.ts

@@ -1,4 +1,4 @@
-import {GraphicalMusicPage} from "../Graphical/GraphicalMusicPage";
+import {GraphicalMusicPage} from "../Graphical/GraphicalMusicPage";
 import {MusicSystem} from "../Graphical/MusicSystem";
 import {Staff} from "../VoiceData/Staff";
 import {StaffLine} from "../Graphical/StaffLine";
@@ -8,9 +8,9 @@ import {SourceStaffEntry} from "../VoiceData/SourceStaffEntry";
 import {GraphicalStaffEntry} from "../Graphical/GraphicalStaffEntry";
 import {Note} from "../VoiceData/Note";
 import {ClefInstruction} from "../VoiceData/Instructions/ClefInstruction";
-import {OctaveEnum} from "../VoiceData/Expressions/ContinuousExpressions/octaveShift";
+import {OctaveEnum} from "../VoiceData/Expressions/ContinuousExpressions/OctaveShift";
 import {GraphicalNote} from "../Graphical/GraphicalNote";
-import {Pitch} from "../../Common/DataObjects/pitch";
+import {Pitch} from "../../Common/DataObjects/Pitch";
 import {TechnicalInstruction} from "../VoiceData/Instructions/TechnicalInstruction";
 export interface IGraphicalSymbolFactory {
     createMusicSystem(page: GraphicalMusicPage, systemIndex: number): MusicSystem;

+ 1 - 1
src/MusicalScore/Interfaces/ITextMeasurer.ts

@@ -1,4 +1,4 @@
-import {Fonts} from "../../Common/Enums/Fonts";
+import {Fonts} from "../../Common/Enums/Fonts";
 import {FontStyles} from "../../Common/Enums/FontStyles";
 
 export interface ITextMeasurer {

+ 1 - 1
src/MusicalScore/Interfaces/ITransposeCalculator.ts

@@ -1,4 +1,4 @@
-import {Pitch} from "../../Common/DataObjects/pitch";
+import {Pitch} from "../../Common/DataObjects/Pitch";
 import {KeyInstruction} from "../VoiceData/Instructions/KeyInstruction";
 
 export interface ITransposeCalculator {

+ 1 - 1
src/MusicalScore/Label.ts

@@ -1,5 +1,5 @@
 import {TextAlignment} from "../Common/Enums/TextAlignment";
-import {OSMDColor} from "../Common/DataObjects/osmdColor";
+import {OSMDColor} from "../Common/DataObjects/OSMDColor";
 import {Fonts} from "../Common/Enums/Fonts";
 import {FontStyles} from "../Common/Enums/FontStyles";
 

+ 1 - 1
src/MusicalScore/MusicParts/MusicPartManager.ts

@@ -1,7 +1,7 @@
 import { MusicSheet } from "../MusicSheet";
 import { PartListEntry } from "../MusicSource/PartListEntry";
 import { Repetition } from "../MusicSource/Repetition";
-import { Fraction } from "../../Common/DataObjects/fraction";
+import { Fraction } from "../../Common/DataObjects/Fraction";
 import { MusicPartManagerIterator } from "./MusicPartManagerIterator";
 
 export class MusicPartManager /*implements ISelectionListener*/ {

+ 5 - 5
src/MusicalScore/MusicParts/MusicPartManagerIterator.ts

@@ -1,5 +1,5 @@
 import {MusicPartManager} from "./MusicPartManager";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {Repetition} from "../MusicSource/Repetition";
 import {DynamicsContainer} from "../VoiceData/HelperObjects/DynamicsContainer";
 import {MappingSourceMusicPart} from "../MusicSource/MappingSourceMusicPart";
@@ -10,10 +10,10 @@ import {VerticalSourceStaffEntryContainer} from "../VoiceData/VerticalSourceStaf
 import {RhythmInstruction} from "../VoiceData/Instructions/RhythmInstruction";
 import {AbstractNotationInstruction} from "../VoiceData/Instructions/AbstractNotationInstruction";
 import {RepetitionInstruction} from "../VoiceData/Instructions/RepetitionInstruction";
-import {ContinuousDynamicExpression} from "../VoiceData/Expressions/ContinuousExpressions/continuousDynamicExpression";
-import {InstantaniousDynamicExpression} from "../VoiceData/Expressions/instantaniousDynamicExpression";
-import {MultiTempoExpression} from "../VoiceData/Expressions/multiTempoExpression";
-import {AbstractExpression} from "../VoiceData/Expressions/abstractExpression";
+import {ContinuousDynamicExpression} from "../VoiceData/Expressions/ContinuousExpressions/ContinuousDynamicExpression";
+import {InstantaniousDynamicExpression} from "../VoiceData/Expressions/InstantaniousDynamicExpression";
+import {MultiTempoExpression} from "../VoiceData/Expressions/MultiTempoExpression";
+import {AbstractExpression} from "../VoiceData/Expressions/AbstractExpression";
 import {Logging} from "../../Common/Logging";
 
 export class MusicPartManagerIterator {

+ 2 - 2
src/MusicalScore/MusicSheet.ts

@@ -1,4 +1,4 @@
-import {Fraction} from "../Common/DataObjects/fraction";
+import {Fraction} from "../Common/DataObjects/Fraction";
 import {MusicPartManager} from "./MusicParts/MusicPartManager";
 import {SourceMeasure} from "./VoiceData/SourceMeasure";
 import {Repetition} from "./MusicSource/Repetition";
@@ -11,7 +11,7 @@ import {MusicPartManagerIterator} from "./MusicParts/MusicPartManagerIterator";
 import {VerticalSourceStaffEntryContainer} from "./VoiceData/VerticalSourceStaffEntryContainer";
 import {Voice} from "./VoiceData/Voice";
 import {MusicSheetErrors} from "../Common/DataObjects/MusicSheetErrors";
-import {MultiTempoExpression} from "./VoiceData/Expressions/multiTempoExpression";
+import {MultiTempoExpression} from "./VoiceData/Expressions/MultiTempoExpression";
 import {EngravingRules} from "./Graphical/EngravingRules";
 import {NoteState} from "./Graphical/DrawingEnums";
 import {Note} from "./VoiceData/Note";

+ 1 - 1
src/MusicalScore/MusicSource/MappingSourceMusicPart.ts

@@ -1,5 +1,5 @@
 import {SourceMusicPart} from "./SourceMusicPart";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {Repetition} from "./Repetition";
 import {PartListEntry} from "./PartListEntry";
 

+ 1 - 1
src/MusicalScore/MusicSource/PartListEntry.ts

@@ -1,5 +1,5 @@
 import {MusicSheet} from "../MusicSheet";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {SourceMeasure} from "../VoiceData/SourceMeasure";
 
 export abstract class PartListEntry {

+ 1 - 1
src/MusicalScore/MusicSource/Repetition.ts

@@ -1,6 +1,6 @@
 import {SourceMusicPart} from "./SourceMusicPart";
 import {SourceMeasure} from "../VoiceData/SourceMeasure";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {MusicSheet} from "../MusicSheet";
 import {RepetitionInstruction} from "../VoiceData/Instructions/RepetitionInstruction";
 import {PartListEntry} from "./PartListEntry";

+ 1 - 1
src/MusicalScore/MusicSource/SourceMusicPart.ts

@@ -1,6 +1,6 @@
 import {PartListEntry} from "./PartListEntry";
 import {Repetition} from "./Repetition";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {MusicSheet} from "../MusicSheet";
 
 export class SourceMusicPart extends PartListEntry {

+ 1 - 1
src/MusicalScore/ScoreIO/InstrumentReader.ts

@@ -8,7 +8,7 @@ import {ClefInstruction} from "../VoiceData/Instructions/ClefInstruction";
 import {KeyInstruction} from "../VoiceData/Instructions/KeyInstruction";
 import {RhythmInstruction} from "../VoiceData/Instructions/RhythmInstruction";
 import {AbstractNotationInstruction} from "../VoiceData/Instructions/AbstractNotationInstruction";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {IXmlElement} from "../../Common/FileIO/Xml";
 import {ITextTranslation} from "../Interfaces/ITextTranslation";
 import {MusicSheetReadingException} from "../Exceptions";

+ 1 - 1
src/MusicalScore/ScoreIO/MusicSheetReader.ts

@@ -1,6 +1,6 @@
 import {MusicSheet} from "../MusicSheet";
 import {SourceMeasure} from "../VoiceData/SourceMeasure";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {InstrumentReader} from "./InstrumentReader";
 import {IXmlElement} from "../../Common/FileIO/Xml";
 import {Instrument} from "../Instrument";

+ 5 - 5
src/MusicalScore/ScoreIO/VoiceGenerator.ts

@@ -9,7 +9,7 @@ import {SourceStaffEntry} from "../VoiceData/SourceStaffEntry";
 import {Beam} from "../VoiceData/Beam";
 import {Tie} from "../VoiceData/Tie";
 import {Tuplet} from "../VoiceData/Tuplet";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 //import {MusicSymbolModuleFactory} from "./InstrumentReader";
 import {IXmlElement} from "../../Common/FileIO/Xml";
 import {ITextTranslation} from "../Interfaces/ITextTranslation";
@@ -17,15 +17,15 @@ import {ArticulationEnum} from "../VoiceData/VoiceEntry";
 import {Slur} from "../VoiceData/Expressions/ContinuousExpressions/Slur";
 import {LyricsEntry} from "../VoiceData/Lyrics/LyricsEntry";
 import {MusicSheetReadingException} from "../Exceptions";
-import {AccidentalEnum} from "../../Common/DataObjects/pitch";
-import {NoteEnum} from "../../Common/DataObjects/pitch";
+import {AccidentalEnum} from "../../Common/DataObjects/Pitch";
+import {NoteEnum} from "../../Common/DataObjects/Pitch";
 import {Staff} from "../VoiceData/Staff";
 import {StaffEntryLink} from "../VoiceData/StaffEntryLink";
 import {VerticalSourceStaffEntryContainer} from "../VoiceData/VerticalSourceStaffEntryContainer";
 import {Logging} from "../../Common/Logging";
-import {Pitch} from "../../Common/DataObjects/pitch";
+import {Pitch} from "../../Common/DataObjects/Pitch";
 import {IXmlAttribute} from "../../Common/FileIO/Xml";
-import {CollectionUtil} from "../../Util/collectionUtil";
+import {CollectionUtil} from "../../Util/CollectionUtil";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
 
 export type SlurReader = any;

+ 2 - 2
src/MusicalScore/VoiceData/ChordSymbolContainer.ts

@@ -1,7 +1,7 @@
-import {Pitch} from "../../Common/DataObjects/pitch";
+import {Pitch} from "../../Common/DataObjects/Pitch";
 import {KeyInstruction} from "./Instructions/KeyInstruction";
 import {MusicSheetCalculator} from "../Graphical/MusicSheetCalculator";
-import {AccidentalEnum} from "../../Common/DataObjects/pitch";
+import {AccidentalEnum} from "../../Common/DataObjects/Pitch";
 export class ChordSymbolContainer {
     private rootPitch: Pitch;
     private chordKind: ChordSymbolEnum;

+ 0 - 0
src/MusicalScore/VoiceData/Expressions/abstractExpression.ts → src/MusicalScore/VoiceData/Expressions/AbstractExpression.ts


+ 2 - 2
src/MusicalScore/VoiceData/Expressions/abstractTempoExpression.ts → src/MusicalScore/VoiceData/Expressions/AbstractTempoExpression.ts

@@ -1,5 +1,5 @@
-import {PlacementEnum} from "./abstractExpression";
-import {MultiTempoExpression} from "./multiTempoExpression";
+import {PlacementEnum} from "./AbstractExpression";
+import {MultiTempoExpression} from "./MultiTempoExpression";
 
 export abstract class AbstractTempoExpression {
     constructor(label: string, placement: PlacementEnum, staffNumber: number, parentMultiTempoExpression: MultiTempoExpression) {

+ 3 - 3
src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/continuousDynamicExpression.ts → src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/ContinuousDynamicExpression.ts

@@ -1,6 +1,6 @@
-import {PlacementEnum, AbstractExpression} from "../abstractExpression";
-import {MultiExpression} from "../multiExpression";
-import {Fraction} from "../../../../Common/DataObjects/fraction";
+import {PlacementEnum, AbstractExpression} from "../AbstractExpression";
+import {MultiExpression} from "../MultiExpression";
+import {Fraction} from "../../../../Common/DataObjects/Fraction";
 
 export class ContinuousDynamicExpression extends AbstractExpression {
     //constructor(placement: PlacementEnum, staffNumber: number, label: string) {

+ 4 - 4
src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/continuousTempoExpression.ts → src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/ContinuousTempoExpression.ts

@@ -1,7 +1,7 @@
-import {Fraction} from "../../../../Common/DataObjects/fraction";
-import {PlacementEnum} from "../abstractExpression";
-import {MultiTempoExpression} from "../multiTempoExpression";
-import {AbstractTempoExpression} from "../abstractTempoExpression";
+import {Fraction} from "../../../../Common/DataObjects/Fraction";
+import {PlacementEnum} from "../AbstractExpression";
+import {MultiTempoExpression} from "../MultiTempoExpression";
+import {AbstractTempoExpression} from "../AbstractTempoExpression";
 
 export class ContinuousTempoExpression extends AbstractTempoExpression {
     constructor(label: string, placement: PlacementEnum, staffNumber: number, parentMultiTempoExpression: MultiTempoExpression) {

+ 1 - 1
src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/octaveShift.ts → src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/OctaveShift.ts

@@ -1,4 +1,4 @@
-import {MultiExpression} from "../multiExpression";
+import {MultiExpression} from "../MultiExpression";
 
 export class OctaveShift {
     constructor(type: string, octave: number) {

+ 1 - 1
src/MusicalScore/VoiceData/Expressions/ContinuousExpressions/Slur.ts

@@ -1,5 +1,5 @@
 import {Note} from "../../Note";
-import {Fraction} from "../../../../Common/DataObjects/fraction";
+import {Fraction} from "../../../../Common/DataObjects/Fraction";
 
 export class Slur {
     constructor() {

+ 0 - 0
src/MusicalScore/VoiceData/Expressions/dynamicExpressionSymbolEnum.ts → src/MusicalScore/VoiceData/Expressions/DynamicExpressionSymbolEnum.ts


+ 3 - 3
src/MusicalScore/VoiceData/Expressions/instantaniousDynamicExpression.ts → src/MusicalScore/VoiceData/Expressions/InstantaniousDynamicExpression.ts

@@ -1,6 +1,6 @@
-import {PlacementEnum, AbstractExpression} from "./abstractExpression";
-import {MultiExpression} from "./multiExpression";
-import {DynamicExpressionSymbolEnum} from "./dynamicExpressionSymbolEnum";
+import {PlacementEnum, AbstractExpression} from "./AbstractExpression";
+import {MultiExpression} from "./MultiExpression";
+import {DynamicExpressionSymbolEnum} from "./DynamicExpressionSymbolEnum";
 //import {ArgumentOutOfRangeException} from "../../Exceptions";
 import {InvalidEnumArgumentException} from "../../Exceptions";
 import {Logging} from "../../../Common/Logging";

+ 4 - 4
src/MusicalScore/VoiceData/Expressions/instantaniousTempoExpression.ts → src/MusicalScore/VoiceData/Expressions/InstantaniousTempoExpression.ts

@@ -1,8 +1,8 @@
-import {AbstractTempoExpression} from "./abstractTempoExpression";
-import {PlacementEnum} from "./abstractExpression";
+import {AbstractTempoExpression} from "./AbstractTempoExpression";
+import {PlacementEnum} from "./AbstractExpression";
 import {ArgumentOutOfRangeException} from "../../Exceptions";
-import {Fraction} from "../../../Common/DataObjects/fraction";
-import {MultiTempoExpression} from "./multiTempoExpression";
+import {Fraction} from "../../../Common/DataObjects/Fraction";
+import {MultiTempoExpression} from "./MultiTempoExpression";
 
 export class InstantaniousTempoExpression extends AbstractTempoExpression {
     constructor(label: string, placement: PlacementEnum, staffNumber: number, soundTempo: number, parentMultiTempoExpression: MultiTempoExpression) {

+ 1 - 1
src/MusicalScore/VoiceData/Expressions/moodExpression.ts → src/MusicalScore/VoiceData/Expressions/MoodExpression.ts

@@ -1,4 +1,4 @@
-import {PlacementEnum, AbstractExpression} from "./abstractExpression";
+import {PlacementEnum, AbstractExpression} from "./AbstractExpression";
 
 export class MoodExpression extends AbstractExpression {
     constructor(label: string, placement: PlacementEnum, staffNumber: number) {

+ 8 - 8
src/MusicalScore/VoiceData/Expressions/multiExpression.ts → src/MusicalScore/VoiceData/Expressions/MultiExpression.ts

@@ -1,12 +1,12 @@
 import {SourceMeasure} from "../SourceMeasure";
-import {Fraction} from "../../../Common/DataObjects/fraction";
-import {InstantaniousDynamicExpression} from "./instantaniousDynamicExpression";
-import {ContinuousDynamicExpression} from "./ContinuousExpressions/continuousDynamicExpression";
-import {OctaveShift} from "./ContinuousExpressions/octaveShift";
-import {MoodExpression} from "./moodExpression";
-import {UnknownExpression} from "./unknownExpression";
-import {AbstractExpression} from "./abstractExpression";
-import {PlacementEnum} from "./abstractExpression";
+import {Fraction} from "../../../Common/DataObjects/Fraction";
+import {InstantaniousDynamicExpression} from "./InstantaniousDynamicExpression";
+import {ContinuousDynamicExpression} from "./ContinuousExpressions/ContinuousDynamicExpression";
+import {OctaveShift} from "./ContinuousExpressions/OctaveShift";
+import {MoodExpression} from "./MoodExpression";
+import {UnknownExpression} from "./UnknownExpression";
+import {AbstractExpression} from "./AbstractExpression";
+import {PlacementEnum} from "./AbstractExpression";
 
 export class MultiExpression /*implements IComparable<MultiExpression>*/ {
     constructor(sourceMeasure: SourceMeasure, timestamp: Fraction) {

+ 5 - 5
src/MusicalScore/VoiceData/Expressions/multiTempoExpression.ts → src/MusicalScore/VoiceData/Expressions/MultiTempoExpression.ts

@@ -1,10 +1,10 @@
-import {Fraction} from "../../../Common/DataObjects/fraction";
+import {Fraction} from "../../../Common/DataObjects/Fraction";
 import {SourceMeasure} from "../SourceMeasure";
-import {InstantaniousTempoExpression} from "./instantaniousTempoExpression";
-import {PlacementEnum} from "./abstractExpression";
+import {InstantaniousTempoExpression} from "./InstantaniousTempoExpression";
+import {PlacementEnum} from "./AbstractExpression";
 import {FontStyles} from "../../../Common/Enums/FontStyles";
-import {AbstractTempoExpression} from "./abstractTempoExpression";
-import {ContinuousTempoExpression} from "./ContinuousExpressions/continuousTempoExpression";
+import {AbstractTempoExpression} from "./AbstractTempoExpression";
+import {ContinuousTempoExpression} from "./ContinuousExpressions/ContinuousTempoExpression";
 
 export class MultiTempoExpression /*implements IComparable<MultiTempoExpression>*/ {
     constructor(sourceMeasure: SourceMeasure, timestamp: Fraction) {

+ 1 - 1
src/MusicalScore/VoiceData/Expressions/unknownExpression.ts → src/MusicalScore/VoiceData/Expressions/UnknownExpression.ts

@@ -1,4 +1,4 @@
-import {PlacementEnum, AbstractExpression} from "./abstractExpression";
+import {PlacementEnum, AbstractExpression} from "./AbstractExpression";
 import {TextAlignment} from "../../../Common/Enums/TextAlignment";
 
 export class UnknownExpression extends AbstractExpression {

+ 3 - 3
src/MusicalScore/VoiceData/HelperObjects/DynamicsContainer.ts

@@ -1,6 +1,6 @@
-import {ContinuousDynamicExpression} from "../Expressions/ContinuousExpressions/continuousDynamicExpression";
-import {InstantaniousDynamicExpression} from "../Expressions/instantaniousDynamicExpression";
-import {MultiExpression} from "../Expressions/multiExpression";
+import {ContinuousDynamicExpression} from "../Expressions/ContinuousExpressions/ContinuousDynamicExpression";
+import {InstantaniousDynamicExpression} from "../Expressions/InstantaniousDynamicExpression";
+import {MultiExpression} from "../Expressions/MultiExpression";
 
 export class DynamicsContainer /*implements IComparable<DynamicsContainer>*/ {
     constructor(dynamicExpression: ContinuousDynamicExpression|InstantaniousDynamicExpression, staffNumber: number) {

+ 3 - 3
src/MusicalScore/VoiceData/Instructions/ClefInstruction.ts

@@ -1,7 +1,7 @@
-import {Pitch} from "../../../Common/DataObjects/pitch";
+import {Pitch} from "../../../Common/DataObjects/Pitch";
 import {AbstractNotationInstruction} from "./AbstractNotationInstruction";
-import {NoteEnum} from "../../../Common/DataObjects/pitch";
-import {AccidentalEnum} from "../../../Common/DataObjects/pitch";
+import {NoteEnum} from "../../../Common/DataObjects/Pitch";
+import {AccidentalEnum} from "../../../Common/DataObjects/Pitch";
 import {ArgumentOutOfRangeException} from "../../Exceptions";
 
 export class ClefInstruction extends AbstractNotationInstruction {

+ 3 - 3
src/MusicalScore/VoiceData/Instructions/KeyInstruction.ts

@@ -1,8 +1,8 @@
 import {AbstractNotationInstruction} from "./AbstractNotationInstruction";
 import {SourceStaffEntry} from "../SourceStaffEntry";
-import {NoteEnum} from "../../../Common/DataObjects/pitch";
-import {AccidentalEnum} from "../../../Common/DataObjects/pitch";
-import {Pitch} from "../../../Common/DataObjects/pitch";
+import {NoteEnum} from "../../../Common/DataObjects/Pitch";
+import {AccidentalEnum} from "../../../Common/DataObjects/Pitch";
+import {Pitch} from "../../../Common/DataObjects/Pitch";
 
 
 export class KeyInstruction extends AbstractNotationInstruction {

+ 1 - 1
src/MusicalScore/VoiceData/Instructions/RhythmInstruction.ts

@@ -1,5 +1,5 @@
 import {AbstractNotationInstruction} from "./AbstractNotationInstruction";
-import {Fraction} from "../../../Common/DataObjects/fraction";
+import {Fraction} from "../../../Common/DataObjects/Fraction";
 
 export class RhythmInstruction extends AbstractNotationInstruction {
     constructor(rhythm: Fraction, numerator: number, denominator: number, rhythmSymbolEnum: RhythmSymbolEnum) {

+ 2 - 2
src/MusicalScore/VoiceData/Note.ts

@@ -1,7 +1,7 @@
 import {VoiceEntry} from "./VoiceEntry";
 import {SourceStaffEntry} from "./SourceStaffEntry";
-import {Fraction} from "../../Common/DataObjects/fraction";
-import {Pitch} from "../../Common/DataObjects/pitch";
+import {Fraction} from "../../Common/DataObjects/Fraction";
+import {Pitch} from "../../Common/DataObjects/Pitch";
 import {Beam} from "./Beam";
 import {Tuplet} from "./Tuplet";
 import {Tie} from "./Tie";

+ 1 - 1
src/MusicalScore/VoiceData/OrnamentContainer.ts

@@ -1,4 +1,4 @@
-import {AccidentalEnum} from "../../Common/DataObjects/pitch";
+import {AccidentalEnum} from "../../Common/DataObjects/Pitch";
 
 export class OrnamentContainer {
     constructor(ornament: OrnamentEnum) {

+ 3 - 3
src/MusicalScore/VoiceData/SourceMeasure.ts

@@ -1,4 +1,4 @@
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {VerticalSourceStaffEntryContainer} from "./VerticalSourceStaffEntryContainer";
 import {SourceStaffEntry} from "./SourceStaffEntry";
 import {RepetitionInstruction} from "./Instructions/RepetitionInstruction";
@@ -6,8 +6,8 @@ import {Staff} from "./Staff";
 import {VoiceEntry} from "./VoiceEntry";
 import {Voice} from "./Voice";
 import {MusicSheet} from "../MusicSheet";
-import {MultiExpression} from "./Expressions/multiExpression";
-import {MultiTempoExpression} from "./Expressions/multiTempoExpression";
+import {MultiExpression} from "./Expressions/MultiExpression";
+import {MultiTempoExpression} from "./Expressions/MultiTempoExpression";
 import {KeyInstruction} from "./Instructions/KeyInstruction";
 import {AbstractNotationInstruction} from "./Instructions/AbstractNotationInstruction";
 import {Repetition} from "../MusicSource/Repetition";

+ 1 - 1
src/MusicalScore/VoiceData/SourceStaffEntry.ts

@@ -1,4 +1,4 @@
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {VerticalSourceStaffEntryContainer} from "./VerticalSourceStaffEntryContainer";
 import {Staff} from "./Staff";
 import {AbstractNotationInstruction} from "./Instructions/AbstractNotationInstruction";

+ 1 - 1
src/MusicalScore/VoiceData/Tie.ts

@@ -1,6 +1,6 @@
 import {Note} from "./Note";
 import {Beam} from "./Beam";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {Tuplet} from "./Tuplet";
 
 export class Tie {

+ 1 - 1
src/MusicalScore/VoiceData/Tuplet.ts

@@ -1,5 +1,5 @@
 import {Note} from "./Note";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 
 export class Tuplet {
     constructor(tupletLabelNumber: number) {

+ 1 - 1
src/MusicalScore/VoiceData/VerticalSourceStaffEntryContainer.ts

@@ -1,5 +1,5 @@
 import {SourceMeasure} from "./SourceMeasure";
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {SourceStaffEntry} from "./SourceStaffEntry";
 
 export class VerticalSourceStaffEntryContainer {

+ 3 - 3
src/MusicalScore/VoiceData/VoiceEntry.ts

@@ -1,14 +1,14 @@
-import {Fraction} from "../../Common/DataObjects/fraction";
+import {Fraction} from "../../Common/DataObjects/Fraction";
 import {Voice} from "./Voice";
 import {SourceStaffEntry} from "./SourceStaffEntry";
 import {Note} from "./Note";
-import {Pitch} from "../../Common/DataObjects/pitch";
+import {Pitch} from "../../Common/DataObjects/Pitch";
 import {LyricsEntry} from "./Lyrics/LyricsEntry";
 import {TechnicalInstruction} from "./Instructions/TechnicalInstruction";
 import {OrnamentContainer} from "./OrnamentContainer";
 import {KeyInstruction} from "./Instructions/KeyInstruction";
 import {OrnamentEnum} from "./OrnamentContainer";
-import {AccidentalEnum} from "../../Common/DataObjects/pitch";
+import {AccidentalEnum} from "../../Common/DataObjects/Pitch";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
 
 export class VoiceEntry {

+ 0 - 0
src/Util/collectionUtil.ts → src/Util/CollectionUtil.ts


+ 0 - 0
src/Util/psMath.ts → src/Util/PSMath.ts


+ 1 - 1
test/Common/DataObjects/fraction_Test.ts → test/Common/DataObjects/Fraction.ts

@@ -1,7 +1,7 @@
 /**
  * Created by Oliver on 16.03.2016.
  */
-import { Fraction } from "../../../src/Common/DataObjects/fraction";
+import { Fraction } from "../../../src/Common/DataObjects/Fraction";
 import Dictionary from "typescript-collections/dist/lib/Dictionary";
 import {Logging} from "../../../src/Common/Logging";
 

+ 1 - 1
test/Common/DataObjects/Pitch_Test.ts → test/Common/DataObjects/Pitch.ts

@@ -1,4 +1,4 @@
-import { Pitch, NoteEnum, AccidentalEnum } from "../../../src/Common/DataObjects/pitch";
+import { Pitch, NoteEnum, AccidentalEnum } from "../../../src/Common/DataObjects/Pitch";
 
 describe("Pitch Unit Tests:", () => {
     describe("transpose Pitch", () => {

+ 1 - 1
test/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetDrawer.ts

@@ -5,7 +5,7 @@ import {MusicSheetReader} from "../../../../src/MusicalScore/ScoreIO/MusicSheetR
 import {VexFlowMusicSheetCalculator} from "../../../../src/MusicalScore/Graphical/VexFlow/VexFlowMusicSheetCalculator";
 import {TestUtils} from "../../../Util/TestUtils";
 import {IXmlElement} from "../../../../src/Common/FileIO/Xml";
-import {Fraction} from "../../../../src/Common/DataObjects/fraction";
+import {Fraction} from "../../../../src/Common/DataObjects/Fraction";
 import {OutlineAndFillStyleEnum} from "../../../../src/MusicalScore/Graphical/DrawingEnums";
 
 describe("VexFlow Music Sheet Drawer", () => {