From d74ad2a2fa0dff8649481bcf1b1c414a3439f18f Mon Sep 17 00:00:00 2001
From: Daniel Francis <francis@sugarlabs.org>
Date: Fri, 20 Jul 2012 04:39:43 +0000
Subject: F cleff

---
diff --git a/clef.py b/clef.py
index 61f935a..065ada9 100644
--- a/clef.py
+++ b/clef.py
@@ -30,8 +30,10 @@ CLEF_G = 3
 
 class Clef:
     clef_type = CLEF_G
-    clefs = [None, None, None, rsvg.Handle(file=os.path.join(
-                    os.environ['SUGAR_BUNDLE_PATH'], 'symbols/Gclef.svg'))]
+    clefs = [None, None, rsvg.Handle(file=os.path.join(
+                    os.environ['SUGAR_BUNDLE_PATH'], 'symbols/Fclef.svg')),
+                rsvg.Handle(file=os.path.join(os.environ['SUGAR_BUNDLE_PATH'],
+                                                        'symbols/Gclef.svg'))]
 
     def __init__(self):
         pass
diff --git a/instruments/piano.py b/instruments/piano.py
index b3cd48d..8bb975c 100644
--- a/instruments/piano.py
+++ b/instruments/piano.py
@@ -34,5 +34,6 @@ class Piano(Instrument):
         top_staff.clef = clef.Clef()
         bottom_staff = Staff()
         bottom_staff.clef = clef.Clef()
+        bottom_staff.clef.clef_type = clef.CLEF_F
         self.staves.append(top_staff)
         self.staves.append(bottom_staff)
diff --git a/symbols/Fclef.svg b/symbols/Fclef.svg
new file mode 100644
index 0000000..d0f95d7
--- /dev/null
+++ b/symbols/Fclef.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="109"
+   id="svg3235"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="Fclef.svg">
+  <defs
+     id="defs3237" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="-80.231759"
+     inkscape:cy="55.920703"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="706"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3240">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-943.36218)">
+    <path
+       style="overflow:visible"
+       inkscape:connector-curvature="0"
+       id="path23"
+       d="m 28.106564,997.66452 c -1.175688,2.06973 -2.654781,4.10388 -4.437278,6.10158 -1.782495,1.9978 -3.678768,3.6859 -5.688817,5.0661 -2.313452,1.6348 -5.176823,3.0694 -8.5901133,4.3045 -2.1238251,0.7628 -5.1768237,1.4893 -9.15899589,2.1793 l -0.3982172,-0.8172 c 1.93340789,-0.6176 3.73565679,-1.2894 5.40437649,-2.0161 3.982172,-1.7071 6.9593199,-3.5596 8.9314429,-5.5567 6.370685,-6.3563 9.462399,-14.07501 9.272772,-23.15421 -0.03871,-3.05037 -0.587845,-5.64822 -1.649757,-7.79128 -1.517017,-3.08671 -3.849433,-4.63043 -6.997245,-4.63043 -2.237602,0 -4.380389,0.74463 -6.4283634,2.23387 -2.2376015,1.59822 -3.2615886,3.37804 -3.0719613,5.33948 0.037926,0.10974 0.1137763,0.16345 0.2275526,0.16345 2.0858996,-0.50851 3.6218803,-0.74387 4.6079421,-0.70829 1.327391,0.0371 2.426438,0.65382 3.299513,1.85247 0.796435,1.05413 1.194653,2.30651 1.194653,3.75942 0,1.56114 -0.465377,2.85137 -1.394551,3.86842 -0.929173,1.01626 -2.228121,1.52556 -3.8968396,1.52556 -1.9341979,0 -3.5649921,-0.59931 -4.8915927,-1.79799 -1.4411669,-1.23573 -2.1617505,-2.85211 -2.1617505,-4.84913 -0.1145664,-5.08521 1.9910859,-8.77199 6.3145871,-11.06035 2.3513777,-1.23422 4.9492707,-1.86987 7.7936787,-1.90696 2.91947,-0.0728 5.764669,0.80817 8.533226,2.6425 2.768557,1.83431 4.683793,4.16807 5.745706,7.0005 0.643943,1.70718 0.967099,3.5415 0.967099,5.50218 0,1.70719 -0.227553,3.59522 -0.682659,5.6656 -0.49382,2.18017 -1.441957,4.54117 -2.844408,7.08371 z m 5.744915,-20.97495 c -0.03871,-0.83543 0.246516,-1.52481 0.853323,-2.06965 0.606808,-0.54486 1.346352,-0.83543 2.218639,-0.87176 0.872285,0 1.621313,0.26409 2.247083,0.79002 0.625769,0.52669 0.938655,1.2085 0.938655,2.04318 0.03792,0.83542 -0.255997,1.55356 -0.881767,2.15289 -0.62577,0.59933 -1.355835,0.899 -2.189405,0.899 -0.872286,0.0363 -1.622103,-0.23611 -2.247874,-0.81728 -0.62577,-0.58116 -0.938654,-1.29022 -0.938654,-2.1264 z m 0,13.73088 c 0,-0.79986 0.303404,-1.48021 0.909421,-2.04244 0.606807,-0.56376 1.346354,-0.86342 2.219429,-0.899 0.872285,0 1.611832,0.27168 2.218639,0.81728 0.606806,0.54485 0.929173,1.21603 0.967888,2.01591 0,0.83542 -0.304193,1.55206 -0.91021,2.1521 -0.606807,0.59858 -1.327392,0.89905 -2.160961,0.89905 -0.872285,0.0362 -1.622102,-0.23613 -2.247872,-0.81656 -0.62656,-0.58269 -0.958408,-1.2909 -0.996334,-2.12634 z" />
+  </g>
+</svg>
diff --git a/symbols/Gclef.svg b/symbols/Gclef.svg
new file mode 100644
index 0000000..f4bed5f
--- /dev/null
+++ b/symbols/Gclef.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="109"
+   id="svg3235"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="Gcleff.svg">
+  <defs
+     id="defs3237" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="-51.66033"
+     inkscape:cy="22.473312"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="706"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3240">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-943.36218)">
+    <path
+       style="overflow:visible"
+       inkscape:connector-curvature="0"
+       id="path9"
+       d="m 27.787204,1025.9353 c -1.427098,0.2071 -2.989995,0.3113 -4.686281,0.3113 -3.587833,0 -6.229088,-0.3623 -7.925374,-1.0867 -5.4006329,-2.3122 -9.2190831,-5.159 -11.4569586,-8.54 -1.6199487,-2.4494 -2.5834004,-5.6923 -2.89276567,-9.7293 -0.26999145,-3.3465 0.61712337,-6.848 2.66134437,-10.50572 1.7356594,-3.13933 3.9815705,-5.87414 6.7393399,-8.20276 2.757771,-2.32868 5.873118,-4.66599 9.344437,-7.01264 -0.192851,-0.86246 -0.462843,-2.57016 -0.809975,-5.12379 -0.192851,-2.38043 -0.288473,-4.01984 -0.288473,-4.91681 0,-2.48392 0.230618,-4.84709 0.69346,-7.09024 0.462843,-2.03543 1.638431,-4.41585 3.529174,-7.14198 2.082792,-3.0014 3.895591,-4.51936 5.439203,-4.55457 1.272817,0 2.690272,1.70842 4.252366,5.1238 1.561289,3.41612 2.38171,6.34924 2.458851,8.79866 0.07714,3.2436 -0.289277,6.03802 -1.099251,8.38465 -0.539983,1.55246 -1.542809,3.4851 -3.008477,5.79581 -0.617123,0.93219 -1.88994,2.46738 -3.81845,4.60632 -0.539983,0.62169 -1.254336,1.25993 -2.140647,1.91542 -0.771404,0.51819 -1.523523,1.05293 -2.256357,1.60421 l 1.909226,10.04053 c 0.501412,-0.069 1.06068,-0.1035 1.677804,-0.1035 3.509888,0 6.229088,0.639 8.157598,1.91471 3.6256,2.3805 5.611162,5.7793 5.959098,10.1959 0.269991,3.0704 -0.501413,5.9166 -2.314213,8.5392 -1.967884,2.8634 -4.86065,5.003 -8.6791,6.4182 0.500609,3.1395 1.002022,6.1415 1.504238,9.0049 0.269991,1.7242 0.404987,3.1905 0.404987,4.3986 0,1.656 -0.289277,2.9669 -0.86783,3.9336 -2.122164,3.5534 -5.341974,5.4515 -9.660229,5.6931 -2.585008,0.1373 -5.111357,-0.3451 -7.580653,-1.4497 -3.0856168,-1.3461 -4.7047627,-3.296 -4.8590435,-5.8497 -0.1534771,-1.8644 0.2507063,-3.4521 1.2149615,-4.763 1.079966,-1.5532 2.68063,-2.3811 4.802795,-2.4847 1.465668,-0.1042 2.853392,0.3185 4.165583,1.2685 1.31219,0.9481 2.024936,2.1297 2.140646,3.5441 0.269992,3.105 -1.870655,5.2267 -6.421939,6.3651 1.042199,1.3447 3.12499,2.0182 6.249177,2.0182 1.656911,0 3.27686,-0.4485 4.859042,-1.3455 1.581379,-0.897 2.795537,-2.0189 3.644885,-3.3636 0.539983,-0.8969 0.809974,-2.2605 0.809974,-4.0882 0,-1.1039 -0.09642,-2.3459 -0.289276,-3.7259 -0.541591,-2.9316 -1.062289,-5.864 -1.562897,-8.7965 z m -3.644885,-20.0783 c -2.816429,0.069 -4.938593,0.9488 -6.364888,2.6393 -1.079966,1.3108 -1.56129,2.777 -1.445579,4.3985 0.03776,1.2075 0.53034,2.4409 1.47531,3.7 0.94497,1.2592 1.97592,2.1468 3.09526,2.665 -0.192852,0.1035 -0.385703,0.2926 -0.57775,0.5693 -2.237876,-0.966 -3.877913,-2.0872 -4.918505,-3.3636 -1.542808,-1.8638 -2.410638,-3.9337 -2.603489,-6.2106 -0.116514,-1.5172 0.269991,-3.1042 1.15791,-4.7608 0.963451,-1.794 2.371264,-3.3292 4.22183,-4.6056 1.389331,-0.96601 2.969906,-1.63811 4.744136,-2.01831 l -1.73566,-9.36633 c -1.310583,0.69064 -3.199719,2.03613 -5.669016,4.03629 -3.04785,2.44952 -5.265637,4.64013 -6.652558,6.57215 -3.0100831,4.175 -4.378522,7.7794 -4.1085305,10.8153 0.3093652,3.7604 2.2177865,6.9947 5.7284795,9.7036 3.509085,2.7074 7.636901,4.0615 12.380233,4.0615 1.542808,0 3.085617,-0.156 4.628425,-0.4657 -1.15791,-6.1402 -2.275642,-12.2637 -3.355608,-18.37 z m 4.859042,-45.48674 c -2.429923,0 -4.436376,1.6732 -6.016952,5.0196 -1.504238,3.10489 -2.256357,6.71003 -2.256357,10.81467 0,1.34617 0.09642,2.63988 0.289276,3.88112 3.046244,-2.13893 5.630448,-4.48414 7.751809,-7.03777 2.661345,-3.1739 3.896394,-5.91583 3.70274,-8.22726 -0.230618,-3.00068 -1.388527,-4.48485 -3.470516,-4.45036 z m -3.355608,45.38394 3.239898,18.0602 c 4.898416,-1.4835 7.135488,-4.8816 6.71202,-10.1944 -0.463647,-5.486 -3.780685,-8.1072 -9.951918,-7.8658 z" />
+  </g>
+</svg>
--
cgit v0.9.1