diff --git a/CMakeLists.txt b/CMakeLists.txt index 548b12d328cbb..8e2b48e812eba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,26 @@ #============================================================================= project(mscore) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) + +# +# Check for gcc compiler >= 4.7 +# +if (CMAKE_COMPILER_IS_GNUCXX) + message("gcc compiler version " ${CMAKE_CXX_COMPILER_VERSION}) + string(REGEX MATCH "([0-9]*)\\.([0-9]*)\\.([0-9]*)" major ${CMAKE_CXX_COMPILER_VERSION}) + + set(major ${CMAKE_MATCH_1}) + set(minor ${CMAKE_MATCH_2}) + set(patch ${CMAKE_MATCH_3}) + + if (${major} LESS 4 OR ((${major} EQUAL 4) AND (${minor} LESS 7))) + message(FATAL_ERROR "bad gcc compiler version " ${CMAKE_CXX_COMPILER_VERSION} + " >= 4.7 required") + endif (${major} LESS 4 OR ((${major} EQUAL 4) AND (${minor} LESS 7))) + +endif (CMAKE_COMPILER_IS_GNUCXX) + cmake_policy(SET CMP0003 NEW) @@ -287,34 +306,29 @@ add_custom_command( WORKING_DIRECTORY ${PROJECT_BINARY_DIR} ) -set(CMAKE_CXX_FLAGS_DEBUG "-g") -set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") +set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -g") +set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -O2 -DNDEBUG") if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") if (MINGW) - set(FLAGS -DQT_DEBUG -DQT_DLL) + set(FLAGS -std=c++0x -DQT_DEBUG -DQT_DLL) else (MINGW) if(APPLE) - set (FLAGS -O0 -DQT_DEBUG) + set (FLAGS -std=c++0x -O0 -DQT_DEBUG) else (APPLE) - set (FLAGS -DQT_DEBUG) + set (FLAGS -std=c++0x -DQT_DEBUG) endif(APPLE) endif (MINGW) else (CMAKE_BUILD_TYPE STREQUAL "DEBUG") if (MINGW) - set(FLAGS -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG) + set(FLAGS -std=c++0x -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG) else (MINGW) - set(FLAGS -O2 -DNDEBUG -DQT_NO_DEBUG) + set(FLAGS -std=c++0x -O2 -DNDEBUG -DQT_NO_DEBUG) endif (MINGW) endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG") string(REPLACE ";" ";-I" INC "${QT_INCLUDES}") -message("${CMAKE_CXX_COMPILER} - -x c++-header -g ${FLAGS} - ${a} - -o all.h.gch all.h") - add_custom_command( OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch COMMAND ${CMAKE_CXX_COMPILER} diff --git a/fonts/FreeSerifMscore.sfd b/fonts/FreeSerifMscore.sfd index 0e60c3d5d1054..baaa041874f2c 100644 --- a/fonts/FreeSerifMscore.sfd +++ b/fonts/FreeSerifMscore.sfd @@ -20,7 +20,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1203285272 -ModificationTime: 1304606962 +ModificationTime: 1360686340 PfmFamily: 17 TTFWeight: 400 TTFWidth: 5 @@ -331,6 +331,9 @@ ChainSub2: class "Required Feature in Thai lookup 13 subtable" 1 2 1 1 FClsList: 1 SeqLookup: 0 "'ccmp' Zeichenzusammensetzung in Thai lookup 14" + ClassNames: "0" + BClassNames: "0" "1" + FClassNames: "0" EndFPST TtTable: prep PUSHW_1 @@ -898,14 +901,14 @@ LangName: 1036 "" "" "Normal" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "P LangName: 1043 "" "" "Gemiddeld" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "Zweedse ex-VIP, behoorl+ATMA-k gek op quantumfysica." LangName: 1049 "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "+BBIA +BEcEMARJBDAERQAA +BE4EMwQw +BDYEOAQ7--+BDEESwQ7 +BEYEOARCBEAEQwRB...+IBQENAQw, +BD0EPgAA +BEQEMAQ7BEwESAQ4BDIESwQ5 +BE0EOgQ3BDUEPAQ/BDsETwRABEoA!" LangName: 1060 "" "" "navadno" "" "" "" "" "" "" "" "" "" "" "Dovoljena je uporaba v skladu z licenco GNU General Public License." "http://www.gnu.org/copyleft/gpl.html" "" "" "" "" "+AWAA-erif bo za vajo spet kuhal doma+AQ0A-e +AX4A-gance." -GaspTable: 2 8 2 65535 3 +GaspTable: 2 8 2 65535 3 0 Encoding: UnicodeFull UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -96 AntiAlias: 1 FitToEm: 1 -WinInfo: 119051 17 9 +WinInfo: 119119 13 9 AnchorClass2: "Anker-0" "'mark' Mark Positioning in Thai lookup 1 subtable" "Anker-1" "'mark' Mark Positioning in Thai lookup 2 anchor 0" "Anker-2" "'mark' Mark Positioning in Thai lookup 2 anchor 1" "Anker-3" "'mark' Mark Positioning in Thai lookup 2 anchor 2" "Anker-4" "'mkmk' Mark to Mark in Thai lookup 3 anchor 0" "Anker-5" "'mkmk' Mark to Mark in Thai lookup 3 anchor 1" "Anker-6" "'mark' Mark Positioning lookup 4 subtable" "Anker-7" "'mark' Mark Positioning lookup 5 subtable" "Anker-8" "'mark' Mark Positioning in Latin lookup 6 subtable" "Anker-9" "'mark' Mark Positioning in Latin lookup 6 subtable" "Anker-10" "'mark' Mark Positioning in Latin lookup 6 subtable" "Anker-11" "'mark' Mark Positioning in Latin lookup 6 subtable" "Anker-12" "'mark' Mark Positioning in Latin lookup 6 subtable" "Anker-13" "'mark' Mark Positioning in Latin lookup 7 subtable" "Anker-14" "'mkmk' Mark to Mark in Latin lookup 8 subtable" "Anker-15" "'mkmk' Mark to Mark in Latin lookup 8 subtable" "Anker-16" "'mkmk' Mark to Mark in Latin lookup 8 subtable" "Anker-17" "'mkmk' Mark to Mark in Latin lookup 8 subtable" "Anker-18" "'mark' Mark Positioning in Hanun+APMA-o lookup 11 subtable" "Anker-19" "'mark' Mark Positioning in Hanun+APMA-o lookup 11 subtable" "Anker-20" "'mark' Mark Positioning in Gothic lookup 12 anchor 0" "Anker-21" "'mark' Mark Positioning in Gothic lookup 12 anchor 1" BeginChars: 1115551 7973 @@ -328561,252 +328564,339 @@ EndChar StartChar: rinforzando Encoding: 119180 119180 6751 -Width: 215 -GlyphClass: 2 -Flags: W -LayerCount: 2 -Fore -SplineSet -31 59 m 0,0,1 - 31 82 31 82 53.5 109 c 128,-1,2 - 76 136 76 136 96 136 c 0,3,4 - 132 136 132 136 144 113 c 1,5,6 - 170 136 170 136 198 136 c 0,7,8 - 239 136 239 136 239 94 c 0,9,10 - 239 77 239 77 227.5 61.5 c 128,-1,11 - 216 46 216 46 199 46 c 0,12,13 - 176 46 176 46 176 70 c 0,14,15 - 176 96 176 96 199 107 c 1,16,17 - 198 108 198 108 194 108 c 0,18,19 - 180 108 180 108 168 99.5 c 128,-1,20 - 156 91 156 91 147 76.5 c 128,-1,21 - 138 62 138 62 131 46 c 128,-1,22 - 124 30 124 30 119 11.5 c 128,-1,23 - 114 -7 114 -7 111 -20.5 c 128,-1,24 - 108 -34 108 -34 106 -46 c 2,25,-1 - 103 -59 l 1,26,27 - 92 -86 92 -86 65 -86 c 0,28,29 - 41 -86 41 -86 41 -62 c 0,30,31 - 41 -56 41 -56 42 -53 c 2,32,-1 - 86 79 l 2,33,34 - 91 94 91 94 91 105 c 0,35,36 - 91 108 91 108 89 108 c 0,37,38 - 78 108 78 108 67 77.5 c 128,-1,39 - 56 47 56 47 46 47 c 0,40,41 - 31 47 31 47 31 59 c 0,0,1 -EndSplineSet -Validated: 1 +Width: 400 +VWidth: 1024 +GlyphClass: 2 +Flags: W +HStem: 0 21G<9 129.5> 470 79<311.087 436.5> 487 61<53.3594 155.5> +VStem: -31 29<395.067 434.919> +DStem2: 5 18 143 18 0.25088 0.968018<10.4665 446.135> +LayerCount: 2 +Fore +SplineSet +443 387 m 256,0,1 + 416 387 416 387 402 400 c 256,2,3 + 388 413 388 413 385.5 428.5 c 256,4,5 + 383 444 383 444 374 457 c 256,6,7 + 365 470 365 470 346 470 c 256,8,9 + 315 470 315 470 280.5 443.5 c 256,10,11 + 246 417 246 417 239 386 c 257,12,-1 + 143 18 l 258,13,14 + 138 0 138 0 121 0 c 258,15,-1 + 18 0 l 258,16,17 + 0 0 0 0 5 18 c 258,18,-1 + 111 427 l 258,19,20 + 114 439 114 439 114 451 c 256,21,22 + 114 487 114 487 86 487 c 256,23,24 + 62 487 62 487 34 460 c 256,25,26 + 9 437 9 437 -2 406 c 280,27,28 + -6 395 -6 395 -18 395 c 257,29,30 + -30 395 -30 395 -31 407 c 257,31,32 + -31 444 -31 444 24 502 c 256,33,34 + 68 548 68 548 137 548 c 256,35,36 + 174 548 174 548 201.5 530.5 c 256,37,38 + 229 513 229 513 243 483 c 257,39,40 + 321 549 321 549 412 549 c 256,41,42 + 461 549 461 549 491 528.5 c 256,43,44 + 521 508 521 508 521 474 c 256,45,46 + 521 442 521 442 497 414.5 c 256,47,48 + 473 387 473 387 443 387 c 256,0,1 +EndSplineSet +Validated: 8912897 EndChar StartChar: subito Encoding: 119181 119181 6752 -Width: 188 -GlyphClass: 2 -Flags: W -LayerCount: 2 -Fore -SplineSet -54 54 m 0,0,1 - 54 91 54 91 80 113.5 c 128,-1,2 - 106 136 106 136 146 136 c 0,3,4 - 205 136 205 136 205 95 c 128,-1,5 - 205 54 205 54 173 54 c 0,6,7 - 153 54 153 54 153 75 c 0,8,9 - 153 93 153 93 167 105 c 1,10,11 - 160 108 160 108 147 108 c 0,12,13 - 105 108 105 108 105 76 c 0,14,15 - 105 67 105 67 118 62.5 c 128,-1,16 - 131 58 131 58 146 55.5 c 128,-1,17 - 161 53 161 53 174 40.5 c 128,-1,18 - 187 28 187 28 187 6 c 0,19,20 - 187 -35 187 -35 156.5 -60.5 c 128,-1,21 - 126 -86 126 -86 79 -86 c 0,22,23 - 9 -86 9 -86 9 -42 c 0,24,25 - 9 -24 9 -24 20 -9 c 128,-1,26 - 31 6 31 6 47 6 c 0,27,28 - 69 6 69 6 69 -18 c 128,-1,29 - 69 -42 69 -42 50 -54 c 1,30,31 - 59 -58 59 -58 78 -58 c 0,32,33 - 136 -58 136 -58 136 -18 c 0,34,35 - 136 -7 136 -7 123 -1.5 c 128,-1,36 - 110 4 110 4 95 5.5 c 128,-1,37 - 80 7 80 7 67 19 c 128,-1,38 - 54 31 54 31 54 54 c 0,0,1 -EndSplineSet -Validated: 1 +Width: 377 +VWidth: 1024 +GlyphClass: 2 +Flags: W +HStem: 0 28<129.978 241.621> 510 24<275.077 342.491> +VStem: 35 76<47.2784 121.5> 115 109<334 437.599> 295 111<94.7729 183.927> 353 92<396.794 487.696> +LayerCount: 2 +Fore +SplineSet +224 403 m 256,0,1 + 224 377 224 377 252.5 352 c 256,2,3 + 281 327 281 327 315 307 c 256,4,5 + 349 287 349 287 377.5 252 c 256,6,7 + 406 217 406 217 406 175 c 256,8,9 + 406 98 406 98 341 49 c 256,10,11 + 276 0 276 0 188 0 c 256,12,13 + 126 0 126 0 80.5 28.5 c 256,14,15 + 35 57 35 57 35 106 c 256,16,17 + 35 137 35 137 50.5 159.5 c 256,18,19 + 66 182 66 182 91 182 c 256,20,21 + 116 182 116 182 133 164.5 c 256,22,23 + 150 147 150 147 150 123 c 256,24,25 + 150 111 150 111 130.5 97 c 256,26,27 + 111 83 111 83 111 71 c 256,28,29 + 111 48 111 48 132.5 38 c 256,30,31 + 154 28 154 28 184 28 c 256,32,33 + 229 28 229 28 262 55 c 256,34,35 + 295 82 295 82 295 123 c 256,36,37 + 295 160 295 160 267 190.5 c 256,38,39 + 239 221 239 221 205 240 c 256,40,41 + 171 259 171 259 143 288 c 256,42,43 + 115 317 115 317 115 351 c 256,44,45 + 115 428 115 428 172.5 481 c 256,46,47 + 230 534 230 534 310 534 c 256,48,49 + 378 534 378 534 411.5 500.5 c 256,50,51 + 445 467 445 467 445 423 c 256,52,53 + 445 392 445 392 429.5 371 c 256,54,55 + 414 350 414 350 386 350 c 256,56,57 + 362 350 362 350 345 362 c 256,58,59 + 328 374 328 374 328 389 c 256,60,61 + 328 393 328 393 340.5 416.5 c 256,62,63 + 353 440 353 440 353 465 c 256,64,65 + 353 484 353 484 344 497 c 256,66,67 + 335 510 335 510 318 510 c 256,68,69 + 278 510 278 510 251 478 c 256,70,71 + 224 446 224 446 224 403 c 256,0,1 +EndSplineSet +Validated: 8912897 EndChar StartChar: z_mus Encoding: 119182 119182 6753 -Width: 219 -GlyphClass: 2 -Flags: W -LayerCount: 2 -Fore -SplineSet -182 105 m 0,0,1 - 188 105 188 105 202 120.5 c 128,-1,2 - 216 136 216 136 224 136 c 0,3,4 - 242 136 242 136 242 125 c 0,5,6 - 242 109 242 109 84 -28 c 1,7,8 - 90 -28 90 -28 110 -26 c 128,-1,9 - 130 -24 130 -24 145 -23 c 1,10,11 - 171 -23 171 -23 183 -9.5 c 128,-1,12 - 195 4 195 4 210 4 c 0,13,14 - 219 4 219 4 219 -7 c 0,15,16 - 219 -13 219 -13 212 -29.5 c 128,-1,17 - 205 -46 205 -46 182.5 -66 c 128,-1,18 - 160 -86 160 -86 129 -86 c 0,19,20 - 117 -86 117 -86 97.5 -70.5 c 128,-1,21 - 78 -55 78 -55 72 -55 c 0,22,23 - 60 -55 60 -55 23 -86 c 1,24,-1 - 18 -86 l 2,25,26 - 1 -86 1 -86 1 -76 c 0,27,28 - 1 -50 1 -50 157 77 c 1,29,30 - 127 76 127 76 107.5 73 c 128,-1,31 - 88 70 88 70 80 67.5 c 128,-1,32 - 72 65 72 65 70 65 c 0,33,34 - 56 65 56 65 56 76 c 0,35,36 - 56 80 56 80 62.5 93 c 128,-1,37 - 69 106 69 106 86 121 c 128,-1,38 - 103 136 103 136 125 136 c 0,39,40 - 139 136 139 136 158 120.5 c 128,-1,41 - 177 105 177 105 182 105 c 0,0,1 -EndSplineSet -Validated: 1 +Width: 523 +VWidth: 1024 +GlyphClass: 2 +Flags: W +HStem: -29 137<258.661 471.715> 18 110<55.5 245.575> 329 158<106.363 198.211> +VStem: 495 27<125.986 216.425> +DStem2: 5 26 134 108 0.731118 0.682251<150.259 532.062> +LayerCount: 2 +Fore +SplineSet +65 18 m 256,0,1 + 46 18 46 18 31 9 c 256,2,3 + 16 0 16 0 14 0 c 256,4,5 + 0 -1 0 -1 0 13 c 256,6,7 + 0 21 0 21 5 26 c 258,8,-1 + 394 389 l 257,9,10 + 360 378 360 378 321.5 371 c 256,11,12 + 283 364 283 364 232.5 356.5 c 256,13,14 + 182 349 182 349 157 345 c 256,15,16 + 72 329 72 329 63 329 c 256,17,18 + 29 329 29 329 29 359 c 257,19,20 + 29 405 29 405 79.5 446 c 256,21,22 + 130 487 130 487 181 487 c 256,23,24 + 251 487 251 487 324 471 c 256,25,26 + 397 455 397 455 436 455 c 256,27,28 + 459 455 459 455 474 465 c 256,29,30 + 489 475 489 475 492 475 c 256,31,32 + 506 475 506 475 506 460 c 256,33,34 + 506 454 506 454 502 450 c 258,35,-1 + 134 108 l 257,36,37 + 177 128 177 128 195 128 c 256,38,39 + 244 128 244 128 310 118 c 256,40,41 + 376 108 376 108 425 108 c 256,42,43 + 495 108 495 108 495 163 c 256,44,45 + 495 177 495 177 490 194 c 256,46,47 + 485 211 485 211 485 212 c 256,48,49 + 485 225 485 225 500 225 c 256,50,51 + 522 225 522 225 522 139 c 256,52,53 + 522 72 522 72 493 20 c 256,54,55 + 465 -29 465 -29 411 -29 c 256,56,57 + 383 -29 383 -29 272 -9 c 256,58,59 + 122 18 122 18 65 18 c 256,0,1 +EndSplineSet +Validated: 8912897 EndChar StartChar: piano Encoding: 119183 119183 6754 -Width: 255 -GlyphClass: 2 -Flags: W -LayerCount: 2 -Fore -SplineSet -25 59 m 0,0,1 - 25 80 25 80 47.5 108 c 128,-1,2 - 70 136 70 136 91 136 c 0,3,4 - 126 136 126 136 139 114 c 1,5,6 - 165 136 165 136 194 136 c 0,7,8 - 260 136 260 136 260 68 c 0,9,10 - 260 11 260 11 220 -37.5 c 128,-1,11 - 180 -86 180 -86 126 -86 c 0,12,13 - 106 -86 106 -86 92 -75 c 1,14,-1 - 70 -139 l 1,15,16 - 94 -139 94 -139 94 -153 c 0,17,18 - 94 -172 94 -172 80 -172 c 2,19,-1 - -11 -172 l 2,20,21 - -20 -172 -20 -172 -20 -161 c 0,22,23 - -20 -139 -20 -139 7 -139 c 1,24,-1 - 81 80 l 2,25,26 - 85 91 85 91 85 105 c 0,27,28 - 85 108 85 108 83 108 c 0,29,30 - 73 108 73 108 62 78 c 128,-1,31 - 51 48 51 48 43 48 c 2,32,-1 - 33 48 l 2,33,34 - 25 48 25 48 25 59 c 0,0,1 -126 -58 m 0,35,36 - 152 -58 152 -58 176.5 -2 c 128,-1,37 - 201 54 201 54 201 91 c 0,38,39 - 201 108 201 108 187 108 c 0,40,41 - 165 108 165 108 143 82 c 1,42,43 - 143 79 143 79 105 -41 c 1,44,45 - 110 -58 110 -58 126 -58 c 0,35,36 -EndSplineSet -Validated: 1 +Width: 667 +VWidth: 1024 +GlyphClass: 2 +Flags: WO +HStem: -266 30<-246.754 -81.2432 114.836 223.745> -257 23<-204.399 -80.125> 29 36<212 297> 444 90<67.3439 162 367.528 464.142> +VStem: 472 180<264.791 431.823> +DStem2: -72 -210 109 -202 0.324365 0.945932<57.6165 317.941> +LayerCount: 2 +Fore +SplineSet +427 444 m 256,0,1 + 377 444 377 444 332.5 386 c 256,2,3 + 288 328 288 328 265 257 c 256,4,5 + 242 186 242 186 242 136 c 256,6,7 + 242 65 242 65 297 65 c 256,8,9 + 346 65 346 65 379 100 c 257,10,11 + 415 140 415 140 443.5 240.5 c 256,12,13 + 472 341 472 341 472 383 c 256,14,15 + 472 444 472 444 427 444 c 256,0,1 +137 534 m 256,16,17 + 187 534 187 534 222.5 508 c 256,18,19 + 258 482 258 482 268 438 c 257,20,21 + 308 482 308 482 359 508 c 256,22,23 + 410 534 410 534 458 534 c 256,24,25 + 550 534 550 534 601 475.5 c 256,26,27 + 652 417 652 417 652 325 c 256,28,29 + 652 171 652 171 544 76 c 256,30,31 + 449 -8 449 -8 366 -8 c 256,32,33 + 323 -8 323 -8 290 1 c 256,34,35 + 257 10 257 10 238.5 19.5 c 256,36,37 + 220 29 220 29 212 29 c 256,38,39 + 187 29 187 29 181 10 c 258,40,-1 + 109 -202 l 258,41,42 + 108 -205 108 -205 108 -211 c 256,43,44 + 108 -228 108 -228 137 -232 c 256,45,46 + 166 -236 166 -236 195 -238 c 256,47,48 + 224 -240 224 -240 224 -253 c 256,49,50 + 224 -266 224 -266 211 -266 c 256,51,52 + 56 -257 56 -257 -11 -257 c 256,53,54 + -81 -257 -81 -257 -232 -266 c 256,55,56 + -247 -266 -247 -266 -247 -253 c 256,57,58 + -247 -241 -247 -241 -219 -236 c 256,59,60 + -203 -234 -203 -234 -120 -234 c 256,61,62 + -80 -234 -80 -234 -72 -210 c 258,63,-1 + 131 382 l 274,64,65 + 136 397 136 397 136 410 c 256,66,67 + 136 444 136 444 106 444 c 256,68,69 + 63 444 63 444 15 387 c 256,70,71 + -34 329 -34 329 -60 266 c 256,72,73 + -67 249 -67 249 -86 249 c 256,74,75 + -100 249 -100 249 -100 261 c 272,76,77 + -100 273 -100 273 -90 290 c 256,78,79 + -46 387 -46 387 -10 438 c 256,80,81 + 16 475 16 475 56 504.5 c 256,82,83 + 96 534 96 534 137 534 c 256,16,17 +EndSplineSet +Validated: 8912897 EndChar StartChar: mezzo Encoding: 119184 119184 6755 -Width: 412 -GlyphClass: 2 -Flags: W -LayerCount: 2 -Fore -SplineSet -391 88 m 0,0,1 - 391 63 391 63 367 6.5 c 128,-1,2 - 343 -50 343 -50 343 -58 c 1,3,4 - 363 -58 363 -58 381 -12 c 0,5,6 - 387 2 387 2 403 2 c 0,7,8 - 418 2 418 2 418 -9 c 0,9,10 - 418 -14 418 -14 409 -31 c 128,-1,11 - 400 -48 400 -48 379.5 -67 c 128,-1,12 - 359 -86 359 -86 336 -86 c 0,13,14 - 315 -86 315 -86 300.5 -74 c 128,-1,15 - 286 -62 286 -62 286 -44 c 0,16,17 - 286 -33 286 -33 309 20.5 c 128,-1,18 - 332 74 332 74 332 96 c 0,19,20 - 332 108 332 108 325 108 c 0,21,22 - 308 108 308 108 289 89 c 128,-1,23 - 270 70 270 70 264 52 c 2,24,-1 - 227 -59 l 1,25,26 - 216 -86 216 -86 190 -86 c 0,27,28 - 165 -86 165 -86 165 -62 c 0,29,30 - 165 -55 165 -55 166 -53 c 2,31,-1 - 203 57 l 2,32,33 - 211 81 211 81 211 94 c 0,34,35 - 211 108 211 108 200 108 c 0,36,37 - 167 108 167 108 142 58 c 1,38,39 - 132 33 132 33 122 0.5 c 128,-1,40 - 112 -32 112 -32 107 -47.5 c 128,-1,41 - 102 -63 102 -63 91.5 -74.5 c 128,-1,42 - 81 -86 81 -86 65 -86 c 0,43,44 - 41 -86 41 -86 41 -62 c 0,45,46 - 41 -56 41 -56 42 -53 c 2,47,-1 - 86 79 l 2,48,49 - 91 94 91 94 91 105 c 0,50,51 - 91 108 91 108 89 108 c 0,52,53 - 80 108 80 108 71 77.5 c 128,-1,54 - 62 47 62 47 49 47 c 0,55,56 - 31 47 31 47 31 59 c 0,57,58 - 31 82 31 82 53.5 109 c 128,-1,59 - 76 136 76 136 96 136 c 0,60,61 - 136 136 136 136 147 106 c 1,62,63 - 176 136 176 136 203 136 c 0,64,65 - 259 136 259 136 268 103 c 1,66,67 - 300 136 300 136 332 136 c 0,68,69 - 391 136 391 136 391 88 c 0,0,1 -EndSplineSet -Validated: 1 +Width: 801 +VWidth: 1024 +GlyphClass: 2 +Flags: W +HStem: 0 21G<9.5 131.5 263 385> 426 115<89 179.683 328.5 409.273 559 642.113> +VStem: 519 167<33.8164 131.375> +DStem2: 6 18 146 18 0.322729 0.946491<18.8264 396.929> 259 18 399 18 0.275449 0.961316<13.581 391.929> 521 67 687 121 0.230305 0.973119<81.9724 334.264> +LayerCount: 2 +Fore +SplineSet +-50 260 m 256,0,1 + -50 262 -50 262 -40 292 c 256,2,3 + -15 366 -15 366 40 444 c 256,4,5 + 109 541 109 541 196 541 c 256,6,7 + 229 541 229 541 249.5 512 c 256,8,9 + 270 483 270 483 274 441 c 257,10,11 + 339 540 339 540 420 541 c 256,12,13 + 455 541 455 541 477 511 c 256,14,15 + 499 481 499 481 504 438 c 257,16,17 + 566 540 566 540 645 541 c 256,18,19 + 689 541 689 541 722 503.5 c 256,20,21 + 755 466 755 466 755 419 c 256,22,23 + 755 406 755 406 752 393 c 258,24,-1 + 687 121 l 258,25,26 + 686 118 686 118 686 112 c 256,27,28 + 686 98 686 98 698 97 c 256,29,30 + 718 97 718 97 757.5 128.5 c 256,31,32 + 797 160 797 160 800 160 c 256,33,34 + 811 160 811 160 811 150 c 256,35,36 + 811 144 811 144 805 137 c 256,37,38 + 720 55 720 55 685 32 c 256,39,40 + 629 -7 629 -7 580 -7 c 256,41,42 + 552 -7 552 -7 535.5 9 c 256,43,44 + 519 25 519 25 519 49 c 256,45,46 + 519 54 519 54 521 67 c 258,47,-1 + 592 367 l 258,48,49 + 596 385 596 385 596 393 c 256,50,51 + 596 426 596 426 574 426 c 256,52,53 + 552 426 552 426 529 408.5 c 256,54,55 + 506 391 506 391 499 367 c 258,56,-1 + 399 18 l 258,57,58 + 394 0 394 0 376 0 c 258,59,-1 + 272 0 l 258,60,61 + 254 0 254 0 259 18 c 258,62,-1 + 358 367 l 258,63,64 + 363 384 363 384 364 396 c 256,65,66 + 364 426 364 426 341 426 c 256,67,68 + 318 426 318 426 295.5 408 c 256,69,70 + 273 390 273 390 265 367 c 258,71,-1 + 146 18 l 258,72,73 + 141 0 141 0 122 0 c 258,74,-1 + 18 0 l 258,75,76 + 1 0 1 0 6 18 c 258,77,-1 + 125 367 l 258,78,79 + 131 387 131 387 131 395 c 256,80,81 + 131 426 131 426 105 426 c 256,82,83 + 69 426 69 426 37 376.5 c 256,84,85 + 5 327 5 327 -15 266 c 256,86,87 + -21 250 -21 250 -38 250 c 256,88,89 + -50 250 -50 250 -50 260 c 256,0,1 +EndSplineSet +Validated: 524289 EndChar StartChar: forte Encoding: 119185 119185 6756 -Width: 198 -GlyphClass: 2 -Flags: W -LayerCount: 2 -Fore -SplineSet --29 -115 m 0,0,1 - -14 -115 -14 -115 -7.5 -125 c 128,-1,2 - -1 -135 -1 -135 0.5 -145 c 128,-1,3 - 2 -155 2 -155 6 -155 c 0,4,5 - 17 -155 17 -155 36 -84 c 2,6,-1 - 86 95 l 1,7,-1 - 55 95 l 2,8,9 - 44 95 44 95 44 107 c 0,10,11 - 44 128 44 128 60 128 c 2,12,-1 - 96 128 l 1,13,14 - 134 249 134 249 211 249 c 0,15,16 - 266 249 266 249 266 210 c 0,17,18 - 266 181 266 181 236 181 c 0,19,20 - 223 181 223 181 216.5 190.5 c 128,-1,21 - 210 200 210 200 207.5 210 c 128,-1,22 - 205 220 205 220 203 220 c 0,23,24 - 191 220 191 220 168 128 c 1,25,-1 - 199 128 l 2,26,27 - 211 128 211 128 211 116 c 0,28,29 - 211 95 211 95 197 95 c 2,30,-1 - 160 95 l 1,31,-1 - 126 -17 l 1,32,33 - 73 -184 73 -184 -5 -184 c 0,34,35 - -58 -184 -58 -184 -58 -146 c 0,36,37 - -58 -115 -58 -115 -29 -115 c 0,0,1 -EndSplineSet -Validated: 1 +Width: 587 +VWidth: 1024 +GlyphClass: 2 +Flags: W +HStem: -295 39<-79.2169 28.6035> 485 40<105.005 234 478 617.995> 851 38<580.851 692.306> +VStem: -186 106<-253.9 -195.038> 693 107<788.663 847.802> +LayerCount: 2 +Fore +SplineSet +467 485 m 257,0,-1 + 371 172 l 258,1,2 + 349 100 349 100 309.5 22 c 256,3,4 + 270 -56 270 -56 218.5 -129 c 256,5,6 + 167 -202 167 -202 101.5 -248.5 c 256,7,8 + 36 -295 36 -295 -27 -295 c 256,9,10 + -93 -295 -93 -295 -139.5 -271 c 256,11,12 + -186 -247 -186 -247 -186 -199 c 256,13,14 + -186 -142 -186 -142 -161 -99.5 c 256,15,16 + -136 -57 -136 -57 -91 -57 c 256,17,18 + -58 -57 -58 -57 -34 -80.5 c 256,19,20 + -10 -104 -10 -104 -10 -137 c 256,21,22 + -10 -155 -10 -155 -21 -168 c 256,23,24 + -32 -181 -32 -181 -45 -187 c 256,25,26 + -58 -193 -58 -193 -69 -205.5 c 256,27,28 + -80 -218 -80 -218 -80 -237 c 256,29,30 + -80 -256 -80 -256 -39 -256 c 258,31,-1 + -27 -256 l 258,32,33 + -3 -256 -3 -256 16 -245 c 256,34,35 + 35 -234 35 -234 46 -220.5 c 256,36,37 + 57 -207 57 -207 67.5 -180 c 256,38,39 + 78 -153 78 -153 82.5 -134 c 256,40,41 + 87 -115 87 -115 94.5 -79.5 c 256,42,43 + 102 -44 102 -44 106 -29 c 258,44,-1 + 234 485 l 257,45,-1 + 125 485 l 258,46,47 + 105 485 105 485 105 505 c 256,48,49 + 105 525 105 525 125 525 c 258,50,-1 + 245 525 l 257,51,52 + 287 668 287 668 399.5 778.5 c 256,53,54 + 512 889 512 889 640 889 c 256,55,56 + 706 889 706 889 753 865 c 256,57,58 + 800 841 800 841 800 793 c 256,59,60 + 800 736 800 736 774.5 693.5 c 256,61,62 + 749 651 749 651 703 651 c 256,63,64 + 670 651 670 651 647 674.5 c 256,65,66 + 624 698 624 698 624 731 c 256,67,68 + 624 749 624 749 634.5 762 c 256,69,70 + 645 775 645 775 658.5 781 c 256,71,72 + 673 787 673 787 682.5 800 c 256,73,74 + 693 814 693 814 693 831 c 256,75,76 + 693 851 693 851 652 851 c 258,77,-1 + 640 851 l 258,78,79 + 603 851 603 851 577 831 c 256,80,81 + 551 811 551 811 536 772 c 256,82,83 + 521 733 521 733 513 697.5 c 256,84,85 + 505 662 505 662 495 608 c 256,86,87 + 485 554 485 554 478 525 c 257,88,-1 + 598 525 l 258,89,90 + 618 525 618 525 618 505 c 256,91,92 + 618 485 618 485 598 485 c 258,93,-1 + 467 485 l 257,0,-1 +EndSplineSet +Validated: 524289 EndChar StartChar: crescendo diff --git a/fonts/FreeSerifMscore.ttf b/fonts/FreeSerifMscore.ttf index b741231c12a4a..99fe6766ee0e3 100644 Binary files a/fonts/FreeSerifMscore.ttf and b/fonts/FreeSerifMscore.ttf differ diff --git a/libmscore/dynamic.cpp b/libmscore/dynamic.cpp index 95a0417a791c1..b8aaff9ec3501 100644 --- a/libmscore/dynamic.cpp +++ b/libmscore/dynamic.cpp @@ -21,42 +21,51 @@ #include "style.h" #include "mscore.h" -// -// see: http://en.wikipedia.org/wiki/File:Dynamic's_Note_Velocity.svg -// -Dyn dynList[] = { +//----------------------------------------------------------------------------- +// Dyn +// see: http://en.wikipedia.org/wiki/File:Dynamic's_Note_Velocity.svg +//----------------------------------------------------------------------------- + +struct Dyn { + int velocity; ///< associated midi velocity (0-127, -1 = none) + bool accent; ///< if true add velocity to current chord velocity + const char* tag; // name of dynamics, eg. "fff" + const char* text; // utf8 text of dynamic + }; + +static Dyn dynList[] = { // dynamic: - Dyn( -1, true, "other-dynamics"), - Dyn( 1, false, "pppppp"), - Dyn( 5, false, "ppppp"), - Dyn( 10, false, "pppp"), - Dyn( 16, false, "ppp"), - Dyn( 33, false, "pp"), - Dyn( 49, false, "p"), - Dyn( 64, false, "mp"), - Dyn( 80, false, "mf"), - Dyn( 96, false, "f"), - Dyn(112, false, "ff"), - Dyn(126, false, "fff"), - Dyn(127, false, "ffff"), - Dyn(127, false, "fffff"), - Dyn(127, false, "ffffff"), + { -1, true, "other-dynamics", "" }, + { 1, false, "pppppp", u8"\U0001d18f\U0001d18f\U0001d18f\U0001d18f\U0001d18f\U0001d18f" }, + { 5, false, "ppppp", u8"\U0001d18f\U0001d18f\U0001d18f\U0001d18f\U0001d18f" }, + { 10, false, "pppp", u8"\U0001d18f\U0001d18f\U0001d18f\U0001d18f" }, + { 16, false, "ppp", u8"\U0001d18f\U0001d18f\U0001d18f" }, + { 33, false, "pp", u8"\U0001d18f\U0001d18f" }, + { 49, false, "p", u8"\U0001d18f" }, + { 64, false, "mp", u8"\U0001d190\U0001d18f" }, + { 80, false, "mf", u8"\U0001d190\U0001d191" }, + { 96, false, "f", u8"\U0001d191" }, + { 112, false, "ff", u8"\U0001d191\U0001d191" }, + { 126, false, "fff", u8"\U0001d191\U0001d191\U0001d191" }, + { 127, false, "ffff", u8"\U0001d191\U0001d191\U0001d191\U0001d191" }, + { 127, false, "fffff", u8"\U0001d191\U0001d191\U0001d191\U0001d191\U0001d191" }, + { 127, false, "ffffff", u8"\U0001d191\U0001d191\U0001d191\U0001d191\U0001d191\U0001d191" }, // accents: - Dyn( 0, true, "fp"), - Dyn( 0, true, "sf"), - Dyn( 0, true, "sfz"), - Dyn( 0, true, "sff"), - Dyn( 0, true, "sffz"), - Dyn( 0, true, "sfp"), - Dyn( 0, true, "sfpp"), - Dyn( 0, true, "rfz"), - Dyn( 0, true, "rf"), - Dyn( 0, true, "fz"), - Dyn( 0, true, "m"), - Dyn( 0, true, "r"), - Dyn( 0, true, "s"), - Dyn( 0, true, "z"), + { 0, true, "fp", u8"\U0001d191\U0001d18f"}, + { 0, true, "sf", u8"\U0001d18d\U0001d191"}, + { 0, true, "sfz", u8"\U0001d18d\U0001d191\U0001d18e"}, + { 0, true, "sff", u8"\U0001d18d\U0001d191\U0001d191"}, + { 0, true, "sffz", u8"\U0001d18d\U0001d191\U0001d191\U0001d18e"}, + { 0, true, "sfp", u8"\U0001d18d\U0001d191\U0001d18f"}, + { 0, true, "sfpp", u8"\U0001d18d\U0001d191\U0001d18f\U0001d18f"}, + { 0, true, "rfz", u8"\U0001d18c\U0001d191\U0001d18e"}, + { 0, true, "rf", u8"\U0001d18c\U0001d191"}, + { 0, true, "fz", u8"\U0001d191\U0001d18e"}, + { 0, true, "m", u8"\U0001d190"}, + { 0, true, "r", u8"\U0001d18c"}, + { 0, true, "s", u8"\U0001d18d"}, + { 0, true, "z", u8"\U0001d18e"}, }; //--------------------------------------------------------- @@ -69,7 +78,8 @@ Dynamic::Dynamic(Score* s) setFlags(ELEMENT_MOVABLE | ELEMENT_SELECTABLE); _velocity = -1; _dynRange = DYNAMIC_PART; - setSubtype(0); + setTextStyleType(TEXT_STYLE_DYNAMICS); + _subtype = DYNAMIC_OTHER; } Dynamic::Dynamic(const Dynamic& d) @@ -129,8 +139,7 @@ void Dynamic::read(XmlReader& e) else if (!Text::readProperties(e)) e.unknown(); } - if (score()->mscVersion() < 118) - setTextStyleType(TEXT_STYLE_DYNAMICS2); + setTextStyleType(TEXT_STYLE_DYNAMICS); } //--------------------------------------------------------- @@ -154,27 +163,17 @@ void Dynamic::layout() // setSubtype //--------------------------------------------------------- -void Dynamic::setSubtype(int idx) - { - setTextStyleType(idx == 0 ? TEXT_STYLE_DYNAMICS : TEXT_STYLE_DYNAMICS2); - _subtype = idx; - } - -//--------------------------------------------------------- -// setSubtype -//--------------------------------------------------------- - void Dynamic::setSubtype(const QString& tag) { int n = sizeof(dynList)/sizeof(*dynList); for (int i = 1; i < n; ++i) { if (dynList[i].tag == tag) { - setSubtype(i); - setText(tag); + setSubtype(DynamicType(i)); + setText(QString::fromUtf8(dynList[i].text)); return; } } - setSubtype(0); + setSubtype(DYNAMIC_OTHER); setText(tag); } @@ -193,7 +192,6 @@ QString Dynamic::subtypeName() const void Dynamic::startEdit(MuseScoreView* v, const QPointF& p) { -// setSubtype(0); Text::startEdit(v, p); } @@ -260,7 +258,7 @@ QVariant Dynamic::getProperty(P_ID propertyId) const bool Dynamic::setProperty(P_ID propertyId, const QVariant& v) { - switch(propertyId) { + switch (propertyId) { case P_DYNAMIC_RANGE: _dynRange = DynamicRange(v.toInt()); break; @@ -268,7 +266,7 @@ bool Dynamic::setProperty(P_ID propertyId, const QVariant& v) _velocity = v.toInt(); break; case P_SUBTYPE: - _subtype = v.toInt(); + _subtype = DynamicType(v.toInt()); break; default: if (!Text::setProperty(propertyId, v)) diff --git a/libmscore/dynamic.h b/libmscore/dynamic.h index dd1bcdc92e9b6..914667b333a2c 100644 --- a/libmscore/dynamic.h +++ b/libmscore/dynamic.h @@ -20,19 +20,6 @@ class Measure; class Segment; -//--------------------------------------------------------- -// Dyn -//--------------------------------------------------------- - -struct Dyn { - int velocity; ///< associated midi velocity (0-127, -1 = none) - bool accent; ///< if true add velocity to current chord velocity - const char* tag; - - Dyn(int velo, bool a, const char* t) - : velocity(velo), accent(a), tag(t) {} - }; - //----------------------------------------------------------------------------- // @@ Dynamic /// dynamics marker; determines midi velocity @@ -44,7 +31,41 @@ class Dynamic : public Text { Q_OBJECT Q_PROPERTY(DynamicRange type READ dynRange WRITE undoSetDynRange) - int _subtype; + public: + enum DynamicType { + DYNAMIC_OTHER, + DYNAMIC_pppppp, + DYNAMIC_ppppp, + DYNAMIC_pppp, + DYNAMIC_ppp, + DYNAMIC_pp, + DYNAMIC_p, + DYNAMIC_mp, + DYNAMIC_mf, + DYNAMIC_f, + DYNAMIC_ff, + DYNAMIC_fff, + DYNAMIC_ffff, + DYNAMIC_fffff, + DYNAMIC_ffffff, + DYNAMIC_fp, + DYNAMIC_sf, + DYNAMIC_sfz, + DYNAMIC_sff, + DYNAMIC_sffz, + DYNAMIC_sfp, + DYNAMIC_sfpp, + DYNAMIC_rfz, + DYNAMIC_rf, + DYNAMIC_fz, + DYNAMIC_m, + DYNAMIC_r, + DYNAMIC_s, + DYNAMIC_z + }; + + private: + DynamicType _subtype; mutable QPointF dragOffset; int _velocity; // associated midi velocity 0-127 @@ -58,10 +79,10 @@ class Dynamic : public Text { Segment* segment() const { return (Segment*)parent(); } Measure* measure() const { return (Measure*)parent()->parent(); } - void setSubtype(int val); + void setSubtype(DynamicType val) { _subtype = val; } void setSubtype(const QString&); QString subtypeName() const; - int subtype() const { return _subtype; } + DynamicType subtype() const { return _subtype; } virtual void layout(); virtual void write(Xml& xml) const; @@ -85,5 +106,4 @@ class Dynamic : public Text { QVariant propertyDefault(P_ID id) const; }; -extern Dyn dynList[]; #endif diff --git a/libmscore/exportmidi.cpp b/libmscore/exportmidi.cpp index 2657ab61ad499..49312398cde97 100644 --- a/libmscore/exportmidi.cpp +++ b/libmscore/exportmidi.cpp @@ -268,7 +268,7 @@ bool ExportMidi::write(const QString& name, bool midiExpandRepeats) EventMap events; cs->renderPart(&events, part); - for (EventMap::const_iterator i = events.begin(); i != events.end(); ++i) { + for (auto i = events.begin(); i != events.end(); ++i) { Event event = i.value(); if (event.channel() != channel) continue; diff --git a/libmscore/mscore.h b/libmscore/mscore.h index a6fba1af59318..ff919f1c18345 100644 --- a/libmscore/mscore.h +++ b/libmscore/mscore.h @@ -297,7 +297,7 @@ enum { TEXT_STYLE_INSTRUMENT_EXCERPT, TEXT_STYLE_DYNAMICS, - TEXT_STYLE_DYNAMICS2, +// TEXT_STYLE_DYNAMICS2, TEXT_STYLE_TECHNIK, TEXT_STYLE_TEMPO, TEXT_STYLE_METRONOME, diff --git a/libmscore/style.cpp b/libmscore/style.cpp index 4c62164201b80..bf09bbb624aef 100644 --- a/libmscore/style.cpp +++ b/libmscore/style.cpp @@ -271,12 +271,16 @@ void initStyle(MStyle* s) ALIGN_LEFT | ALIGN_TOP, QPointF(), OA, QPointF())); AS(TextStyle( - TR( "Dynamics"), ff, 12, false, true, false, + TR( "Dynamics"), ff, 12, false, + false, // italic? + false, ALIGN_LEFT | ALIGN_BASELINE, QPointF(0.0, 8.0), OS, QPointF(), true)); +#if 0 AS(TextStyle( // internal style - TR( "Dynamics2"), "MScore", 12, false, false, false, + TR( "Dynamics2"), ff, 12, false, false, false, ALIGN_LEFT | ALIGN_BASELINE, QPointF(0.0, 8.0), OS, QPointF(), true)); +#endif AS(TextStyle( TR( "Technik"), ff, 12, false, true, false, @@ -1299,6 +1303,8 @@ int StyleData::textStyleType(const QString& name) const if (_textStyles[i].name() == name) return i; } + if (name == "Dynamics2") + return TEXT_STYLE_DYNAMICS; qDebug("TextStyleType <%s> not found", qPrintable(name)); return TEXT_STYLE_UNKNOWN; } diff --git a/libmscore/text.cpp b/libmscore/text.cpp index 590f783ffc901..d186f1c05e09a 100644 --- a/libmscore/text.cpp +++ b/libmscore/text.cpp @@ -225,14 +225,6 @@ void Text::layout1() if (align() & ALIGN_BOTTOM) { o.ry() += 3; o.ry() -= size.height(); -#if 0 - if (_editMode) { - QFontMetricsF fm(textStyle().font(spatium())); - QRectF r1(fm.boundingRect(SimpleText::firstLine())); - QRectF r(fm.tightBoundingRect(SimpleText::firstLine())); - o.ry() -= (r1.height() - r.height()) * .5; - } -#endif } else if (align() & ALIGN_VCENTER) o.ry() -= (size.height() * .5); @@ -1323,8 +1315,8 @@ void Text::clear() void Text::setTextStyleType(int st) { - if (st == _styleIndex) - return; +// if (st == _styleIndex) +// return; _styleIndex = st; if (st != TEXT_STYLE_UNKNOWN) setTextStyle(score()->textStyle(st)); diff --git a/mscore/menus.cpp b/mscore/menus.cpp index 6cc468a2939ff..47f33cee1c23b 100644 --- a/mscore/menus.cpp +++ b/mscore/menus.cpp @@ -168,12 +168,9 @@ Palette* MuseScore::newDynamicsPalette() sp->setGrid(42, 28); sp->setDrawGrid(true); - static const char* dynS[] = { - "ppp", "pp", "p", "mp", "mf", "f", "ff", "fff" - }; - for (unsigned i = 0; i < sizeof(dynS)/sizeof(*dynS); ++i) { + for (const char* c : { "ppp", "pp", "p", "mp", "mf", "f", "ff", "fff" }) { Dynamic* dynamic = new Dynamic(gscore); - dynamic->setSubtype(dynS[i]); + dynamic->setSubtype(c); sp->append(dynamic, dynamic->subtypeName()); } return sp; diff --git a/mscore/textpalette.cpp b/mscore/textpalette.cpp index d2a5a76635577..f7792480fba6f 100644 --- a/mscore/textpalette.cpp +++ b/mscore/textpalette.cpp @@ -96,7 +96,6 @@ void TextPalette::populate() { bool musical = musicalSymbols->isChecked(); -// QFont f(musical ? "MScore1" : "FreeSerif"); QFont f("FreeSerifMscore"); f.setPixelSize(40); @@ -121,23 +120,16 @@ void TextPalette::populate() // 16 bit // tb->setFont(f); -#if QT_VERSION >= 0x040800 - if (fm.inFontUcs4(code)) -#else - if (fm.inFont(code) || (code & 0xffff0000)) -#endif - { + if (fm.inFontUcs4(code)) { rowEmpty = false; QString ss; if (code & 0xffff0000) { - ss = QChar(QChar::highSurrogate(code)); + ss = QChar(QChar::highSurrogate(code)); ss += QChar(QChar::lowSurrogate(code)); - tb->setToolTip(QString("0x%1").arg(code, 5, 16, QLatin1Char('0'))); } - else { + else ss = QChar(code); - tb->setToolTip(QString("0x%1").arg(code, 4, 16, QLatin1Char('0'))); - } + tb->setToolTip(QString("0x%1").arg(code, 5, 16, QLatin1Char('0'))); tb->setIcon(codeIcon(ss, f)); tb->setIconSize(QSize(25, 25)); sg->setId(tb, code); diff --git a/mscore/workspace.cpp b/mscore/workspace.cpp index a50084081800c..d47ee5de6d428 100644 --- a/mscore/workspace.cpp +++ b/mscore/workspace.cpp @@ -314,10 +314,8 @@ void Workspace::read() QString rootfile = ""; QList images; while (e.readNextStartElement()) { - if (e.name() != "container") { + if (e.name() != "container") e.unknown(); - break; - } while (e.readNextStartElement()) { if (e.name() != "rootfiles") { e.unknown(); @@ -325,7 +323,6 @@ void Workspace::read() } while (e.readNextStartElement()) { const QStringRef& tag(e.name()); - if (tag == "rootfile") { if (rootfile.isEmpty()) rootfile = e.attribute("full-path"); @@ -415,6 +412,7 @@ QList& Workspace::workspaces() foreach(QString s, path) { QDir dir(s); +// printf("workspaces: look in <%s>\n", qPrintable(s)); QStringList pl = dir.entryList(nameFilters, QDir::Files, QDir::Name); foreach (QString entry, pl) { @@ -429,6 +427,7 @@ QList& Workspace::workspaces() } if (!p) p = new Workspace; +// printf("workspaces: found in <%s>\n", qPrintable(s + "/" + entry)); p->setPath(s + "/" + entry); p->setName(name); _workspaces.append(p); diff --git a/share/workspaces/advanced.workspace b/share/workspaces/advanced.workspace index f74dd432db994..a186bed3101bd 100644 Binary files a/share/workspaces/advanced.workspace and b/share/workspaces/advanced.workspace differ diff --git a/share/workspaces/basic.workspace b/share/workspaces/basic.workspace index 9c97f88dc2efc..e41c4c8cfb52b 100644 Binary files a/share/workspaces/basic.workspace and b/share/workspaces/basic.workspace differ