This list is closed, nobody may subscribe to it.
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2012 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(34) |
Sep
(63) |
Oct
(3) |
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
|
Jun
(3) |
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
(8) |
2015 |
Jan
|
Feb
|
Mar
|
Apr
(36) |
May
|
Jun
|
Jul
|
Aug
(12) |
Sep
|
Oct
|
Nov
|
Dec
|
2016 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(12) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(2) |
Jun
(48) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2019 |
Jan
(7) |
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <su...@us...> - 2018-06-07 20:33:52
|
Revision: 1497 http://sourceforge.net/p/canorus/code/1497 Author: suamor Date: 2018-06-07 20:33:48 +0000 (Thu, 07 Jun 2018) Log Message: ----------- Fix #8: Menu Shortcuts with ALT missing Modified Paths: -------------- trunk/src/plugins/pycli/canorusplugin.xml Modified: trunk/src/plugins/pycli/canorusplugin.xml =================================================================== --- trunk/src/plugins/pycli/canorusplugin.xml 2018-06-07 20:29:40 UTC (rev 1496) +++ trunk/src/plugins/pycli/canorusplugin.xml 2018-06-07 20:33:48 UTC (rev 1497) @@ -16,13 +16,13 @@ <menu> <name>pcMenu</name> - <title>CLI</title> + <title>&CLI</title> </menu> <action> <parent-menu>pcMenu</parent-menu> <name>pcSubMenu</name> - <text>Invoke Python CLI</text> + <text>&Invoke Python CLI</text> <lang>python</lang> <filename>pycli.py</filename> <function>pycli</function> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2018-06-07 20:29:42
|
Revision: 1496 http://sourceforge.net/p/canorus/code/1496 Author: suamor Date: 2018-06-07 20:29:40 +0000 (Thu, 07 Jun 2018) Log Message: ----------- Fix #8 Menu Shortcuts with ALT missing Modified Paths: -------------- trunk/src/ui/mainwin.ui Modified: trunk/src/ui/mainwin.ui =================================================================== --- trunk/src/ui/mainwin.ui 2018-06-07 11:38:36 UTC (rev 1495) +++ trunk/src/ui/mainwin.ui 2018-06-07 20:29:40 UTC (rev 1496) @@ -83,7 +83,7 @@ </widget> <widget class="QMenu" name="uiMenuWindow"> <property name="title"> - <string>Window</string> + <string>&Window</string> </property> <addaction name="uiNewView"/> <addaction name="uiNewWindow"/> @@ -140,7 +140,7 @@ </property> <widget class="QMenu" name="uiMenuZoom"> <property name="title"> - <string>Zoom</string> + <string>&Zoom</string> </property> <addaction name="uiZoomToWidth"/> <addaction name="uiZoomToHeight"/> @@ -151,7 +151,7 @@ </widget> <widget class="QMenu" name="uiMenuSourceView"> <property name="title"> - <string>Source view</string> + <string>&Source view</string> </property> <addaction name="uiLilyPondSource"/> <addaction name="uiCanorusMLSource"/> @@ -428,12 +428,12 @@ </action> <action name="uiInvertSelection"> <property name="text"> - <string>Invert Selection</string> + <string>&Invert Selection</string> </property> </action> <action name="uiZoomToWidth"> <property name="text"> - <string>Fit to width</string> + <string>Fit to &width</string> </property> </action> <action name="uiGotoBar"> @@ -441,7 +441,7 @@ <bool>false</bool> </property> <property name="text"> - <string>Goto bar...</string> + <string>&Goto bar...</string> </property> <property name="shortcut"> <string>Ctrl+G</string> @@ -455,7 +455,7 @@ <bool>true</bool> </property> <property name="text"> - <string>St&atus bar</string> + <string>Status &bar</string> </property> </action> <action name="uiFullscreen"> @@ -503,7 +503,7 @@ <normaloff>images:barline/barlinesingle.svg</normaloff>images:barline/barlinesingle.svg</iconset> </property> <property name="text"> - <string>Barline...</string> + <string>&Barline...</string> </property> </action> <action name="uiNoteCount"> @@ -525,7 +525,7 @@ </action> <action name="uiUsersGuide"> <property name="text"> - <string>User's guide...</string> + <string>&User's guide...</string> </property> </action> <action name="uiWhatsThis"> @@ -567,12 +567,12 @@ </action> <action name="uiSplitHorizontally"> <property name="text"> - <string>Split view horizontally</string> + <string>Split view &horizontally</string> </property> </action> <action name="uiSplitVertically"> <property name="text"> - <string>Split view vertically</string> + <string>Split view &vertically</string> </property> </action> <action name="uiCloseCurrentView"> @@ -580,7 +580,7 @@ <bool>false</bool> </property> <property name="text"> - <string>Close current view</string> + <string>&Close current view</string> </property> </action> <action name="uiUnsplitAll"> @@ -588,12 +588,12 @@ <bool>false</bool> </property> <property name="text"> - <string>Unsplit All</string> + <string>&Unsplit All</string> </property> </action> <action name="uiNewView"> <property name="text"> - <string>New view</string> + <string>&New view</string> </property> </action> <action name="uiNewSheet"> @@ -602,7 +602,7 @@ <normaloff>images:document/sheetnew.svg</normaloff>images:document/sheetnew.svg</iconset> </property> <property name="text"> - <string>New sheet</string> + <string>New &sheet</string> </property> </action> <action name="uiNewContext"> @@ -614,7 +614,7 @@ <normaloff>images:document/contextnew.svg</normaloff>images:document/contextnew.svg</iconset> </property> <property name="text"> - <string>New context...</string> + <string>New c&ontext...</string> </property> </action> <action name="uiPlayFromSelection"> @@ -637,7 +637,7 @@ <bool>true</bool> </property> <property name="text"> - <string>Animated scroll</string> + <string>&Animated scroll</string> </property> </action> <action name="uiLockScrollPlayback"> @@ -648,7 +648,7 @@ <bool>true</bool> </property> <property name="text"> - <string>Lock scroll while playback</string> + <string>&Lock scroll while playback</string> </property> </action> <action name="uiZoomToHeight"> @@ -658,27 +658,27 @@ </action> <action name="uiZoomToFit"> <property name="text"> - <string>Best &fit</string> + <string>&Best fit</string> </property> </action> <action name="uiZoomToSelection"> <property name="text"> - <string>Fit to selection</string> + <string>Fit to &selection</string> </property> </action> <action name="uiNewWindow"> <property name="text"> - <string>New window</string> + <string>New &window</string> </property> </action> <action name="uiCustomZoom"> <property name="text"> - <string>Custom...</string> + <string>&Custom...</string> </property> </action> <action name="uiScoreView"> <property name="text"> - <string>Score view</string> + <string>Score &view</string> </property> </action> <action name="uiLilyPondSource"> @@ -687,7 +687,7 @@ <normaloff>images:general/lilypondsource.svg</normaloff>images:general/lilypondsource.svg</iconset> </property> <property name="text"> - <string>LilyPond source</string> + <string>&LilyPond source</string> </property> </action> <action name="uiCanorusMLSource"> @@ -696,7 +696,7 @@ <normaloff>images:general/canorusmlsource.svg</normaloff>images:general/canorusmlsource.svg</iconset> </property> <property name="text"> - <string>CanorusML source</string> + <string>&CanorusML source</string> </property> </action> <action name="uiNewVoice"> @@ -705,7 +705,7 @@ <normaloff>images:document/voicenew.svg</normaloff>images:document/voicenew.svg</iconset> </property> <property name="text"> - <string>New voice</string> + <string>New &voice</string> </property> </action> <action name="uiDocumentProperties"> @@ -714,7 +714,7 @@ <normaloff>images:document/documentproperties.svg</normaloff>images:document/documentproperties.svg</iconset> </property> <property name="text"> - <string>Document properties...</string> + <string>&Document properties...</string> </property> </action> <action name="uiPrintDirectly"> @@ -765,7 +765,7 @@ <normaloff>images:playable/insertplayable.svg</normaloff>images:playable/insertplayable.svg</iconset> </property> <property name="text"> - <string>Notes and Rests</string> + <string>&Notes and Rests</string> </property> </action> <action name="uiInsertFM"> @@ -780,7 +780,7 @@ <normaloff>images:functionmark/insertfm.svg</normaloff>images:functionmark/insertfm.svg</iconset> </property> <property name="text"> - <string>Function mark...</string> + <string>&Function mark...</string> </property> </action> <action name="uiInsertClef"> @@ -792,7 +792,7 @@ <normaloff>images:clef/cleff.svg</normaloff>images:clef/cleff.svg</iconset> </property> <property name="text"> - <string>Clef...</string> + <string>&Clef...</string> </property> </action> <action name="uiRemoveVoice"> @@ -899,7 +899,7 @@ <normaloff>images:document/syllable.svg</normaloff>images:document/syllable.svg</iconset> </property> <property name="text"> - <string>Insert syllable</string> + <string>Insert s&yllable</string> </property> </action> <action name="uiEditMode"> @@ -942,7 +942,7 @@ </action> <action name="uiMidiRecorder"> <property name="text"> - <string>Midi recorder</string> + <string>&Midi recorder</string> </property> </action> <action name="uiResourceView"> @@ -950,7 +950,7 @@ <bool>true</bool> </property> <property name="text"> - <string>Resources view</string> + <string>&Resources view</string> </property> </action> <action name="uiInsertFBM"> @@ -973,7 +973,7 @@ <bool>true</bool> </property> <property name="text"> - <string>Ruler</string> + <string>R&uler</string> </property> </action> </widget> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2018-06-07 11:38:44
|
Revision: 1495 http://sourceforge.net/p/canorus/code/1495 Author: suamor Date: 2018-06-07 11:38:36 +0000 (Thu, 07 Jun 2018) Log Message: ----------- Add ZIP library (based in miniz from https://github.com/kuba--/zip). Fix C++ specific compiling issues (missing braces). Modified Paths: -------------- trunk/src/CMakeLists.txt Added Paths: ----------- trunk/src/zip/ trunk/src/zip/miniz.h trunk/src/zip/readme trunk/src/zip/zip.c trunk/src/zip/zip.h Modified: trunk/src/CMakeLists.txt =================================================================== --- trunk/src/CMakeLists.txt 2018-06-07 10:58:20 UTC (rev 1494) +++ trunk/src/CMakeLists.txt 2018-06-07 11:38:36 UTC (rev 1495) @@ -410,6 +410,10 @@ rtmidi/RtMidi.cpp ) +SET(Canorus_ZIP_Srcs + zip/zip.c +) + SET(Canorus_PMIDI_Srcs # PMIDI excerpts import/pmidi/glib.c import/pmidi/elements.c @@ -434,7 +438,8 @@ ${Canorus_Export_Srcs} ${Canorus_Import_Srcs} ${Canorus_RtMidi_Srcs} - ${Canorus_Widget_Srcs} + ${Canorus_ZIP_Srcs} + ${Canorus_Widget_Srcs} ${Canorus_PMIDI_Srcs} ) @@ -452,7 +457,8 @@ ${Canorus_Export_Srcs} ${Canorus_Ctl_Srcs} ${Canorus_RtMidi_Srcs} - ${Canorus_PMIDI_Srcs} + ${Canorus_ZIP_Srcs} + ${Canorus_PMIDI_Srcs} interface/rtmididevice.cpp interface/mididevice.cpp interface/playback.cpp Added: trunk/src/zip/miniz.h =================================================================== --- trunk/src/zip/miniz.h (rev 0) +++ trunk/src/zip/miniz.h 2018-06-07 11:38:36 UTC (rev 1495) @@ -0,0 +1,4940 @@ +/* + miniz.c v1.15 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing + See "unlicense" statement at the end of this file. + Rich Geldreich <ric...@gm...>, last updated Oct. 13, 2013 + Implements RFC 1950: http://www.ietf.org/rfc/rfc1950.txt and RFC 1951: http://www.ietf.org/rfc/rfc1951.txt + + Most API's defined in miniz.c are optional. For example, to disable the archive related functions just define + MINIZ_NO_ARCHIVE_APIS, or to get rid of all stdio usage define MINIZ_NO_STDIO (see the list below for more macros). + + * Change History + 10/13/13 v1.15 r4 - Interim bugfix release while I work on the next major release with Zip64 support (almost there!): + - Critical fix for the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY bug (thanks kah...@hp...) which could cause locate files to not find files. This bug + would only have occured in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place() + (which used this flag). If you can't switch to v1.15 but want to fix this bug, just remove the uses of this flag from both helper funcs (and of course don't use the flag). + - Bugfix in mz_zip_reader_extract_to_mem_no_alloc() from kymoon when pUser_read_buf is not NULL and compressed size is > uncompressed size + - Fixing mz_zip_reader_extract_*() funcs so they don't try to extract compressed data from directory entries, to account for weird zipfiles which contain zero-size compressed data on dir entries. + Hopefully this fix won't cause any issues on weird zip archives, because it assumes the low 16-bits of zip external attributes are DOS attributes (which I believe they always are in practice). + - Fixing mz_zip_reader_is_file_a_directory() so it doesn't check the internal attributes, just the filename and external attributes + - mz_zip_reader_init_file() - missing MZ_FCLOSE() call if the seek failed + - Added cmake support for Linux builds which builds all the examples, tested with clang v3.3 and gcc v4.6. + - Clang fix for tdefl_write_image_to_png_file_in_memory() from toffaletti + - Merged MZ_FORCEINLINE fix from hdeanclark + - Fix <time.h> include before config #ifdef, thanks emil.brink + - Added tdefl_write_image_to_png_file_in_memory_ex(): supports Y flipping (super useful for OpenGL apps), and explicit control over the compression level (so you can + set it to 1 for real-time compression). + - Merged in some compiler fixes from paulharris's github repro. + - Retested this build under Windows (VS 2010, including static analysis), tcc 0.9.26, gcc v4.6 and clang v3.3. + - Added example6.c, which dumps an image of the mandelbrot set to a PNG file. + - Modified example2 to help test the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY flag more. + - In r3: Bugfix to mz_zip_writer_add_file() found during merge: Fix possible src file fclose() leak if alignment bytes+local header file write faiiled + - In r4: Minor bugfix to mz_zip_writer_add_from_zip_reader(): Was pushing the wrong central dir header offset, appears harmless in this release, but it became a problem in the zip64 branch + 5/20/12 v1.14 - MinGW32/64 GCC 4.6.1 compiler fixes: added MZ_FORCEINLINE, #include <time.h> (thanks fermtect). + 5/19/12 v1.13 - From ja...@co... and ke...@mt... - Fix mz_crc32() so it doesn't compute the wrong CRC-32's when mz_ulong is 64-bit. + - Temporarily/locally slammed in "typedef unsigned long mz_ulong" and re-ran a randomized regression test on ~500k files. + - Eliminated a bunch of warnings when compiling with GCC 32-bit/64. + - Ran all examples, miniz.c, and tinfl.c through MSVC 2008's /analyze (static analysis) option and fixed all warnings (except for the silly + "Use of the comma-operator in a tested expression.." analysis warning, which I purposely use to work around a MSVC compiler warning). + - Created 32-bit and 64-bit Codeblocks projects/workspace. Built and tested Linux executables. The codeblocks workspace is compatible with Linux+Win32/x64. + - Added miniz_tester solution/project, which is a useful little app derived from LZHAM's tester app that I use as part of the regression test. + - Ran miniz.c and tinfl.c through another series of regression testing on ~500,000 files and archives. + - Modified example5.c so it purposely disables a bunch of high-level functionality (MINIZ_NO_STDIO, etc.). (Thanks to corysama for the MINIZ_NO_STDIO bug report.) + - Fix ftell() usage in examples so they exit with an error on files which are too large (a limitation of the examples, not miniz itself). + 4/12/12 v1.12 - More comments, added low-level example5.c, fixed a couple minor level_and_flags issues in the archive API's. + level_and_flags can now be set to MZ_DEFAULT_COMPRESSION. Thanks to Bruce Dawson <br...@va...> for the feedback/bug report. + 5/28/11 v1.11 - Added statement from unlicense.org + 5/27/11 v1.10 - Substantial compressor optimizations: + - Level 1 is now ~4x faster than before. The L1 compressor's throughput now varies between 70-110MB/sec. on a + - Core i7 (actual throughput varies depending on the type of data, and x64 vs. x86). + - Improved baseline L2-L9 compression perf. Also, greatly improved compression perf. issues on some file types. + - Refactored the compression code for better readability and maintainability. + - Added level 10 compression level (L10 has slightly better ratio than level 9, but could have a potentially large + drop in throughput on some files). + 5/15/11 v1.09 - Initial stable release. + + * Low-level Deflate/Inflate implementation notes: + + Compression: Use the "tdefl" API's. The compressor supports raw, static, and dynamic blocks, lazy or + greedy parsing, match length filtering, RLE-only, and Huffman-only streams. It performs and compresses + approximately as well as zlib. + + Decompression: Use the "tinfl" API's. The entire decompressor is implemented as a single function + coroutine: see tinfl_decompress(). It supports decompression into a 32KB (or larger power of 2) wrapping buffer, or into a memory + block large enough to hold the entire file. + + The low-level tdefl/tinfl API's do not make any use of dynamic memory allocation. + + * zlib-style API notes: + + miniz.c implements a fairly large subset of zlib. There's enough functionality present for it to be a drop-in + zlib replacement in many apps: + The z_stream struct, optional memory allocation callbacks + deflateInit/deflateInit2/deflate/deflateReset/deflateEnd/deflateBound + inflateInit/inflateInit2/inflate/inflateEnd + compress, compress2, compressBound, uncompress + CRC-32, Adler-32 - Using modern, minimal code size, CPU cache friendly routines. + Supports raw deflate streams or standard zlib streams with adler-32 checking. + + Limitations: + The callback API's are not implemented yet. No support for gzip headers or zlib static dictionaries. + I've tried to closely emulate zlib's various flavors of stream flushing and return status codes, but + there are no guarantees that miniz.c pulls this off perfectly. + + * PNG writing: See the tdefl_write_image_to_png_file_in_memory() function, originally written by + Alex Evans. Supports 1-4 bytes/pixel images. + + * ZIP archive API notes: + + The ZIP archive API's where designed with simplicity and efficiency in mind, with just enough abstraction to + get the job done with minimal fuss. There are simple API's to retrieve file information, read files from + existing archives, create new archives, append new files to existing archives, or clone archive data from + one archive to another. It supports archives located in memory or the heap, on disk (using stdio.h), + or you can specify custom file read/write callbacks. + + - Archive reading: Just call this function to read a single file from a disk archive: + + void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, + size_t *pSize, mz_uint zip_flags); + + For more complex cases, use the "mz_zip_reader" functions. Upon opening an archive, the entire central + directory is located and read as-is into memory, and subsequent file access only occurs when reading individual files. + + - Archives file scanning: The simple way is to use this function to scan a loaded archive for a specific file: + + int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags); + + The locate operation can optionally check file comments too, which (as one example) can be used to identify + multiple versions of the same file in an archive. This function uses a simple linear search through the central + directory, so it's not very fast. + + Alternately, you can iterate through all the files in an archive (using mz_zip_reader_get_num_files()) and + retrieve detailed info on each file by calling mz_zip_reader_file_stat(). + + - Archive creation: Use the "mz_zip_writer" functions. The ZIP writer immediately writes compressed file data + to disk and builds an exact image of the central directory in memory. The central directory image is written + all at once at the end of the archive file when the archive is finalized. + + The archive writer can optionally align each file's local header and file data to any power of 2 alignment, + which can be useful when the archive will be read from optical media. Also, the writer supports placing + arbitrary data blobs at the very beginning of ZIP archives. Archives written using either feature are still + readable by any ZIP tool. + + - Archive appending: The simple way to add a single file to an archive is to call this function: + + mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, + const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags); + + The archive will be created if it doesn't already exist, otherwise it'll be appended to. + Note the appending is done in-place and is not an atomic operation, so if something goes wrong + during the operation it's possible the archive could be left without a central directory (although the local + file headers and file data will be fine, so the archive will be recoverable). + + For more complex archive modification scenarios: + 1. The safest way is to use a mz_zip_reader to read the existing archive, cloning only those bits you want to + preserve into a new archive using using the mz_zip_writer_add_from_zip_reader() function (which compiles the + compressed file data as-is). When you're done, delete the old archive and rename the newly written archive, and + you're done. This is safe but requires a bunch of temporary disk space or heap memory. + + 2. Or, you can convert an mz_zip_reader in-place to an mz_zip_writer using mz_zip_writer_init_from_reader(), + append new files as needed, then finalize the archive which will write an updated central directory to the + original archive. (This is basically what mz_zip_add_mem_to_archive_file_in_place() does.) There's a + possibility that the archive's central directory could be lost with this method if anything goes wrong, though. + + - ZIP archive support limitations: + No zip64 or spanning support. Extraction functions can only handle unencrypted, stored or deflated files. + Requires streams capable of seeking. + + * This is a header file library, like stb_image.c. To get only a header file, either cut and paste the + below header, or create miniz.h, #define MINIZ_HEADER_FILE_ONLY, and then include miniz.c from it. + + * Important: For best perf. be sure to customize the below macros for your target platform: + #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 + #define MINIZ_LITTLE_ENDIAN 1 + #define MINIZ_HAS_64BIT_REGISTERS 1 + + * On platforms using glibc, Be sure to "#define _LARGEFILE64_SOURCE 1" before including miniz.c to ensure miniz + uses the 64-bit variants: fopen64(), stat64(), etc. Otherwise you won't be able to process large files + (i.e. 32-bit stat() fails for me on files > 0x7FFFFFFF bytes). +*/ + +#ifndef MINIZ_HEADER_INCLUDED +#define MINIZ_HEADER_INCLUDED + +#include <stdlib.h> + +// Defines to completely disable specific portions of miniz.c: +// If all macros here are defined the only functionality remaining will be CRC-32, adler-32, tinfl, and tdefl. + +// Define MINIZ_NO_STDIO to disable all usage and any functions which rely on stdio for file I/O. +//#define MINIZ_NO_STDIO + +// If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able to get the current time, or +// get/set file times, and the C run-time funcs that get/set times won't be called. +// The current downside is the times written to your archives will be from 1979. +//#define MINIZ_NO_TIME + +// Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. +//#define MINIZ_NO_ARCHIVE_APIS + +// Define MINIZ_NO_ARCHIVE_APIS to disable all writing related ZIP archive API's. +//#define MINIZ_NO_ARCHIVE_WRITING_APIS + +// Define MINIZ_NO_ZLIB_APIS to remove all ZLIB-style compression/decompression API's. +//#define MINIZ_NO_ZLIB_APIS + +// Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. +//#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES + +// Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc. +// Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc +// callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user +// functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. +//#define MINIZ_NO_MALLOC + +#if defined(__TINYC__) && (defined(__linux) || defined(__linux__)) + // TODO: Work around "error: include file 'sys\utime.h' when compiling with tcc on Linux + #define MINIZ_NO_TIME +#endif + +#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_ARCHIVE_APIS) + #include <time.h> +#endif + +#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__) +// MINIZ_X86_OR_X64_CPU is only used to help set the below macros. +#define MINIZ_X86_OR_X64_CPU 1 +#endif + +#if (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__) || MINIZ_X86_OR_X64_CPU +// Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. +#define MINIZ_LITTLE_ENDIAN 1 +#endif + +#if MINIZ_X86_OR_X64_CPU +// Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. +#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1 +#endif + +#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__) +// Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions). +#define MINIZ_HAS_64BIT_REGISTERS 1 +#endif + +#ifdef __APPLE__ +#define ftello64 ftello +#define fseeko64 fseeko +#define fopen64 fopen +#define freopen64 freopen +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +// ------------------- zlib-style API Definitions. + +// For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits! +typedef unsigned long mz_ulong; + +// mz_free() internally uses the MZ_FREE() macro (which by default calls free() unless you've modified the MZ_MALLOC macro) to release a block allocated from the heap. +void mz_free(void *p); + +#define MZ_ADLER32_INIT (1) +// mz_adler32() returns the initial adler-32 value to use when called with ptr==NULL. +mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len); + +#define MZ_CRC32_INIT (0) +// mz_crc32() returns the initial CRC-32 value to use when called with ptr==NULL. +mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_len); + +// Compression strategies. +enum { MZ_DEFAULT_STRATEGY = 0, MZ_FILTERED = 1, MZ_HUFFMAN_ONLY = 2, MZ_RLE = 3, MZ_FIXED = 4 }; + +// Method +#define MZ_DEFLATED 8 + +#ifndef MINIZ_NO_ZLIB_APIS + +// Heap allocation callbacks. +// Note that mz_alloc_func parameter types purpsosely differ from zlib's: items/size is size_t, not unsigned long. +typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size); +typedef void (*mz_free_func)(void *opaque, void *address); +typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items, size_t size); + +#define MZ_VERSION "9.1.15" +#define MZ_VERNUM 0x91F0 +#define MZ_VER_MAJOR 9 +#define MZ_VER_MINOR 1 +#define MZ_VER_REVISION 15 +#define MZ_VER_SUBREVISION 0 + +// Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other values are for advanced use (refer to the zlib docs). +enum { MZ_NO_FLUSH = 0, MZ_PARTIAL_FLUSH = 1, MZ_SYNC_FLUSH = 2, MZ_FULL_FLUSH = 3, MZ_FINISH = 4, MZ_BLOCK = 5 }; + +// Return status codes. MZ_PARAM_ERROR is non-standard. +enum { MZ_OK = 0, MZ_STREAM_END = 1, MZ_NEED_DICT = 2, MZ_ERRNO = -1, MZ_STREAM_ERROR = -2, MZ_DATA_ERROR = -3, MZ_MEM_ERROR = -4, MZ_BUF_ERROR = -5, MZ_VERSION_ERROR = -6, MZ_PARAM_ERROR = -10000 }; + +// Compression levels: 0-9 are the standard zlib-style levels, 10 is best possible compression (not zlib compatible, and may be very slow), MZ_DEFAULT_COMPRESSION=MZ_DEFAULT_LEVEL. +enum { MZ_NO_COMPRESSION = 0, MZ_BEST_SPEED = 1, MZ_BEST_COMPRESSION = 9, MZ_UBER_COMPRESSION = 10, MZ_DEFAULT_LEVEL = 6, MZ_DEFAULT_COMPRESSION = -1 }; + +// Window bits +#define MZ_DEFAULT_WINDOW_BITS 15 + +struct mz_internal_state; + +// Compression/decompression stream struct. +typedef struct mz_stream_s +{ + const unsigned char *next_in; // pointer to next byte to read + unsigned int avail_in; // number of bytes available at next_in + mz_ulong total_in; // total number of bytes consumed so far + + unsigned char *next_out; // pointer to next byte to write + unsigned int avail_out; // number of bytes that can be written to next_out + mz_ulong total_out; // total number of bytes produced so far + + char *msg; // error msg (unused) + struct mz_internal_state *state; // internal state, allocated by zalloc/zfree + + mz_alloc_func zalloc; // optional heap allocation function (defaults to malloc) + mz_free_func zfree; // optional heap free function (defaults to free) + void *opaque; // heap alloc function user pointer + + int data_type; // data_type (unused) + mz_ulong adler; // adler32 of the source or uncompressed data + mz_ulong reserved; // not used +} mz_stream; + +typedef mz_stream *mz_streamp; + +// Returns the version string of miniz.c. +const char *mz_version(void); + +// mz_deflateInit() initializes a compressor with default options: +// Parameters: +// pStream must point to an initialized mz_stream struct. +// level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION]. +// level 1 enables a specially optimized compression function that's been optimized purely for performance, not ratio. +// (This special func. is currently only enabled when MINIZ_USE_UNALIGNED_LOADS_AND_STORES and MINIZ_LITTLE_ENDIAN are defined.) +// Return values: +// MZ_OK on success. +// MZ_STREAM_ERROR if the stream is bogus. +// MZ_PARAM_ERROR if the input parameters are bogus. +// MZ_MEM_ERROR on out of memory. +int mz_deflateInit(mz_streamp pStream, int level); + +// mz_deflateInit2() is like mz_deflate(), except with more control: +// Additional parameters: +// method must be MZ_DEFLATED +// window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no header or footer) +// mem_level must be between [1, 9] (it's checked but ignored by miniz.c) +int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy); + +// Quickly resets a compressor without having to reallocate anything. Same as calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2(). +int mz_deflateReset(mz_streamp pStream); + +// mz_deflate() compresses the input to output, consuming as much of the input and producing as much output as possible. +// Parameters: +// pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. +// flush may be MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or MZ_FINISH. +// Return values: +// MZ_OK on success (when flushing, or if more input is needed but not available, and/or there's more output to be written but the output buffer is full). +// MZ_STREAM_END if all input has been consumed and all output bytes have been written. Don't call mz_deflate() on the stream anymore. +// MZ_STREAM_ERROR if the stream is bogus. +// MZ_PARAM_ERROR if one of the parameters is invalid. +// MZ_BUF_ERROR if no forward progress is possible because the input and/or output buffers are empty. (Fill up the input buffer or free up some output space and try again.) +int mz_deflate(mz_streamp pStream, int flush); + +// mz_deflateEnd() deinitializes a compressor: +// Return values: +// MZ_OK on success. +// MZ_STREAM_ERROR if the stream is bogus. +int mz_deflateEnd(mz_streamp pStream); + +// mz_deflateBound() returns a (very) conservative upper bound on the amount of data that could be generated by deflate(), assuming flush is set to only MZ_NO_FLUSH or MZ_FINISH. +mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len); + +// Single-call compression functions mz_compress() and mz_compress2(): +// Returns MZ_OK on success, or one of the error codes from mz_deflate() on failure. +int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len); +int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level); + +// mz_compressBound() returns a (very) conservative upper bound on the amount of data that could be generated by calling mz_compress(). +mz_ulong mz_compressBound(mz_ulong source_len); + +// Initializes a decompressor. +int mz_inflateInit(mz_streamp pStream); + +// mz_inflateInit2() is like mz_inflateInit() with an additional option that controls the window size and whether or not the stream has been wrapped with a zlib header/footer: +// window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse zlib header/footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate). +int mz_inflateInit2(mz_streamp pStream, int window_bits); + +// Decompresses the input stream to the output, consuming only as much of the input as needed, and writing as much to the output as possible. +// Parameters: +// pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. +// flush may be MZ_NO_FLUSH, MZ_SYNC_FLUSH, or MZ_FINISH. +// On the first call, if flush is MZ_FINISH it's assumed the input and output buffers are both sized large enough to decompress the entire stream in a single call (this is slightly faster). +// MZ_FINISH implies that there are no more source bytes available beside what's already in the input buffer, and that the output buffer is large enough to hold the rest of the decompressed data. +// Return values: +// MZ_OK on success. Either more input is needed but not available, and/or there's more output to be written but the output buffer is full. +// MZ_STREAM_END if all needed input has been consumed and all output bytes have been written. For zlib streams, the adler-32 of the decompressed data has also been verified. +// MZ_STREAM_ERROR if the stream is bogus. +// MZ_DATA_ERROR if the deflate stream is invalid. +// MZ_PARAM_ERROR if one of the parameters is invalid. +// MZ_BUF_ERROR if no forward progress is possible because the input buffer is empty but the inflater needs more input to continue, or if the output buffer is not large enough. Call mz_inflate() again +// with more input data, or with more room in the output buffer (except when using single call decompression, described above). +int mz_inflate(mz_streamp pStream, int flush); + +// Deinitializes a decompressor. +int mz_inflateEnd(mz_streamp pStream); + +// Single-call decompression. +// Returns MZ_OK on success, or one of the error codes from mz_inflate() on failure. +int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len); + +// Returns a string description of the specified error code, or NULL if the error code is invalid. +const char *mz_error(int err); + +// Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used as a drop-in replacement for the subset of zlib that miniz.c supports. +// Define MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you use zlib in the same project. +#ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES + typedef unsigned char Byte; + typedef unsigned int uInt; + typedef mz_ulong uLong; + typedef Byte Bytef; + typedef uInt uIntf; + typedef char charf; + typedef int intf; + typedef void *voidpf; + typedef uLong uLongf; + typedef void *voidp; + typedef void *const voidpc; + #define Z_NULL 0 + #define Z_NO_FLUSH MZ_NO_FLUSH + #define Z_PARTIAL_FLUSH MZ_PARTIAL_FLUSH + #define Z_SYNC_FLUSH MZ_SYNC_FLUSH + #define Z_FULL_FLUSH MZ_FULL_FLUSH + #define Z_FINISH MZ_FINISH + #define Z_BLOCK MZ_BLOCK + #define Z_OK MZ_OK + #define Z_STREAM_END MZ_STREAM_END + #define Z_NEED_DICT MZ_NEED_DICT + #define Z_ERRNO MZ_ERRNO + #define Z_STREAM_ERROR MZ_STREAM_ERROR + #define Z_DATA_ERROR MZ_DATA_ERROR + #define Z_MEM_ERROR MZ_MEM_ERROR + #define Z_BUF_ERROR MZ_BUF_ERROR + #define Z_VERSION_ERROR MZ_VERSION_ERROR + #define Z_PARAM_ERROR MZ_PARAM_ERROR + #define Z_NO_COMPRESSION MZ_NO_COMPRESSION + #define Z_BEST_SPEED MZ_BEST_SPEED + #define Z_BEST_COMPRESSION MZ_BEST_COMPRESSION + #define Z_DEFAULT_COMPRESSION MZ_DEFAULT_COMPRESSION + #define Z_DEFAULT_STRATEGY MZ_DEFAULT_STRATEGY + #define Z_FILTERED MZ_FILTERED + #define Z_HUFFMAN_ONLY MZ_HUFFMAN_ONLY + #define Z_RLE MZ_RLE + #define Z_FIXED MZ_FIXED + #define Z_DEFLATED MZ_DEFLATED + #define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS + #define alloc_func mz_alloc_func + #define free_func mz_free_func + #define internal_state mz_internal_state + #define z_stream mz_stream + #define deflateInit mz_deflateInit + #define deflateInit2 mz_deflateInit2 + #define deflateReset mz_deflateReset + #define deflate mz_deflate + #define deflateEnd mz_deflateEnd + #define deflateBound mz_deflateBound + #define compress mz_compress + #define compress2 mz_compress2 + #define compressBound mz_compressBound + #define inflateInit mz_inflateInit + #define inflateInit2 mz_inflateInit2 + #define inflate mz_inflate + #define inflateEnd mz_inflateEnd + #define uncompress mz_uncompress + #define crc32 mz_crc32 + #define adler32 mz_adler32 + #define MAX_WBITS 15 + #define MAX_MEM_LEVEL 9 + #define zError mz_error + #define ZLIB_VERSION MZ_VERSION + #define ZLIB_VERNUM MZ_VERNUM + #define ZLIB_VER_MAJOR MZ_VER_MAJOR + #define ZLIB_VER_MINOR MZ_VER_MINOR + #define ZLIB_VER_REVISION MZ_VER_REVISION + #define ZLIB_VER_SUBREVISION MZ_VER_SUBREVISION + #define zlibVersion mz_version + #define zlib_version mz_version() +#endif // #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES + +#endif // MINIZ_NO_ZLIB_APIS + +// ------------------- Types and macros + +typedef unsigned char mz_uint8; +typedef signed short mz_int16; +typedef unsigned short mz_uint16; +typedef unsigned int mz_uint32; +typedef unsigned int mz_uint; +typedef long long mz_int64; +typedef unsigned long long mz_uint64; +typedef int mz_bool; + +#define MZ_FALSE (0) +#define MZ_TRUE (1) + +// An attempt to work around MSVC's spammy "warning C4127: conditional expression is constant" message. +#ifdef _MSC_VER + #define MZ_MACRO_END while (0, 0) +#else + #define MZ_MACRO_END while (0) +#endif + +// ------------------- ZIP archive reading/writing + +#ifndef MINIZ_NO_ARCHIVE_APIS + +enum +{ + MZ_ZIP_MAX_IO_BUF_SIZE = 64*1024, + MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE = 260, + MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE = 256 +}; + +typedef struct +{ + mz_uint32 m_file_index; + mz_uint32 m_central_dir_ofs; + mz_uint16 m_version_made_by; + mz_uint16 m_version_needed; + mz_uint16 m_bit_flag; + mz_uint16 m_method; +#ifndef MINIZ_NO_TIME + time_t m_time; +#endif + mz_uint32 m_crc32; + mz_uint64 m_comp_size; + mz_uint64 m_uncomp_size; + mz_uint16 m_internal_attr; + mz_uint32 m_external_attr; + mz_uint64 m_local_header_ofs; + mz_uint32 m_comment_size; + char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE]; + char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE]; +} mz_zip_archive_file_stat; + +typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n); +typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n); + +struct mz_zip_internal_state_tag; +typedef struct mz_zip_internal_state_tag mz_zip_internal_state; + +typedef enum +{ + MZ_ZIP_MODE_INVALID = 0, + MZ_ZIP_MODE_READING = 1, + MZ_ZIP_MODE_WRITING = 2, + MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3 +} mz_zip_mode; + +typedef struct mz_zip_archive_tag +{ + mz_uint64 m_archive_size; + mz_uint64 m_central_directory_file_ofs; + mz_uint m_total_files; + mz_zip_mode m_zip_mode; + + mz_uint m_file_offset_alignment; + + mz_alloc_func m_pAlloc; + mz_free_func m_pFree; + mz_realloc_func m_pRealloc; + void *m_pAlloc_opaque; + + mz_file_read_func m_pRead; + mz_file_write_func m_pWrite; + void *m_pIO_opaque; + + mz_zip_internal_state *m_pState; + +} mz_zip_archive; + +typedef enum +{ + MZ_ZIP_FLAG_CASE_SENSITIVE = 0x0100, + MZ_ZIP_FLAG_IGNORE_PATH = 0x0200, + MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400, + MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800 +} mz_zip_flags; + +// ZIP archive reading + +// Inits a ZIP archive reader. +// These functions read and validate the archive's central directory. +mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint32 flags); +mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint32 flags); + +#ifndef MINIZ_NO_STDIO +mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags); +#endif + +// Returns the total number of files in the archive. +mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip); + +// Returns detailed information about an archive file entry. +mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat); + +// Determines if an archive file entry is a directory entry. +mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index); +mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index); + +// Retrieves the filename of an archive file entry. +// Returns the number of bytes written to pFilename, or if filename_buf_size is 0 this function returns the number of bytes needed to fully store the filename. +mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size); + +// Attempts to locates a file in the archive's central directory. +// Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH +// Returns -1 if the file cannot be found. +int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags); + +// Extracts a archive file to a memory buffer using no memory allocation. +mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size); +mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size); + +// Extracts a archive file to a memory buffer. +mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags); +mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags); + +// Extracts a archive file to a dynamically allocated heap buffer. +void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags); +void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags); + +// Extracts a archive file using a callback function to output the file's data. +mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags); +mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags); + +#ifndef MINIZ_NO_STDIO +// Extracts a archive file to a disk file and sets its last accessed and modified times. +// This function only extracts files, not archive directory records. +mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags); +mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags); +#endif + +// Ends archive reading, freeing all allocations, and closing the input archive file if mz_zip_reader_init_file() was used. +mz_bool mz_zip_reader_end(mz_zip_archive *pZip); + +// ZIP archive writing + +#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS + +// Inits a ZIP archive writer. +mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size); +mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size); + +#ifndef MINIZ_NO_STDIO +mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning); +#endif + +// Converts a ZIP archive reader object into a writer object, to allow efficient in-place file appends to occur on an existing archive. +// For archives opened using mz_zip_reader_init_file, pFilename must be the archive's filename so it can be reopened for writing. If the file can't be reopened, mz_zip_reader_end() will be called. +// For archives opened using mz_zip_reader_init_mem, the memory block must be growable using the realloc callback (which defaults to realloc unless you've overridden it). +// Finally, for archives opened using mz_zip_reader_init, the mz_zip_archive's user provided m_pWrite function cannot be NULL. +// Note: In-place archive modification is not recommended unless you know what you're doing, because if execution stops or something goes wrong before +// the archive is finalized the file's central directory will be hosed. +mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename); + +// Adds the contents of a memory buffer to an archive. These functions record the current local time into the archive. +// To add a directory entry, call this method with an archive name ending in a forwardslash with empty buffer. +// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. +mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags); +mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32); + +#ifndef MINIZ_NO_STDIO +// Adds the contents of a disk file to an archive. This function also records the disk file's modified time into the archive. +// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. +mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags); +#endif + +// Adds a file to an archive by fully cloning the data from another archive. +// This function fully clones the source file's compressed data (no recompression), along with its full filename, extra data, and comment fields. +mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint file_index); + +// Finalizes the archive by writing the central directory records followed by the end of central directory record. +// After an archive is finalized, the only valid call on the mz_zip_archive struct is mz_zip_writer_end(). +// An archive must be manually finalized by calling this function for it to be valid. +mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip); +mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **pBuf, size_t *pSize); + +// Ends archive writing, freeing all allocations, and closing the output file if mz_zip_writer_init_file() was used. +// Note for the archive to be valid, it must have been finalized before ending. +mz_bool mz_zip_writer_end(mz_zip_archive *pZip); + +// Misc. high-level helper functions: + +// mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically) appends a memory blob to a ZIP archive. +// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. +mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags); + +// Reads a single file from an archive into a heap block. +// Returns NULL on failure. +void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint zip_flags); + +#endif // #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS + +#endif // #ifndef MINIZ_NO_ARCHIVE_APIS + +// ------------------- Low-level Decompression API Definitions + +// Decompression flags used by tinfl_decompress(). +// TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the input is a raw deflate stream. +// TINFL_FLAG_HAS_MORE_INPUT: If set, there are more input bytes available beyond the end of the supplied input buffer. If clear, the input buffer contains all remaining input. +// TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large enough to hold the entire decompressed stream. If clear, the output buffer is at least the size of the dictionary (typically 32KB). +// TINFL_FLAG_COMPUTE_ADLER32: Force adler-32 checksum computation of the decompressed bytes. +enum +{ + TINFL_FLAG_PARSE_ZLIB_HEADER = 1, + TINFL_FLAG_HAS_MORE_INPUT = 2, + TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4, + TINFL_FLAG_COMPUTE_ADLER32 = 8 +}; + +// High level decompression functions: +// tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block allocated via malloc(). +// On entry: +// pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data to decompress. +// On return: +// Function returns a pointer to the decompressed data, or NULL on failure. +// *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on uncompressible data. +// The caller must call mz_free() on the returned block when it's no longer needed. +void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags); + +// tinfl_decompress_mem_to_mem() decompresses a block in memory to another block in memory. +// Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the number of bytes written on success. +#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1)) +size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags); + +// tinfl_decompress_mem_to_callback() decompresses a block in memory to an internal 32KB buffer, and a user provided callback function will be called to flush the buffer. +// Returns 1 on success or 0 on failure. +typedef int (*tinfl_put_buf_func_ptr)(const void* pBuf, int len, void *pUser); +int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags); + +struct tinfl_decompressor_tag; typedef struct tinfl_decompressor_tag tinfl_decompressor; + +// Max size of LZ dictionary. +#define TINFL_LZ_DICT_SIZE 32768 + +// Return status. +typedef enum +{ + TINFL_STATUS_BAD_PARAM = -3, + TINFL_STATUS_ADLER32_MISMATCH = -2, + TINFL_STATUS_FAILED = -1, + TINFL_STATUS_DONE = 0, + TINFL_STATUS_NEEDS_MORE_INPUT = 1, + TINFL_STATUS_HAS_MORE_OUTPUT = 2 +} tinfl_status; + +// Initializes the decompressor to its initial state. +#define tinfl_init(r) do { (r)->m_state = 0; } MZ_MACRO_END +#define tinfl_get_adler32(r) (r)->m_check_adler32 + +// Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. +// This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. +tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags); + +// Internal/private bits follow. +enum +{ + TINFL_MAX_HUFF_TABLES = 3, TINFL_MAX_HUFF_SYMBOLS_0 = 288, TINFL_MAX_HUFF_SYMBOLS_1 = 32, TINFL_MAX_HUFF_SYMBOLS_2 = 19, + TINFL_FAST_LOOKUP_BITS = 10, TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS +}; + +typedef struct +{ + mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0]; + mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2]; +} tinfl_huff_table; + +#if MINIZ_HAS_64BIT_REGISTERS + #define TINFL_USE_64BIT_BITBUF 1 +#endif + +#if TINFL_USE_64BIT_BITBUF + typedef mz_uint64 tinfl_bit_buf_t; + #define TINFL_BITBUF_SIZE (64) +#else + typedef mz_uint32 tinfl_bit_buf_t; + #define TINFL_BITBUF_SIZE (32) +#endif + +struct tinfl_decompressor_tag +{ + mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES]; + tinfl_bit_buf_t m_bit_buf; + size_t m_dist_from_out_buf_start; + tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES]; + mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137]; +}; + +// ------------------- Low-level Compression API Definitions + +// Set TDEFL_LESS_MEMORY to 1 to use less memory (compression will be slightly slower, and raw/dynamic blocks will be output more frequently). +#define TDEFL_LESS_MEMORY 0 + +// tdefl_init() compression flags logically OR'd together (low 12 bits contain the max. number of probes per dictionary search): +// TDEFL_DEFAULT_MAX_PROBES: The compressor defaults to 128 dictionary probes per dictionary search. 0=Huffman only, 1=Huffman+LZ (fastest/crap compression), 4095=Huffman+LZ (slowest/best compression). +enum +{ + TDEFL_HUFFMAN_ONLY = 0, TDEFL_DEFAULT_MAX_PROBES = 128, TDEFL_MAX_PROBES_MASK = 0xFFF +}; + +// TDEFL_WRITE_ZLIB_HEADER: If set, the compressor outputs a zlib header before the deflate data, and the Adler-32 of the source data at the end. Otherwise, you'll get raw deflate data. +// TDEFL_COMPUTE_ADLER32: Always compute the adler-32 of the input data (even when not writing zlib headers). +// TDEFL_GREEDY_PARSING_FLAG: Set to use faster greedy parsing, instead of more efficient lazy parsing. +// TDEFL_NONDETERMINISTIC_PARSING_FLAG: Enable to decrease the compressor's initialization time to the minimum, but the output may vary from run to run given the same input (depending on the contents of memory). +// TDEFL_RLE_MATCHES: Only look for RLE matches (matches with a distance of 1) +// TDEFL_FILTER_MATCHES: Discards matches <= 5 chars if enabled. +// TDEFL_FORCE_ALL_STATIC_BLOCKS: Disable usage of optimized Huffman tables. +// TDEFL_FORCE_ALL_RAW_BLOCKS: Only use raw (uncompressed) deflate blocks. +// The low 12 bits are reserved to control the max # of hash probes per dictionary lookup (see TDEFL_MAX_PROBES_MASK). +enum +{ + TDEFL_WRITE_ZLIB_HEADER = 0x01000, + TDEFL_COMPUTE_ADLER32 = 0x02000, + TDEFL_GREEDY_PARSING_FLAG = 0x04000, + TDEFL_NONDETERMINISTIC_PARSING_FLAG = 0x08000, + TDEFL_RLE_MATCHES = 0x10000, + TDEFL_FILTER_MATCHES = 0x20000, + TDEFL_FORCE_ALL_STATIC_BLOCKS = 0x40000, + TDEFL_FORCE_ALL_RAW_BLOCKS = 0x80000 +}; + +// High level compression functions: +// tdefl_compress_mem_to_heap() compresses a block in memory to a heap block allocated via malloc(). +// On entry: +// pSrc_buf, src_buf_len: Pointer and size of source block to compress. +// flags: The max match finder probes (default is 128) logically OR'd against the above flags. Higher probes are slower but improve compression. +// On return: +// Function returns a pointer to the compressed data, or NULL on failure. +// *pOut_len will be set to the compressed data's size, which could be larger than src_buf_len on uncompressible data. +// The caller must free() the returned block when it's no longer needed. +void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags); + +// tdefl_compress_mem_to_mem() compresses a block in memory to another block in memory. +// Returns 0 on failure. +size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags); + +// Compresses an image to a compressed PNG file in memory. +// On entry: +// pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4. +// The image pitch in bytes per scanline will be w*num_chans. The leftmost pixel on the top scanline is stored first in memory. +// level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL +// If flip is true, the image will be flipped on the Y axis (useful for OpenGL apps). +// On return: +// Function returns a pointer to the compressed data, or NULL on failure. +// *pLen_out will be set to the size of the PNG image file. +// The caller must mz_free() the returned heap block (which will typically be larger than *pLen_out) when it's no longer needed. +void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip); +void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out); + +// Output stream interface. The compressor uses this interface to write compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time. +typedef mz_bool (*tdefl_put_buf_func_ptr)(const void* pBuf, int len, void *pUser); + +// tdefl_compress_mem_to_output() compresses a block to an output stream. The above helpers use this function internally. +mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags); + +enum { TDEFL_MAX_HUFF_TABLES = 3, TDEFL_MAX_HUFF_SYMBOLS_0 = 288, TDEFL_MAX_HUFF_SYMBOLS_1 = 32, TDEFL_MAX_HUFF_SYMBOLS_2 = 19, TDEFL_LZ_DICT_SIZE = 32768, TDEFL_LZ_DICT_SIZE_MASK = TDEFL_LZ_DICT_SIZE - 1, TDEFL_MIN_MATCH_LEN = 3, TDEFL_MAX_MATCH_LEN = 258 }; + +// TDEFL_OUT_BUF_SIZE MUST be large enough to hold a single entire compressed output block (using static/fixed Huffman codes). +#if TDEFL_LESS_MEMORY +enum { TDEFL_LZ_CODE_BUF_SIZE = 24 * 1024, TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13 ) / 10, TDEFL_MAX_HUFF_SYMBOLS = 288, TDEFL_LZ_HASH_BITS = 12, TDEFL_LEVEL1_HASH_SIZE_MASK = 4095, TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3, TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS }; +#else +enum { TDEFL_LZ_CODE_BUF_SIZE = 64 * 1024, TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13 ) / 10, TDEFL_MAX_HUFF_SYMBOLS = 288, TDEFL_LZ_HASH_BITS = 15, TDEFL_LEVEL1_HASH_SIZE_MASK = 4095, TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3, TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS }; +#endif + +// The low-level tdefl functions below may be used directly if the above helper functions aren't flexible enough. The low-level functions don't make any heap allocations, unlike the above helper functions. +typedef enum +{ + TDEFL_STATUS_BAD_PARAM = -2, + TDEFL_STATUS_PUT_BUF_FAILED = -1, + TDEFL_STATUS_OKAY = 0, + TDEFL_STATUS_DONE = 1, +} tdefl_status; + +// Must map to MZ_NO_FLUSH, MZ_SYNC_FLUSH, etc. enums +typedef enum +{ + TDEFL_NO_FLUSH = 0, + TDEFL_SYNC_FLUSH = 2, + TDEFL_FULL_FLUSH = 3, + TDEFL_FINISH = 4 +} tdefl_flush; + +// tdefl's compression state structure. +typedef struct +{ + tdefl_put_buf_func_ptr m_pPut_buf_func; + void *m_pPut_buf_user; + mz_uint m_flags, m_max_probes[2]; + int m_greedy_parsing; + mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size; + mz_uint8 *m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end; + mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, m_bit_buffer; + mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, m_wants_to_finish; + tdefl_status m_prev_return_status; + const void *m_pIn_buf; + void *m_pOut_buf; + size_t *m_pIn_buf_size, *m_pOut_buf_size; + tdefl_flush m_flush; + const mz_uint8 *m_pSrc; + size_t m_src_buf_left, m_out_buf_ofs; + mz_uint8 m_dict[TDEFL_LZ_DICT_SIZE + TDEFL_MAX_MATCH_LEN - 1]; + mz_uint16 m_huff_count[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint16 m_huff_codes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint8 m_huff_code_sizes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS]; + mz_uint8 m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE]; + mz_uint16 m_next[TDEFL_LZ_DICT_SIZE]; + mz_uint16 m_hash[TDEFL_LZ_HASH_SIZE]; + mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE]; +} tdefl_compressor; + +// Initializes the compressor. +// There is no corresponding deinit() function because the tdefl API's do not dynamically allocate memory. +// pBut_buf_func: If NULL, output data will be supplied to the specified callback. In this case, the user should call the tdefl_compress_buffer() API for compression. +// If pBut_buf_func is NULL the user should always call the tdefl_compress() API. +// flags: See the above enums (TDEFL_HUFFMAN_ONLY, TDEFL_WRITE_ZLIB_HEADER, etc.) +tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags); + +// Compresses a block of data, consuming as much of the specified input buffer as possible, and writing as much compressed data to the specified output buffer as possible. +tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush); + +// tdefl_compress_buffer() is only usable when the tdefl_init() is called with a non-NULL tdefl_put_buf_func_ptr. +// tdefl_compress_buffer() always consumes the entire input buffer. +tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush); + +tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d); +mz_uint32 tdefl_get_adler32(tdefl_compressor *d); + +// Can't use tdefl_create_comp_flags_from_zip_params if MINIZ_NO_ZLIB_APIS isn't defined, because it uses some of its macros. +#ifndef MINIZ_NO_ZLIB_APIS +// Create tdefl_compress() flags given zlib-style compression parameters. +// level may range from [0,10] (where 10 is absolute max compression, but may be much slower on some files) +// window_bits may be -15 (raw deflate) or 15 (zlib) +// strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY, MZ_RLE, or MZ_FIXED +mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy); +#endif // #ifndef MINIZ_NO_ZLIB_APIS + +#ifdef __cplusplus +} +#endif + +#endif // MINIZ_HEADER_INCLUDED + +// ------------------- End of Header: Implementation follows. (If you only want the header, define MINIZ_HEADER_FILE_ONLY.) + +#ifndef MINIZ_HEADER_FILE_ONLY + +typedef unsigned char mz_validate_uint16[sizeof(mz_uint16)==2 ? 1 : -1]; +typedef unsigned char mz_validate_uint32[sizeof(mz_uint32)==4 ? 1 : -1]; +typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1]; + +#include <string.h> +#include <assert.h> + +#define MZ_ASSERT(x) assert(x) + +#ifdef MINIZ_NO_MALLOC + #define MZ_MALLOC(x) NULL + #define MZ_FREE(x) (void)x, ((void)0) + #define MZ_REALLOC(p, x) NULL +#else + #define MZ_MALLOC(x) malloc(x) + #define MZ_FREE(x) free(x) + #define MZ_REALLOC(p, x) realloc(p, x) +#endif + +#define MZ_MAX(a,b) (((a)>(b))?(a):(b)) +#define MZ_MIN(a,b) (((a)<(b))?(a):(b)) +#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj)) + +#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN + #define MZ_READ_LE16(p) *((const mz_uint16 *)(p)) + #define MZ_READ_LE32(p) *((const mz_uint32 *)(p)) +#else + #define MZ_READ_LE16(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U)) + #define MZ_READ_LE32(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U)) +#endif + +#ifdef _MSC_VER + #define MZ_FORCEINLINE __forceinline +#elif defined(__GNUC__) + #define MZ_FORCEINLINE inline __attribute__((__always_inline__)) +#else + #define MZ_FORCEINLINE inline +#endif + +#ifdef __cplusplus + extern "C" { +#endif + +// ------------------- zlib-style API's + +mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len) +{ + mz_uint32 i, s1 = (mz_uint32)(adler & 0xffff), s2 = (mz_uint32)(adler >> 16); size_t block_len = buf_len % 5552; + if (!ptr) return MZ_ADLER32_INIT; + while (buf_len) { + for (i = 0; i + 7 < block_len; i += 8, ptr += 8) { + s1 += ptr[0], s2 += s1; s1 += ptr[1], s2 += s1; s1 += ptr[2], s2 += s1; s1 += ptr[3], s2 += s1; + s1 += ptr[4], s2 += s1; s1 += ptr[5], s2 += s1; s1 += ptr[6], s2 += s1; s1 += ptr[7], s2 += s1; + } + for ( ; i < block_len; ++i) s1 += *ptr++, s2 += s1; + s1 %= 65521U, s2 %= 65521U; buf_len -= block_len; block_len = 5552; + } + return (s2 << 16) + s1; +} + +// Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C implementation that balances processor cache usage against speed": http://www.geocities.com/malbrain/ +mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len) +{ + static const mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c, + 0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c }; + mz_uint32 crcu32 = (mz_uint32)crc; + if (!ptr) return MZ_CRC32_INIT; + crcu32 = ~crcu32; while (buf_len--) { mz_uint8 b = *ptr++; crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)]; crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)]; } + return ~crcu32; +} + +void mz_free(void *p) +{ + MZ_FREE(p); +} + +#ifndef MINIZ_NO_ZLIB_APIS + +static void *def_alloc_func(void *opaque, size_t items, size_t size) { (void)opaque, (void)items, (void)size; return MZ_MALLOC(items * size); } +static void def_free_func(void *opaque, void *address) { (void)opaque, (void)address; MZ_FREE(address); } +static void *def_realloc_func(void *opaque, void *address, size_t items, size_t size) { (void)opaque, (void)address, (void)items, (void)size; return MZ_REALLOC(address, items * size); } + +const char *mz_version(void) +{ + return MZ_VERSION; +} + +int mz_deflateInit(mz_streamp pStream, int level) +{ + return mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9, MZ_DEFAULT_STRATEGY); +} + +int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy) +{ + tdefl_compressor *pComp; + mz_uint comp_flags = TDEFL_COMPUTE_ADLER32 | tdefl_create_comp_flags_from_zip_params(level, window_bits, strategy); + + if (!pStream) return MZ_STREAM_ERROR; + if ((method != MZ_DEFLATED) || ((mem_level < 1) || (mem_level > 9)) || ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS))) return MZ_PARAM_ERROR; + + pStream->data_type = 0; + pStream->adler = MZ_ADLER32_INIT; + pStream->msg = NULL; + pStream->reserved = 0; + pStream->total_in = 0; + pStream->total_out = 0; + if (!pStream->zalloc) pStream->zalloc = def_alloc_func; + if (!pStream->zfree) pStream->zfree = def_free_func; + + pComp = (tdefl_compressor *)pStream->zalloc(pStream->opaque, 1, sizeof(tdefl_compressor)); + if (!pComp) + return MZ_MEM_ERROR; + + pStream->state = (struct mz_internal_state *)pComp; + + if (tdefl_init(pComp, NULL, NULL, comp_flags) != TDEFL_STATUS_OKAY) + { + mz_deflateEnd(pStream); + return MZ_PARAM_ERROR; + } + + return MZ_OK; +} + +int mz_deflateReset(mz_s... [truncated message content] |
From: <ma...@us...> - 2018-06-07 10:58:23
|
Revision: 1494 http://sourceforge.net/p/canorus/code/1494 Author: matevz Date: 2018-06-07 10:58:20 +0000 (Thu, 07 Jun 2018) Log Message: ----------- Fixed bug #32 lilypond export: text and tempo on same note doesn't compile. Refactored CALilyPondExport: Separate exportMarksAfterElement and exportMarksBeforeElement. Added lilypond-tempo-mark-text test. Modified Paths: -------------- trunk/src/export/lilypondexport.cpp trunk/src/export/lilypondexport.h Added Paths: ----------- trunk/src/tests/ trunk/src/tests/lilypond-tempo-mark-text.xml Modified: trunk/src/export/lilypondexport.cpp =================================================================== --- trunk/src/export/lilypondexport.cpp 2018-06-07 10:36:12 UTC (rev 1493) +++ trunk/src/export/lilypondexport.cpp 2018-06-07 10:58:20 UTC (rev 1494) @@ -153,10 +153,10 @@ doAnacrusisCheck( time ); anacrusisCheck = false; } - exportVolta( v->musElementList()[i] ); // A volta bracket has to come before a playable + exportMarksBeforeElement( v->musElementList()[i] ); // A volta bracket has to come before a playable exportPlayable( static_cast<CAPlayable*>(v->musElementList()[i]) ); } else { - exportMarks(v->musElementList()[i]); + exportMarksAfterElement(v->musElementList()[i]); } } @@ -232,7 +232,7 @@ // export chord marks at the end if (!note->isPartOfChord() || note->isLastInChord()) { - exportMarks( note->getChord()[0] ); + exportMarksAfterElement( note->getChord()[0] ); } // add to the stream time, if the note is not part of the chord or is the last one in the chord @@ -253,7 +253,7 @@ out() << playableLengthToLilyPond( rest->playableLength() ); } - exportMarks( rest ); + exportMarksAfterElement( rest ); _lastPlayableLength = rest->playableLength(); _curStreamTime += rest->timeLength(); @@ -288,7 +288,7 @@ \sa exportNoteMarks() */ -void CALilyPondExport::exportMarks( CAMusElement *elt ) { +void CALilyPondExport::exportMarksAfterElement( CAMusElement *elt ) { for (int i=0; i<elt->markList().size(); i++) { CAMark *curMark = elt->markList()[i]; @@ -359,12 +359,6 @@ break; } - case CAMark::Tempo: { - CATempo *t = static_cast<CATempo*>(curMark); - out() << "\\tempo " << playableLengthToLilyPond(t->beat()) << " = " << t->bpm() << " "; - - break; - } case CAMark::Ritardando: { CARitardando *r = static_cast<CARitardando*>(curMark); out() << "^\\markup{ \\text \\italic \"" << ((r->ritardandoType()==CARitardando::Ritardando)?"rit.":"accel.") << "\"} "; @@ -371,6 +365,7 @@ break; } + case CAMark::Tempo: case CAMark::Crescendo: case CAMark::Pedal: case CAMark::InstrumentChange: @@ -386,7 +381,7 @@ /*! Exports the note-specific marks like fingering. - \sa exportMarks() + \sa exportMarksAfterElement() */ void CALilyPondExport::exportNoteMarks( CANote *elt ) { for (int i=0; i<elt->markList().size(); i++) { @@ -423,7 +418,7 @@ /*! Exports a volta bracket which is currently just a \a elt mark beginning with voltaBar or voltaRepeat. */ -void CALilyPondExport::exportVolta( CAMusElement *elt ) { +void CALilyPondExport::exportMarksBeforeElement( CAMusElement *elt ) { for (int i=0; i<elt->markList().size(); i++) { CAMark *curMark = elt->markList()[i]; @@ -445,8 +440,14 @@ }; break; } - case CAMark::Fingering: - case CAMark::Tempo: + case CAMark::Tempo: { + CATempo *t = static_cast<CATempo*>(curMark); + out() << "\\tempo " << playableLengthToLilyPond(t->beat()) << " = " << t->bpm() << " "; + + break; + } + + case CAMark::Fingering: case CAMark::Ritardando: case CAMark::Crescendo: case CAMark::Pedal: Modified: trunk/src/export/lilypondexport.h =================================================================== --- trunk/src/export/lilypondexport.h 2018-06-07 10:36:12 UTC (rev 1493) +++ trunk/src/export/lilypondexport.h 2018-06-07 10:58:20 UTC (rev 1494) @@ -46,9 +46,9 @@ void exportVoiceImpl(CAVoice *voice); void exportLyricsContextBlock(CALyricsContext *lc); void exportLyricsContextImpl(CALyricsContext* lc); - void exportMarks( CAMusElement* ); + void exportMarksBeforeElement( CAMusElement* ); void exportNoteMarks( CANote* ); - void exportVolta( CAMusElement* ); + void exportMarksAfterElement( CAMusElement* ); void exportPlayable( CAPlayable *elt ); void writeDocumentHeader(); Added: trunk/src/tests/lilypond-tempo-mark-text.xml =================================================================== --- trunk/src/tests/lilypond-tempo-mark-text.xml (rev 0) +++ trunk/src/tests/lilypond-tempo-mark-text.xml 2018-06-07 10:58:20 UTC (rev 1494) @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE canorusml> +<canorus-document> + <canorus-version>0.7.3rc2</canorus-version> + <document date-created="2018-06-07T12:31:51" time-edited="316" date-last-modified="2018-06-07T12:56:22"> + <sheet name="Sheet1"> + <staff name="Staff1" number-of-lines="5"> + <voice name="Staff1Voice1" stem-direction="stem-up" midi-pitch-offset="0" midi-program="0" midi-channel="0"> + <clef offset="0" c1="-2" time-start="0" clef-type="G" color="#00000000"/> + <time-signature time-signature-type="classical" time-start="0" beat="4" beats="4" color="#00000000"/> + <note time-start="0" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="39"/> + <mark time-start="0" mark-type="Tempo" bpm="72" color="#00000000" time-length="256"> + <playable-length music-length="half" dotted="0"/> + </mark> + <mark text="Tempo mark 1" time-start="0" mark-type="Text" color="#00000000" time-length="256"/> + </note> + <note time-start="256" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="38"/> + </note> + <note time-start="512" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="35"/> + </note> + <note time-start="768" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="36"/> + </note> + <barline time-start="1024" barline-type="single" color="#00000000"/> + <note time-start="1024" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="36"/> + </note> + <note time-start="1280" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="35"/> + </note> + <note time-start="1536" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="33"/> + </note> + <note time-start="1792" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="33"/> + <mark time-start="1792" mark-type="Tempo" bpm="80" color="#00000000" time-length="256"> + <playable-length music-length="half" dotted="0"/> + </mark> + <mark text="Tempo mark 2" time-start="1792" mark-type="Text" color="#00000000" time-length="256"/> + </note> + <barline time-start="2048" barline-type="single" color="#00000000"/> + <note time-start="2048" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="33"/> + </note> + <note time-start="2304" color="#00000000" time-length="256"> + <playable-length music-length="quarter" dotted="0"/> + <diatonic-pitch accs="0" note-name="33"/> + </note> + </voice> + </staff> + </sheet> + </document> +</canorus-document> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-06-07 10:36:18
|
Revision: 1493 http://sourceforge.net/p/canorus/code/1493 Author: matevz Date: 2018-06-07 10:36:12 +0000 (Thu, 07 Jun 2018) Log Message: ----------- Changed MusicXML extensions of examples. Added Paths: ----------- trunk/examples/musicxml/ActorPreludeSample.musicxml trunk/examples/musicxml/BeetAnGeSample.musicxml trunk/examples/musicxml/Binchois.musicxml trunk/examples/musicxml/BrahWiMeSample.musicxml trunk/examples/musicxml/BrookeWestSample.musicxml trunk/examples/musicxml/Chant.musicxml trunk/examples/musicxml/DebuMandSample.musicxml trunk/examples/musicxml/Dichterliebe01.musicxml trunk/examples/musicxml/Echigo-Jishi.musicxml trunk/examples/musicxml/FaurReveSample.musicxml trunk/examples/musicxml/MahlFaGe4Sample.musicxml trunk/examples/musicxml/MozaChloSample.musicxml trunk/examples/musicxml/MozaVeilSample.musicxml trunk/examples/musicxml/MozartPianoSonata.musicxml trunk/examples/musicxml/MozartTrio.musicxml trunk/examples/musicxml/Saltarello.musicxml trunk/examples/musicxml/SchbAvMaSample.musicxml trunk/examples/musicxml/Telemann.musicxml trunk/examples/musicxml/helloworld.musicxml Removed Paths: ------------- trunk/examples/musicxml/ActorPreludeSample.xml trunk/examples/musicxml/BeetAnGeSample.xml trunk/examples/musicxml/Binchois.xml trunk/examples/musicxml/BrahWiMeSample.xml trunk/examples/musicxml/BrookeWestSample.xml trunk/examples/musicxml/Chant.xml trunk/examples/musicxml/DebuMandSample.xml trunk/examples/musicxml/Dichterliebe01.xml trunk/examples/musicxml/Echigo-Jishi.xml trunk/examples/musicxml/FaurReveSample.xml trunk/examples/musicxml/MahlFaGe4Sample.xml trunk/examples/musicxml/MozaChloSample.xml trunk/examples/musicxml/MozaVeilSample.xml trunk/examples/musicxml/MozartPianoSonata.xml trunk/examples/musicxml/MozartTrio.xml trunk/examples/musicxml/Saltarello.xml trunk/examples/musicxml/SchbAvMaSample.xml trunk/examples/musicxml/Telemann.xml trunk/examples/musicxml/helloworld.xml Copied: trunk/examples/musicxml/ActorPreludeSample.musicxml (from rev 1492, trunk/examples/musicxml/ActorPreludeSample.xml) =================================================================== --- trunk/examples/musicxml/ActorPreludeSample.musicxml (rev 0) +++ trunk/examples/musicxml/ActorPreludeSample.musicxml 2018-06-07 10:36:12 UTC (rev 1493) @@ -0,0 +1,42941 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE score-partwise PUBLIC "-//Recordare//DTD MusicXML 2.0 Partwise//EN" + "http://www.musicxml.org/dtds/partwise.dtd"> +<score-partwise version="2.0"> + <movement-title>Prelude to a Tragedy</movement-title> + <identification> + <creator type="composer">Lee Actor</creator> + <rights>© 2004 Polygames. All Rights Reserved.</rights> + <encoding> + <software>Finale 2005 for Windows</software> + <software>Dolet 4.0 Beta 4 for Finale</software> + <encoding-date>2007-06-19</encoding-date> + <supports attribute="new-system" element="print" type="yes" value="yes"/> + <supports attribute="new-page" element="print" type="yes" value="yes"/> + </encoding> + </identification> + <defaults> + <scaling> + <millimeters>3.9956</millimeters> + <tenths>40</tenths> + </scaling> + <page-layout> + <page-height>3560</page-height> + <page-width>2797</page-width> + <page-margins type="even"> + <left-margin>141</left-margin> + <right-margin>115</right-margin> + <top-margin>127</top-margin> + <bottom-margin>45</bottom-margin> + </page-margins> + <page-margins type="odd"> + <left-margin>177</left-margin> + <right-margin>79</right-margin> + <top-margin>127</top-margin> + <bottom-margin>45</bottom-margin> + </page-margins> + </page-layout> + <system-layout> + <system-margins> + <left-margin>0</left-margin> + <right-margin>0</right-margin> + </system-margins> + <system-distance>39</system-distance> + <top-system-distance>39</top-system-distance> + </system-layout> + <staff-layout> + <staff-distance>93</staff-distance> + </staff-layout> + <appearance> + <line-width type="stem">0.4516</line-width> + <line-width type="beam">2.458</line-width> + <line-width type="staff">0.4516</line-width> + <line-width type="light barline">0.8849</line-width> + <line-width type="heavy barline">2.3781</line-width> + <line-width type="leger">0.8849</line-width> + <line-width type="ending">0.4516</line-width> + <line-width type="wedge">0.8849</line-width> + <line-width type="enclosure">0.4516</line-width> + <line-width type="tuplet bracket">0.4516</line-width> + <note-size type="grace">60</note-size> + <note-size type="cue">60</note-size> + </appearance> + <music-font font-family="Maestro" font-size="11.3"/> + <word-font font-family="Times New Roman" font-size="5.7"/> + </defaults> + <credit page="1"> + <credit-words default-x="1447" default-y="3477" font-size="19.5" justify="center" valign="top">Prelude to a Tragedy</credit-words> + </credit> + <credit page="1"> + <credit-words default-x="2718" default-y="3387" font-size="7.8" justify="right" valign="top">Lee Actor (2003)</credit-words> + </credit> + <credit page="1"> + <credit-words default-x="1447" default-y="45" font-size="7.8" justify="center" valign="bottom">© 2004 Polygames. All Rights Reserved.</credit-words> + </credit> + <part-list> + <part-group number="1" type="start"> + <group-symbol default-x="-7">bracket</group-symbol> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P1"> + <part-name>Piccolo</part-name> + <part-abbreviation>Picc.</part-abbreviation> + <score-instrument id="P1-I18"> + <instrument-name>Picc.</instrument-name> + </score-instrument> + <midi-instrument id="P1-I18"> + <midi-channel>1</midi-channel> + <midi-program>73</midi-program> + </midi-instrument> + </score-part> + <part-group number="2" type="start"> + <group-name>1 +2</group-name> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P2"> + <part-name>Flutes</part-name> + <part-abbreviation>Fl.</part-abbreviation> + <score-instrument id="P2-I19"> + <instrument-name>Fl.</instrument-name> + </score-instrument> + <midi-instrument id="P2-I19"> + <midi-channel>2</midi-channel> + <midi-program>74</midi-program> + </midi-instrument> + </score-part> + <part-group number="2" type="stop"/> + <part-group number="2" type="start"> + <group-name>1 +2</group-name> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P3"> + <part-name>Oboes</part-name> + <part-abbreviation>Ob.</part-abbreviation> + <score-instrument id="P3-I2"> + <instrument-name>Ob.</instrument-name> + </score-instrument> + <midi-instrument id="P3-I2"> + <midi-channel>3</midi-channel> + <midi-program>69</midi-program> + </midi-instrument> + </score-part> + <part-group number="2" type="stop"/> + <score-part id="P4"> + <part-name>English Horn</part-name> + <part-abbreviation>E. H.</part-abbreviation> + <score-instrument id="P4-I11"> + <instrument-name>E.H.</instrument-name> + </score-instrument> + <midi-instrument id="P4-I11"> + <midi-channel>4</midi-channel> + <midi-program>70</midi-program> + </midi-instrument> + </score-part> + <part-group number="2" type="start"> + <group-name>1 +2</group-name> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P5"> + <part-name>Clarinets in Bb</part-name> + <part-abbreviation>Cl.</part-abbreviation> + <score-instrument id="P5-I3"> + <instrument-name>Clar.</instrument-name> + </score-instrument> + <midi-instrument id="P5-I3"> + <midi-channel>5</midi-channel> + <midi-program>72</midi-program> + </midi-instrument> + </score-part> + <part-group number="2" type="stop"/> + <score-part id="P6"> + <part-name>Bass Clarinet in Bb</part-name> + <part-abbreviation>B. Cl.</part-abbreviation> + <score-instrument id="P6-I1"> + <instrument-name>B. Cl.</instrument-name> + </score-instrument> + <midi-instrument id="P6-I1"> + <midi-channel>5</midi-channel> + <midi-program>72</midi-program> + </midi-instrument> + </score-part> + <part-group number="2" type="start"> + <group-name>1 +2</group-name> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P7"> + <part-name>Bassoons</part-name> + <part-abbreviation>Bsn.</part-abbreviation> + <score-instrument id="P7-I4"> + <instrument-name>Bsn.</instrument-name> + </score-instrument> + <midi-instrument id="P7-I4"> + <midi-channel>7</midi-channel> + <midi-program>71</midi-program> + </midi-instrument> + </score-part> + <part-group number="2" type="stop"/> + <part-group number="1" type="stop"/> + <part-group number="1" type="start"> + <group-name>Horns in F</group-name> + <group-abbreviation>Hn.</group-abbreviation> + <group-symbol default-x="-12">brace</group-symbol> + <group-barline>no</group-barline> + </part-group> + <part-group number="2" type="start"> + <group-symbol default-x="-7">bracket</group-symbol> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P8"> + <part-name>1 +2</part-name> + <part-abbreviation>1 +2</part-abbreviation> + <score-instrument id="P8-I5"> + <instrument-name>Hn.</instrument-name> + </score-instrument> + <midi-instrument id="P8-I5"> + <midi-channel>8</midi-channel> + <midi-program>61</midi-program> + </midi-instrument> + </score-part> + <score-part id="P9"> + <part-name>3 +4</part-name> + <part-abbreviation>3 +4</part-abbreviation> + <score-instrument id="P9-I17"> + <instrument-name>Hn. 2</instrument-name> + </score-instrument> + <midi-instrument id="P9-I17"> + <midi-channel>8</midi-channel> + <midi-program>61</midi-program> + </midi-instrument> + </score-part> + <part-group number="1" type="stop"/> + <part-group number="3" type="start"> + <group-name>1 +2</group-name> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P10"> + <part-name>Trumpets in C</part-name> + <part-abbreviation>Tpt.</part-abbreviation> + <score-instrument id="P10-I6"> + <instrument-name>Tpt.</instrument-name> + </score-instrument> + <midi-instrument id="P10-I6"> + <midi-channel>9</midi-channel> + <midi-program>57</midi-program> + </midi-instrument> + </score-part> + <part-group number="3" type="stop"/> + <part-group number="1" type="start"> + <group-name>Trombones</group-name> + <group-abbreviation>Trb.</group-abbreviation> + <group-symbol default-x="-12">brace</group-symbol> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P11"> + <part-name>1 +2</part-name> + <part-abbreviation>1 +2</part-abbreviation> + <score-instrument id="P11-I7"> + <instrument-name>Trb.</instrument-name> + </score-instrument> + <midi-instrument id="P11-I7"> + <midi-channel>11</midi-channel> + <midi-program>58</midi-program> + </midi-instrument> + </score-part> + <score-part id="P12"> + <part-name>3</part-name> + <part-abbreviation>3</part-abbreviation> + <score-instrument id="P12-I21"> + <instrument-name>B Trb.</instrument-name> + </score-instrument> + <midi-instrument id="P12-I21"> + <midi-channel>11</midi-channel> + <midi-program>58</midi-program> + </midi-instrument> + </score-part> + <part-group number="1" type="stop"/> + <score-part id="P13"> + <part-name>Tuba</part-name> + <part-abbreviation>Tba.</part-abbreviation> + <score-instrument id="P13-I8"> + <instrument-name>Tuba</instrument-name> + </score-instrument> + <midi-instrument id="P13-I8"> + <midi-channel>12</midi-channel> + <midi-program>59</midi-program> + </midi-instrument> + </score-part> + <part-group number="2" type="stop"/> + <part-group number="2" type="start"> + <group-symbol default-x="-7">bracket</group-symbol> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P14"> + <part-name>Timpani</part-name> + <part-abbreviation>Timp.</part-abbreviation> + <score-instrument id="P14-I9"> + <instrument-name>Timp.</instrument-name> + </score-instrument> + <midi-instrument id="P14-I9"> + <midi-channel>13</midi-channel> + <midi-program>48</midi-program> + </midi-instrument> + </score-part> + <part-group number="1" type="start"> + <group-name>Percussion</group-name> + <group-abbreviation>Perc.</group-abbreviation> + <group-symbol default-x="-12">brace</group-symbol> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P15"> + <part-name>1</part-name> + <part-abbreviation>1</part-abbreviation> + <score-instrument id="P15-X10"> + <instrument-name>Susp. Cym.</instrument-name> + </score-instrument> + <midi-instrument id="P15-X10"> + <midi-channel>10</midi-channel> + <midi-program>1</midi-program> + <midi-unpitched>56</midi-unpitched> + </midi-instrument> + </score-part> + <score-part id="P16"> + <part-name>2</part-name> + <part-abbreviation>2</part-abbreviation> + <score-instrument id="P16-X3"> + <instrument-name>Bass Drum</instrument-name> + </score-instrument> + <midi-instrument id="P16-X3"> + <midi-channel>10</midi-channel> + <midi-program>1</midi-program> + <midi-unpitched>36</midi-unpitched> + </midi-instrument> + </score-part> + <part-group number="2" type="stop"/> + <part-group number="1" type="stop"/> + <score-part id="P17"> + <part-name>Harp</part-name> + <part-abbreviation>Hp.</part-abbreviation> + <score-instrument id="P17-I22"> + <instrument-name>Harp</instrument-name> + </score-instrument> + <midi-instrument id="P17-I22"> + <midi-channel>6</midi-channel> + <midi-program>47</midi-program> + </midi-instrument> + </score-part> + <part-group number="1" type="start"> + <group-symbol default-x="-7">bracket</group-symbol> + <group-barline>yes</group-barline> + </part-group> + <score-part id="P18"> + <part-name>Violin I</part-name> + <part-abbreviation>Vln. I</part-abbreviation> + <score-instrument id="P18-I10"> + <instrument-name>Vln.</instrument-name> + </score-instrument> + <midi-instrument id="P18-I10"> + <midi-channel>14</midi-channel> + <midi-program>49</midi-program> + </midi-instrument> + </score-part> + <score-part id="P19"> + <part-name>Violin II</part-name> + <part-abbreviation>Vln. II</part-abbreviation> + <score-instrument id="P19-I13"> + <instrument-name>Vln. 2</instrument-name> + </score-instrument> + <midi-instrument id="P19-I13"> + <midi-channel>15</midi-channel> + <midi-program>49</midi-program> + </midi-instrument> + </score-part> + <score-part id="P20"> + <part-name>Viola</part-name> + <part-abbreviation>Vla.</part-abbreviation> + <score-instrument id="P20-I14"> + <instrument-name>Va.</instrument-name> + </score-instrument> + <midi-instrument id="P20-I14"> + <midi-channel>16</midi-channel> + <midi-program>50</midi-program> + </midi-instrument> + </score-part> + <score-part id="P21"> + <part-name>Violoncello</part-name> + <part-abbreviation>Vc.</part-abbreviation> + <score-instrument id="P21-I15"> + <instrument-name>Vc.</instrument-name> + </score-instrument> + <midi-instrument id="P21-I15"> + <midi-channel>16</midi-channel> + <midi-program>50</midi-program> + </midi-instrument> + </score-part> + <score-part id="P22"> + <part-name>Contrabass</part-name> + <part-abbreviation>Cb.</part-abbreviation> + <score-instrument id="P22-I16"> + <instrument-name>Cb.</instrument-name> + </score-instrument> + <midi-instrument id="P22-I16"> + <midi-channel>16</midi-channel> + <midi-program>50</midi-program> + </midi-instrument> + </score-part> + <part-group number="1" type="stop"/> + </part-list> + <!--=========================================================--> + <part id="P1"> + <measure number="1" width="325"> + <print> + <page-layout> + <page-height>3560</page-height> + <page-width>2797</page-width> + <page-margins> + <left-margin>177</left-margin> + <right-margin>79</right-margin> + <top-margin>64</top-margin> + <bottom-margin>45</bottom-margin> + </page-margins> + </page-layout> + <system-layout> + <system-margins> + <left-margin>150</left-margin> + <right-margin>0</right-margin> + </system-margins> + <top-system-distance>191</top-system-distance> + </system-layout> + </print> + <attributes> + <divisions>8</divisions> + <key> + <fifths>0</fifths> + <mode>major</mode> + </key> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + <clef> + <sign>G</sign> + <line>2</line> + </clef> + <staff-details> + <staff-size>108</staff-size> + </staff-details> + <transpose> + <diatonic>0</diatonic> + <chromatic>0</chromatic> + <octave-change>1</octave-change> + </transpose> + </attributes> + <direction placement="above" directive="yes"> + <direction-type> + <words default-y="40" font-size="6.6" font-weight="bold">Moderato</words> + </direction-type> + <direction-type> + <words font-size="6.6" font-weight="normal"> </words> + </direction-type> + <direction-type> + <metronome font-family="EngraverTextT" font-size="5.7" parentheses="yes"> + <beat-unit>quarter</beat-unit> + <per-minute>85</per-minute> + </metronome> + </direction-type> + <sound tempo="85"/> + </direction> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="2" width="355"> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="3" width="332"> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="4" width="268"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="5" width="210"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>16</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="6" width="366"> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="7" width="294"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <sound dynamics="67"/> + <note default-x="59"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>24</duration> + <tie type="start"/> + <voice>1</voice> + <type>half</type> + <dot/> + <stem default-y="-22">down</stem> + <notations> + <tied type="start"/> + <dynamics default-y="-68" placement="below"> + <p/> + </dynamics> + </notations> + </note> + </measure> + <!--=======================================================--> + <measure number="8" width="242"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note default-x="48"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>16</duration> + <tie type="stop"/> + <tie type="start"/> + <voice>1</voice> + <type>half</type> + <stem default-y="-22">down</stem> + <notations> + <tied type="stop"/> + <tied type="start"/> + </notations> + </note> + </measure> + <!--=======================================================--> + <measure number="9" width="412"> + <print new-page="yes" page-number="2"> + <page-layout> + <page-height>3560</page-height> + <page-width>2797</page-width> + <page-margins> + <left-margin>141</left-margin> + <right-margin>115</right-margin> + <top-margin>104</top-margin> + <bottom-margin>45</bottom-margin> + </page-margins> + </page-layout> + <system-layout> + <top-system-distance>22</top-system-distance> + </system-layout> + </print> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + <staff-details> + <staff-size>100</staff-size> + </staff-details> + </attributes> + <note default-x="109"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>32</duration> + <tie type="stop"/> + <tie type="start"/> + <voice>1</voice> + <type>whole</type> + <notations> + <tied type="stop"/> + <tied type="start"/> + </notations> + </note> + </measure> + <!--=======================================================--> + <measure number="10" width="266"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note default-x="45"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>24</duration> + <tie type="stop"/> + <tie type="start"/> + <voice>1</voice> + <type>half</type> + <dot/> + <stem default-y="-20.5">down</stem> + <notations> + <tied type="stop"/> + <tied type="start"/> + </notations> + </note> + </measure> + <!--=======================================================--> + <measure number="11" width="244"> + <note default-x="22"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>24</duration> + <tie type="stop"/> + <tie type="start"/> + <voice>1</voice> + <type>half</type> + <dot/> + <stem default-y="-20.5">down</stem> + <notations> + <tied type="stop"/> + <tied type="start"/> + </notations> + </note> + </measure> + <!--=======================================================--> + <measure number="12" width="196"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note default-x="44"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>16</duration> + <tie type="stop"/> + <tie type="start"/> + <voice>1</voice> + <type>half</type> + <stem default-y="-20.5">down</stem> + <notations> + <tied type="stop"/> + <tied type="start"/> + </notations> + </note> + </measure> + <!--=======================================================--> + <measure number="13" width="370"> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note default-x="67"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>32</duration> + <tie type="stop"/> + <voice>1</voice> + <type>whole</type> + <notations> + <tied type="stop"/> + </notations> + </note> + </measure> + <!--=======================================================--> + <measure number="14" width="263"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="15" width="289"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="16" width="314"> + <note default-x="13"> + <rest/> + <duration>8</duration> + <voice>1</voice> + <type>quarter</type> + </note> + <note default-x="114"> + <rest/> + <duration>8</duration> + <voice>1</voice> + <type>quarter</type> + </note> + <sound dynamics="100"/> + <note default-x="214"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-25">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur number="1" placement="above" type="start"/> + <dynamics default-y="-64" placement="below" relative-x="-9"> + <f/> + </dynamics> + </notations> + </note> + <direction placement="below"> + <direction-type> + <wedge default-y="-58" spread="0" type="crescendo"/> + </direction-type> + <offset>-1</offset> + </direction> + <note default-x="236"> + <pitch> + <step>C</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-23">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="260"> + <pitch> + <step>D</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-22">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="290"> + <pitch> + <step>E</step> + <alter>-1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>flat</accidental> + <stem default-y="-19.5">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur number="1" type="stop"/> + </notations> + </note> + <direction> + <direction-type> + <wedge spread="15" type="stop"/> + </direction-type> + <offset>-1</offset> + </direction> + </measure> + <!--=======================================================--> + <measure number="17" width="186"> + <sound dynamics="122"/> + <note default-x="12"> + <pitch> + <step>F</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-20.5">down</stem> + <notations> + <dynamics default-y="-64" placement="below"> + <ff/> + </dynamics> + </notations> + </note> + <note default-x="31"> + <rest/> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + </note> + <note default-x="48"> + <rest/> + <duration>4</duration> + <voice>1</voice> + <type>eighth</type> + </note> + <note default-x="72"> + <rest/> + <duration>8</duration> + <voice>1</voice> + <type>quarter</type> + </note> + <note default-x="113"> + <rest/> + <duration>8</duration> + <voice>1</voice> + <type>quarter</type> + </note> + </measure> + <!--=======================================================--> + <measure number="18"> + <print new-system="yes"/> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + <staff-details print-object="no"/> + </attributes> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="19"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="20"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="21"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="22"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="23"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>16</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="24"> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="25"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="26" width="444"> + <print new-page="yes" page-number="3"> + <page-layout> + <page-height>3560</page-height> + <page-width>2797</page-width> + <page-margins> + <left-margin>177</left-margin> + <right-margin>79</right-margin> + <top-margin>109</top-margin> + <bottom-margin>45</bottom-margin> + </page-margins> + </page-layout> + <system-layout> + <top-system-distance>81</top-system-distance> + </system-layout> + </print> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + <staff-details print-object="yes"> + <staff-size>108</staff-size> + </staff-details> + </attributes> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="27" width="376"> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="28" width="377"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="29" width="219"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="30" width="261"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="31" width="233"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="32" width="262"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="33" width="369"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="34" width="337"> + <print new-page="yes" page-number="4"> + <page-layout> + <page-height>3560</page-height> + <page-width>2797</page-width> + <page-margins> + <left-margin>141</left-margin> + <right-margin>115</right-margin> + <top-margin>104</top-margin> + <bottom-margin>45</bottom-margin> + </page-margins> + </page-layout> + <system-layout> + <top-system-distance>113</top-system-distance> + </system-layout> + </print> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>16</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="35" width="406"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="36" width="280"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>16</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="37" width="406"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="38" width="401"> + <sound dynamics="100"/> + <note default-x="36"> + <pitch> + <step>D</step> + <alter>1</alter> + <octave>5</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>sharp</accidental> + <stem default-y="-48.5">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur number="1" placement="above" type="start"/> + <dynamics default-y="-74" placement="below"> + <f/> + </dynamics> + </notations> + </note> + <direction placement="below"> + <direction-type> + <wedge default-y="-66" spread="0" type="crescendo"/> + </direction-type> + </direction> + <note default-x="67"> + <pitch> + <step>E</step> + <octave>5</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-47">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="99"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>5</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>sharp</accidental> + <stem default-y="-44">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="125"> + <pitch> + <step>G</step> + <octave>5</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-43">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur number="1" type="stop"/> + </notations> + </note> + <note default-x="151"> + <pitch> + <step>A</step> + <octave>5</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-26.5">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur bezier-x="8" bezier-y="33" default-x="7" default-y="21" number="1" placement="above" type="start"/> + </notations> + </note> + <note default-x="184"> + <pitch> + <step>B</step> + <alter>-1</alter> + <octave>5</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>flat</accidental> + <stem default-y="-25">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="210"> + <pitch> + <step>C</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-23">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="244"> + <pitch> + <step>C</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>sharp</accidental> + <stem default-y="-21">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur bezier-x="-26" bezier-y="28" default-x="7" default-y="33" number="1" type="stop"/> + </notations> + </note> + <note default-x="276"> + <pitch> + <step>D</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur number="1" placement="above" type="start"/> + </notations> + </note> + <note default-x="308"> + <pitch> + <step>D</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>sharp</accidental> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="342"> + <pitch> + <step>E</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="374"> + <pitch> + <step>F</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>natural</accidental> + <stem default-y="-21">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur number="1" type="stop"/> + </notations> + </note> + <direction> + <direction-type> + <wedge default-y="-56" spread="16" type="stop"/> + </direction-type> + <offset>-1</offset> + </direction> + </measure> + <!--=======================================================--> + <measure number="39" width="307"> + <sound dynamics="122"/> + <note default-x="25"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>sharp</accidental> + <stem default-y="-21">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur number="1" placement="above" type="start"/> + <dynamics default-y="-66" placement="below"> + <ff/> + </dynamics> + </notations> + </note> + <note default-x="48"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="71"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="94"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur number="1" type="stop"/> + </notations> + </note> + <note default-x="118"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur number="1" placement="above" type="start"/> + </notations> + </note> + <note default-x="141"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="165"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="188"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur number="1" type="stop"/> + </notations> + </note> + <note default-x="212"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur number="1" placement="above" type="start"/> + </notations> + </note> + <note default-x="235"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="259"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="281"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur number="1" type="stop"/> + </notations> + </note> + </measure> + <!--=======================================================--> + <measure number="40" width="116"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>16</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="41" width="289"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <sound dynamics="122"/> + <note default-x="58"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <accidental>sharp</accidental> + <stem default-y="-21">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur number="1" placement="above" type="start"/> + <dynamics default-y="-67" placement="below"> + <ff/> + </dynamics> + </notations> + </note> + <note default-x="80"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="102"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="124"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur number="1" type="stop"/> + </notations> + </note> + <note default-x="147"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">begin</beam> + <beam number="2">begin</beam> + <notations> + <slur number="1" placement="above" type="start"/> + </notations> + </note> + <note default-x="169"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="191"> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">continue</beam> + <beam number="2">continue</beam> + </note> + <note default-x="213"> + <pitch> + <step>G</step> + <octave>6</octave> + </pitch> + <duration>2</duration> + <voice>1</voice> + <type>16th</type> + <stem default-y="-21">down</stem> + <beam number="1">end</beam> + <beam number="2">end</beam> + <notations> + <slur number="1" type="stop"/> + </notations> + </note> + <note default-x="234"> + <rest/> + <duration>8</duration> + <voice>1</voice> + <type>quarter</type> + </note> + </measure> + </part> + <!--=========================================================--> + <part id="P2"> + <measure number="1" width="325"> + <print> + <staff-layout number="1"> + <staff-distance>95</staff-distance> + </staff-layout> + </print> + <attributes> + <divisions>8</divisions> + <key> + <fifths>0</fifths> + <mode>major</mode> + </key> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + <clef> + <sign>G</sign> + <line>2</line> + </clef> + <staff-details> + <staff-size>108</staff-size> + </staff-details> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="2" width="355"> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="3" width="332"> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="4" width="268"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="5" width="210"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>16</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="6" width="366"> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>32</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="7" width="294"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <sound dynamics="67"/> + <note default-x="59"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>24</duration> + <tie type="start"/> + <voice>1</voice> + <type>half</type> + <dot/> + <stem default-y="-22">down</stem> + <notations> + <tied type="start"/> + <dynamics default-y="-65" placement="below"> + <p/> + </dynamics> + </notations> + </note> + <note default-x="59"> + <chord/> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>24</duration> + <tie type="start"/> + <voice>1</voice> + <type>half</type> + <dot/> + <accidental>sharp</accidental> + <stem>down</stem> + <notations> + <tied type="start"/> + </notations> + </note> + <direction placement="below"> + <direction-type> + <wedge default-y="-59" spread="0" type="crescendo"/> + </direction-type> + <offset>-21</offset> + </direction> + </measure> + <!--=======================================================--> + <measure number="8" width="242"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note default-x="48"> + <pitch> + <step>B</step> + <octave>5</octave> + </pitch> + <duration>16</duration> + <tie type="stop"/> + <voice>1</voice> + <type>half</type> + <stem default-y="-22">down</stem> + <notations> + <tied type="stop"/> + </notations> + </note> + <note default-x="48"> + <chord/> + <pitch> + <step>F</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>16</duration> + <tie type="stop"/> + <voice>1</voice> + <type>half</type> + <stem>down</stem> + <notations> + <tied type="stop"/> + </notations> + </note> + <direction> + <direction-type> + <wedge spread="16" type="stop"/> + </direction-type> + <offset>-1</offset> + </direction> + </measure> + <!--=======================================================--> + <measure number="9" width="412"> + <print new-page="yes"> + <staff-layout number="1"> + <staff-distance>95</staff-distance> + </staff-layout> + </print> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</beat-type> + </time> + <staff-details> + <staff-size>100</staff-size> + </staff-details> + </attributes> + <sound dynamics="100"/> + <note default-x="109"> + <pitch> + <step>A</step> + <alter>1</alter> + <octave>5</octave> + </pitch> + <duration>32</duration> + <voice>1</voice> + <type>whole</type> + <accidental>sharp</accidental> + <notations> + <dynamics default-y="-68" placement="below"> + <f/> + </dynamics> + </notations> + </note> + <note default-x="109"> + <chord/> + <pitch> + <step>E</step> + <alter>1</alter> + <octave>6</octave> + </pitch> + <duration>32</duration> + <voice>1</voice> + <type>whole</type> + <accidental>sharp</accidental> + </note> + <direction placement="below"> + <direction-type> + <wedge default-y="-62" spread="15" type="diminuendo"/> + </direction-type> + <offset>-30</offset> + </direction> + <direction> + <direction-type> + <wedge spread="0" type="stop"/> + </direction-type> + <offset>-1</offset> + </direction> + </measure> + <!--=======================================================--> + <measure number="10" width="266"> + <attributes> + <time> + <beats>3</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="11" width="244"> + <note> + <rest/> + <duration>24</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="12" width="196"> + <attributes> + <time> + <beats>2</beats> + <beat-type>4</beat-type> + </time> + </attributes> + <note> + <rest/> + <duration>16</duration> + <voice>1</voice> + </note> + </measure> + <!--=======================================================--> + <measure number="13" width="370"> + <attributes> + <time> + <beats>4</beats> + <beat-type>4</b... [truncated message content] |
From: <ma...@us...> - 2018-06-07 10:29:26
|
Revision: 1492 http://sourceforge.net/p/canorus/code/1492 Author: matevz Date: 2018-06-07 10:29:16 +0000 (Thu, 07 Jun 2018) Log Message: ----------- Set new MusicXML format (.xml -> .musicxml). Modified Paths: -------------- trunk/src/core/fileformats.cpp Modified: trunk/src/core/fileformats.cpp =================================================================== --- trunk/src/core/fileformats.cpp 2018-06-07 09:51:02 UTC (rev 1491) +++ trunk/src/core/fileformats.cpp 2018-06-07 10:29:16 UTC (rev 1492) @@ -18,7 +18,7 @@ const QString CAFileFormats::CANORUSML_FILTER = QObject::tr("Canorus document (*.xml)"); const QString CAFileFormats::CAN_FILTER = QObject::tr("Canorus archive (*.can)"); const QString CAFileFormats::LILYPOND_FILTER = QObject::tr("LilyPond document (*.ly)"); -const QString CAFileFormats::MUSICXML_FILTER = QObject::tr("MusicXML document (*.xml)"); +const QString CAFileFormats::MUSICXML_FILTER = QObject::tr("MusicXML document (*.musicxml)"); const QString CAFileFormats::NOTEEDIT_FILTER = QObject::tr("NoteEdit document (*.not)"); const QString CAFileFormats::ABCMUSIC_FILTER = QObject::tr("ABC music document (*.abc)"); const QString CAFileFormats::FINALE_FILTER = QObject::tr("Finale document (*.mus)"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-06-07 09:51:08
|
Revision: 1491 http://sourceforge.net/p/canorus/code/1491 Author: matevz Date: 2018-06-07 09:51:02 +0000 (Thu, 07 Jun 2018) Log Message: ----------- Fixed bug #30 voice number not updated when using tab key to walk over voices. Added support for walking through contexts using tab key. Modified Paths: -------------- trunk/src/ui/mainwin.cpp Modified: trunk/src/ui/mainwin.cpp =================================================================== --- trunk/src/ui/mainwin.cpp 2018-06-06 23:07:41 UTC (rev 1490) +++ trunk/src/ui/mainwin.cpp 2018-06-07 09:51:02 UTC (rev 1491) @@ -2454,23 +2454,27 @@ case Qt::Key_Backtab: { int idx = -1; if( e->modifiers() == Qt::ControlModifier ) // Control tab has different use - idx = uiTabWidget->currentIndex(); - else - idx = currentSheet()->voiceList().indexOf(currentVoice()); + idx = uiTabWidget->currentIndex(); + else if (currentVoice()) + idx = currentSheet()->voiceList().indexOf(currentVoice()); + else + idx = currentSheet()->contextList().indexOf(currentContext()); + if (e->key()==Qt::Key_Tab) { idx++; } else { idx--; } + // Next/Previous sheet selection if( e->modifiers() == Qt::ControlModifier ) { // Cycle if first or last sheet was reached - if( idx >= uiTabWidget->count() ) - idx = 0; + if ( idx >= uiTabWidget->count() ) + idx = 0; else - if( idx<0 ) - idx = uiTabWidget->count() -1; + if ( idx<0 ) + idx = uiTabWidget->count() -1; //if( idx >=0 && idx < uiTabWidget->count() ) uiTabWidget->setCurrentIndex(idx); } @@ -2477,14 +2481,28 @@ else // Next/Previous Voice selection if (currentVoice() && (mode()==InsertMode || mode()==EditMode)) { // Cycle if first or last voice number was reached - if( idx >= currentSheet()->voiceList().size() ) - idx = 0; + if ( idx >= currentSheet()->voiceList().size() ) + idx = 0; else - if( idx<0 ) - idx = currentSheet()->voiceList().size() -1; + if ( idx<0 ) + idx = currentSheet()->voiceList().size()-1; - setCurrentVoice( currentSheet()->voiceList()[idx] ); + CAVoice *v = currentSheet()->voiceList()[idx]; + currentScoreView()->selectContext( v->staff() ); + uiVoiceNum->setRealValue( v->voiceNumber() ); // also calls setCurrentVoice and updates the UI } + else // Next/Previous Context, if selection is empty + if (currentScoreView()->selection().size()==0) + { + if ( idx >= currentSheet()->contextList().size() ) + idx = 0 ; + else + if ( idx<0 ) + idx = currentSheet()->contextList().size()-1; + currentScoreView()->selectContext( currentSheet()->contextList()[idx] ); + updateToolBars(); + currentScoreView()->repaint(); + } break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-06-06 23:07:47
|
Revision: 1490 http://sourceforge.net/p/canorus/code/1490 Author: matevz Date: 2018-06-06 23:07:41 +0000 (Wed, 06 Jun 2018) Log Message: ----------- Updated Ubuntu dependencies for the latest version. Modified Paths: -------------- trunk/README Modified: trunk/README =================================================================== --- trunk/README 2018-06-04 21:37:54 UTC (rev 1489) +++ trunk/README 2018-06-06 23:07:41 UTC (rev 1490) @@ -88,13 +88,17 @@ Compilation under Debian/Ubuntu: =========================== -One-liner to install build dependencies on Ubuntu 17.10 Artful Aardvark if you don't use the original Qt development environment: - $ sudo apt install cmake g++ make libqt5webkit5-dev libqt5svg5-dev qtbase5-dev qttools5-dev qtwebengine5-dev +One-liner to install build dependencies on Ubuntu 17.10 Artful Aardvark: + $ sudo apt install cmake g++ make libqt5webkit5-dev libqt5svg5-dev qtbase5-dev qttools5-dev qtwebengine5-dev libasound2-dev -If you had installed the Ubuntu qt5 environment and wish to switch to (latest) Qt we -recommend to first uninstall the above dev files (include QtCreator): - $ sudo apt remove libqt5webkit5-dev libqt5svg5-dev qtbase5-dev qttools5-dev qtwebengine5-dev +For python scripting support, add: + $ sudo apt install python3-dev swig +NOTE: If you had installed the Ubuntu qt5 environment and wish to switch to + (newer) Qt we recommend to first uninstall the above dev files (include + QtCreator): +$ sudo apt purge libqt5webkit5-dev libqt5svg5-dev qtbase5-dev qttools5-dev qtwebengine5-dev + Download the SVN/release version of canorus, go to Canorus root directory and run: $ debian/rules binary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2018-06-04 21:37:57
|
Revision: 1489 http://sourceforge.net/p/canorus/code/1489 Author: suamor Date: 2018-06-04 21:37:54 +0000 (Mon, 04 Jun 2018) Log Message: ----------- 0.7.3rc2 Added Paths: ----------- tags/0.7.3rc2/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2018-06-04 18:55:39
|
Revision: 1488 http://sourceforge.net/p/canorus/code/1488 Author: suamor Date: 2018-06-04 18:55:34 +0000 (Mon, 04 Jun 2018) Log Message: ----------- Updated build info for Qt5.x; Updated Changes; New version for Release Modified Paths: -------------- trunk/NEWS trunk/README trunk/TODO trunk/VERSION Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2018-05-30 20:40:44 UTC (rev 1487) +++ trunk/NEWS 2018-06-04 18:55:34 UTC (rev 1488) @@ -59,6 +59,10 @@ - Show text edit when exactly one element is selected, otherwise, confirm any opened text edits and hide it. - fix for pluginmanager when no plugins are available - Streamline Translation with 5.6 (use official macros) +- Support for latest gcc 7 (fix compilation) +- Fix issue when opening recent files and saving showing "unknown file format" +- Fix: If a non-playable is on first notem a slur could not be made +- Fix issue on not working Key Signature based transposition downwards 0.7.2 ===== Modified: trunk/README =================================================================== --- trunk/README 2018-05-30 20:40:44 UTC (rev 1487) +++ trunk/README 2018-06-04 18:55:34 UTC (rev 1488) @@ -15,7 +15,7 @@ The latest version of Qt5, Swig and CMake is preferred. Canorus requires the current "LTS" version 5.6 or later. -- Qt development package >=5.3 (http://www.qt-project.org) +- Qt development package >=5.6 (http://www.qt-project.org) - Swig >=2.0.12 (http://www.swig.org). Swig >= 3.0.8 is working too. (cmake does not support parallel installations of swig) - g++ >=5, make (http://gcc.gnu.org, http://www.mingw.org) @@ -23,8 +23,8 @@ - Python development package >=3.0 (http://www.python.org) - (optional) Lyx, tex4ht (user's guide) -Qt5 Build (tested with version 5.6.2) -- Get original Qt development package 5.6.2 (http://www.qt.io) +Qt5 Build (tested with version 5.6.2 and 5.9.5) +- Get original Qt development package 5.6.2 or 5.9.5 (http://www.qt.io) - It is strongly recommended not to use Qt coming with your distribution - Get Swig, g++, cmake, python, lyx as specified above (make sure to remove Swig 2.0 before using Swig 3.0) @@ -32,7 +32,9 @@ - Create a build folder, outside the source folder and "cd" into it $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake ../canorus/trunk - Ignore the warning about the missing ruby package -- make -j4 (for dual-core use -j2 switch), on Intel i7 use -j8 / -j4 +- make -j4 (for dual-core use -j2 switch) + on AMD Ryzen or Intel i7 use -j8 / -j4 + depending on your available memory you may need to reduce the number Note that if you use the old way of building canorus you have to disable the local installation of Canorus when calling cmake: @@ -86,9 +88,13 @@ Compilation under Debian/Ubuntu: =========================== -One-liner to install build dependencies on Ubuntu 17.10 Artful Aardvark: +One-liner to install build dependencies on Ubuntu 17.10 Artful Aardvark if you don't use the original Qt development environment: $ sudo apt install cmake g++ make libqt5webkit5-dev libqt5svg5-dev qtbase5-dev qttools5-dev qtwebengine5-dev +If you had installed the Ubuntu qt5 environment and wish to switch to (latest) Qt we +recommend to first uninstall the above dev files (include QtCreator): + $ sudo apt remove libqt5webkit5-dev libqt5svg5-dev qtbase5-dev qttools5-dev qtwebengine5-dev + Download the SVN/release version of canorus, go to Canorus root directory and run: $ debian/rules binary @@ -97,6 +103,7 @@ Debian based shipped binaries ============================= We distribute binaries compiled with the official Qt 5.6 version. Built on xenial. +In the near future we will switch to Qt 5.9 version, built on bionic. The debian package has a wrapper script canorus-qt.sh for the debian package that includes the libraries. @@ -110,6 +117,9 @@ They also may work with libraries of Qt 5.6 from your Distribution. Avoid using these with later versions (f.e. 5.7/5.8/5.9) of Qt, instead rebuild. +There is an unofficial PPA for Ubuntu containing binaries for current Ubuntu series: +https://launchpad.net/~ichthyo/+archive/ubuntu/music + Troubleshooting: ================ Modified: trunk/TODO =================================================================== --- trunk/TODO 2018-05-30 20:40:44 UTC (rev 1487) +++ trunk/TODO 2018-06-04 18:55:34 UTC (rev 1488) @@ -1,8 +1,8 @@ For a detailed list of planned features for the next version see the wiki pages http://www.canorus.org/wiki/index.php/Main_Page. -Planned Features: -http://www.canorus.org/wiki/index.php/Features +Requested Features: +https://sourceforge.net/p/canorus/feature-requests/ -Roadmap: -http://www.canorus.org/wiki/index.php/Roadmap +Planned Features: (currently there is no roadmap) + Modified: trunk/VERSION =================================================================== --- trunk/VERSION 2018-05-30 20:40:44 UTC (rev 1487) +++ trunk/VERSION 2018-06-04 18:55:34 UTC (rev 1488) @@ -1 +1 @@ -0.7.3rc1 +0.7.3rc2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-05-30 20:40:46
|
Revision: 1487 http://sourceforge.net/p/canorus/code/1487 Author: matevz Date: 2018-05-30 20:40:44 +0000 (Wed, 30 May 2018) Log Message: ----------- Fixed detailed barline rendering position. Modified Paths: -------------- trunk/src/layout/drawablebarline.cpp Modified: trunk/src/layout/drawablebarline.cpp =================================================================== --- trunk/src/layout/drawablebarline.cpp 2018-05-30 19:49:55 UTC (rev 1486) +++ trunk/src/layout/drawablebarline.cpp 2018-05-30 20:40:44 UTC (rev 1487) @@ -29,7 +29,7 @@ setWidth( BARLINE_WIDTH ); break; case CABarline::Double: - setWidth( 2*BARLINE_WIDTH + SPACE_BETWEEN_BARLINES ); + setWidth( 3*BARLINE_WIDTH + SPACE_BETWEEN_BARLINES ); break; case CABarline::End: setWidth( BARLINE_WIDTH + SPACE_BETWEEN_BARLINES + BOLD_BARLINE_WIDTH ); @@ -68,29 +68,29 @@ // draw single barline pen.setWidth(qRound(BARLINE_WIDTH*s.z)); p->setPen(pen); - p->drawLine(s.x, s.y, - s.x, qRound(s.y + height()*s.z)); + p->drawLine(s.x+pen.width(), s.y, + s.x+pen.width(), qRound(s.y + height()*s.z)); break; case CABarline::Double: // draw double barline - pen.setWidth((int)(BARLINE_WIDTH*s.z)); + pen.setWidth(qRound(BARLINE_WIDTH*s.z)); p->setPen(pen); - p->drawLine(s.x, s.y, - s.x, qRound(s.y + height()*s.z)); - p->drawLine(qRound(s.x + BARLINE_WIDTH*s.z + SPACE_BETWEEN_BARLINES*s.z), s.y, - qRound(s.x + BARLINE_WIDTH*s.z + SPACE_BETWEEN_BARLINES*s.z), qRound(s.y + height()*s.z)); + p->drawLine(s.x+pen.width(), s.y, + s.x+pen.width(), qRound(s.y + height()*s.z)); + p->drawLine(qRound(s.x + BARLINE_WIDTH*s.z + SPACE_BETWEEN_BARLINES*s.z)+2*pen.width(), s.y, + qRound(s.x + BARLINE_WIDTH*s.z + SPACE_BETWEEN_BARLINES*s.z)+2*pen.width(), qRound(s.y + height()*s.z)); break; case CABarline::End: // draw thin barline pen.setWidth(qRound(BARLINE_WIDTH*s.z)); p->setPen(pen); - p->drawLine(s.x, s.y, - s.x, qRound(s.y + height()*s.z)); + p->drawLine(s.x+pen.width(), s.y, + s.x+pen.width(), qRound(s.y + height()*s.z)); // draw bold barline pen.setWidth(qRound(BOLD_BARLINE_WIDTH*s.z)); p->setPen(pen); - p->drawLine(qRound(s.x + BARLINE_WIDTH*s.z + SPACE_BETWEEN_BARLINES*s.z), s.y, - qRound(s.x + BARLINE_WIDTH*s.z + SPACE_BETWEEN_BARLINES*s.z), qRound(s.y + height()*s.z)); + p->drawLine(qRound(s.x + BARLINE_WIDTH*s.z + SPACE_BETWEEN_BARLINES*s.z + 0.5*BOLD_BARLINE_WIDTH*s.z), s.y, + qRound(s.x + BARLINE_WIDTH*s.z + SPACE_BETWEEN_BARLINES*s.z + 0.5*BOLD_BARLINE_WIDTH*s.z), qRound(s.y + height()*s.z)); break; case CABarline::RepeatOpen: pen.setWidth(qRound(BOLD_BARLINE_WIDTH*s.z)); @@ -179,8 +179,8 @@ pen.setCapStyle(Qt::RoundCap); pen.setWidth(qRound(DOTTED_BARLINE_WIDTH*s.z)); p->setPen(pen); - p->drawLine( s.x, s.y, - s.x, qRound(s.y + height()*s.z) ); + p->drawLine( s.x+pen.width(), s.y, + s.x+pen.width(), qRound(s.y + height()*s.z) ); break; case CABarline::Undefined: break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-05-30 19:49:57
|
Revision: 1486 http://sourceforge.net/p/canorus/code/1486 Author: matevz Date: 2018-05-30 19:49:55 +0000 (Wed, 30 May 2018) Log Message: ----------- Fixed bug #35 key signature-based transposition doesn't work down. Modified Paths: -------------- trunk/src/ui/transposeview.cpp Modified: trunk/src/ui/transposeview.cpp =================================================================== --- trunk/src/ui/transposeview.cpp 2018-04-25 23:33:21 UTC (rev 1485) +++ trunk/src/ui/transposeview.cpp 2018-05-30 19:49:55 UTC (rev 1486) @@ -150,7 +150,7 @@ if ( uiByKeySig->isChecked() ) { t.transposeByKeySig( CADrawableKeySignature::comboBoxRowToDiatonicKey(uiKeySigFrom->currentIndex()), CADrawableKeySignature::comboBoxRowToDiatonicKey(uiKeySigTo->currentIndex()), - uiIntervalDir->currentIndex()?(-1):1 ); + uiKeySigDir->currentIndex()?(-1):1 ); } else if ( uiByInterval->isChecked() ) { CAInterval i; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-04-25 23:33:23
|
Revision: 1485 http://sourceforge.net/p/canorus/code/1485 Author: matevz Date: 2018-04-25 23:33:21 +0000 (Wed, 25 Apr 2018) Log Message: ----------- Fixed bug #36 can't make a slur, if non-playable on first note. Fixed support for nested slurs/phrasing slurs. Modified Paths: -------------- trunk/src/ui/mainwin.cpp Modified: trunk/src/ui/mainwin.cpp =================================================================== --- trunk/src/ui/mainwin.cpp 2018-04-23 22:26:01 UTC (rev 1484) +++ trunk/src/ui/mainwin.cpp 2018-04-25 23:33:21 UTC (rev 1485) @@ -2744,8 +2744,23 @@ case CAMusElement::Slur: { // Insert tie, slur or phrasing slur if ( v->selection().size() ) { // start note has to always be selected - CANote *noteStart = (currentScoreView()->selection().front()->musElement()?dynamic_cast<CANote*>(currentScoreView()->selection().front()->musElement()):0); - CANote *noteEnd = (currentScoreView()->selection().back()->musElement()?dynamic_cast<CANote*>(currentScoreView()->selection().back()->musElement()):0); + CAMusElement *eltStart = currentScoreView()->selection().front()->musElement(); + CANote *noteStart = 0; + if (eltStart->musElementType()==CAMusElement::Note) { + noteStart = static_cast<CANote*>(eltStart); + } else + if (eltStart->musElementType()==CAMusElement::Mark) { + noteStart = dynamic_cast<CANote*>(static_cast<CAMark*>(eltStart)->associatedElement()); + } + + CAMusElement *eltEnd = currentScoreView()->selection().back()->musElement(); + CANote *noteEnd = 0; + if (eltEnd->musElementType()==CAMusElement::Note) { + noteEnd = static_cast<CANote*>(eltEnd); + } else + if (eltEnd->musElementType()==CAMusElement::Mark) { + noteEnd = dynamic_cast<CANote*>(static_cast<CAMark*>(eltEnd)->associatedElement()); + } // Insert Tie if ( noteStart && musElementFactory()->slurType()==CASlur::TieType ) { @@ -2772,8 +2787,8 @@ QList<CANote*> noteList = noteStart->voice()->getNoteList(); int end = noteList.indexOf(noteEnd); for (int i=noteList.indexOf(noteStart); i<=end; i++) - if (((musElementFactory()->slurType()==CASlur::SlurType && (noteList[i]->slurStart())) || noteList[i]->slurEnd()) || - (((musElementFactory()->slurType()==CASlur::PhrasingSlurType && (noteList[i]->phrasingSlurStart()))) || noteList[i]->phrasingSlurEnd()) ) + if ((musElementFactory()->slurType()==CASlur::SlurType && (noteList[i]->slurStart() || noteList[i]->slurEnd())) || + (musElementFactory()->slurType()==CASlur::PhrasingSlurType && (noteList[i]->phrasingSlurStart() || noteList[i]->phrasingSlurEnd())) ) return false; if (((musElementFactory()->slurType()==CASlur::SlurType && (noteStart->slurStart())) || noteEnd->slurEnd()) || This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-04-23 22:26:04
|
Revision: 1484 http://sourceforge.net/p/canorus/code/1484 Author: matevz Date: 2018-04-23 22:26:01 +0000 (Mon, 23 Apr 2018) Log Message: ----------- Fixed bug #28 unknown file format when opening recent files and saving. Modified Paths: -------------- trunk/src/ui/mainwin.cpp Modified: trunk/src/ui/mainwin.cpp =================================================================== --- trunk/src/ui/mainwin.cpp 2018-04-04 20:08:07 UTC (rev 1483) +++ trunk/src/ui/mainwin.cpp 2018-04-23 22:26:01 UTC (rev 1484) @@ -3150,9 +3150,9 @@ CACanorus::restartTimeEditedTimes( document() ); CAExport *save=0; - if ( uiSaveDialog->selectedNameFilter()==CAFileFormats::CANORUSML_FILTER ) { + if ( fileName.endsWith(".xml") ) { // check the filename extension directly without accessing the uiSaveDialog object due to a bug in Qt. -Matevz save = new CACanorusMLExport(); - } else if ( uiSaveDialog->selectedNameFilter()==CAFileFormats::CAN_FILTER ) { + } else if ( fileName.endsWith(".can") ) { save = new CACanExport(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-04-04 20:08:08
|
Revision: 1483 http://sourceforge.net/p/canorus/code/1483 Author: matevz Date: 2018-04-04 20:08:07 +0000 (Wed, 04 Apr 2018) Log Message: ----------- Updated README for the latest Ubuntu dependencies. Modified Paths: -------------- trunk/README Modified: trunk/README =================================================================== --- trunk/README 2018-04-04 20:02:47 UTC (rev 1482) +++ trunk/README 2018-04-04 20:08:07 UTC (rev 1483) @@ -84,10 +84,10 @@ ============ $ make install -Debian based distributions: +Compilation under Debian/Ubuntu: =========================== -One-liner to install build dependencies: - $ sudo apt-get install libqt5-webkit5-dev libqt5svg-dev qtbase5-dev qttools5-dev +One-liner to install build dependencies on Ubuntu 17.10 Artful Aardvark: + $ sudo apt install cmake g++ make libqt5webkit5-dev libqt5svg5-dev qtbase5-dev qttools5-dev qtwebengine5-dev Download the SVN/release version of canorus, go to Canorus root directory and run: $ debian/rules binary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ma...@us...> - 2018-04-04 20:02:51
|
Revision: 1482 http://sourceforge.net/p/canorus/code/1482 Author: matevz Date: 2018-04-04 20:02:47 +0000 (Wed, 04 Apr 2018) Log Message: ----------- Fixed if/for guard compilation errors under GCC 7.2. Modified Paths: -------------- trunk/src/export/lilypondexport.cpp trunk/src/layout/drawablekeysignature.cpp trunk/src/layout/kdtree.h trunk/src/score/tuplet.cpp trunk/src/ui/mainwin.cpp Modified: trunk/src/export/lilypondexport.cpp =================================================================== --- trunk/src/export/lilypondexport.cpp 2017-05-22 18:54:34 UTC (rev 1481) +++ trunk/src/export/lilypondexport.cpp 2018-04-04 20:02:47 UTC (rev 1482) @@ -240,7 +240,7 @@ (note->isPartOfChord() && note->isLastInChord()) ) _curStreamTime += note->timeLength(); - break; + break; } case CAMusElement::Rest: { // CARest Modified: trunk/src/layout/drawablekeysignature.cpp =================================================================== --- trunk/src/layout/drawablekeysignature.cpp 2017-05-22 18:54:34 UTC (rev 1481) +++ trunk/src/layout/drawablekeysignature.cpp 2018-04-04 20:02:47 UTC (rev 1482) @@ -113,7 +113,7 @@ if ( curIdx + (clef?clef->c1():-2) - 28 > drawableStaff->staff()->numberOfLines()*2-1 ) curIdx-=7; - CADrawableAccidental *acc = new CADrawableAccidental(1, keySig, drawableStaff, newX, drawableStaff->calculateCenterYCoord(curIdx, x)); + CADrawableAccidental *acc = new CADrawableAccidental(1, keySig, drawableStaff, newX, drawableStaff->calculateCenterYCoord(curIdx, x)); _drawableAccidentalList << acc; Modified: trunk/src/layout/kdtree.h =================================================================== --- trunk/src/layout/kdtree.h 2017-05-22 18:54:34 UTC (rev 1481) +++ trunk/src/layout/kdtree.h 2018-04-04 20:02:47 UTC (rev 1482) @@ -290,8 +290,8 @@ */ template <typename T> double CAKDTree<T>::getMaxX() { - if(_mapXW.constEnd() == _mapXW.constBegin()) - return 0.0; + if(_mapXW.constEnd() == _mapXW.constBegin()) + return 0.0; for (typename QMultiMap<double, T>::const_iterator it=(--_mapXW.constEnd()); it!=_mapXW.constBegin(); it--) { Modified: trunk/src/score/tuplet.cpp =================================================================== --- trunk/src/score/tuplet.cpp 2017-05-22 18:54:34 UTC (rev 1481) +++ trunk/src/score/tuplet.cpp 2018-04-04 20:02:47 UTC (rev 1482) @@ -280,8 +280,7 @@ int i; for (i=0; i<noteList().size() && noteList()[i]->timeStart() <= p->timeStart() && (noteList()[i]->musElementType()!=Note || noteList()[i]->timeStart() != p->timeStart() || static_cast<CANote*>(noteList()[i])->diatonicPitch().noteName() < static_cast<CANote*>(p)->diatonicPitch().noteName() ); i++); - - _noteList.insert(i, p); + _noteList.insert(i, p); } /*! Modified: trunk/src/ui/mainwin.cpp =================================================================== --- trunk/src/ui/mainwin.cpp 2017-05-22 18:54:34 UTC (rev 1481) +++ trunk/src/ui/mainwin.cpp 2018-04-04 20:02:47 UTC (rev 1482) @@ -5490,12 +5490,13 @@ foreach( CAContext* context, contexts ) { // create a new context if there isn't one of the right type. // exception: if the context is a staff, skip lyrics contexts instead of inserting a staff before a lyrics context. - if(context->contextType() == CAContext::Staff) + if(context->contextType() == CAContext::Staff) { while(currentContext && currentContext->contextType() == CAContext::LyricsContext) if(currentContext != currentSheet->contextList().last()) currentContext = currentSheet->contextList()[currentSheet->contextList().indexOf(currentContext)+1]; else currentContext = 0; + } if(!currentContext || context->contextType() != currentContext->contextType()) { @@ -5553,7 +5554,7 @@ // Can't have playables between two notes linked by a tie. Remove the tie in this case. // FIXME this should be the behavior for insert as well. CAMusElement* leftPl = right; - while((leftPl = staff->voiceList()[i]->previous(leftPl)) && !leftPl->isPlayable()); + while((leftPl = staff->voiceList()[i]->previous(leftPl)) && !leftPl->isPlayable()); CANote* leftNote = (leftPl&&leftPl->musElementType()==CAMusElement::Note)?static_cast<CANote*>(leftPl):0; CASlur* tie = leftNote?leftNote->tieStart():0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-22 18:54:36
|
Revision: 1481 http://sourceforge.net/p/canorus/code/1481 Author: suamor Date: 2017-05-22 18:54:34 +0000 (Mon, 22 May 2017) Log Message: ----------- Fixes for dbp, mainly new files Modified Paths: -------------- trunk/canorus-debreate.dbp Modified: trunk/canorus-debreate.dbp =================================================================== --- trunk/canorus-debreate.dbp 2017-05-22 12:19:59 UTC (rev 1480) +++ trunk/canorus-debreate.dbp 2017-05-22 18:54:34 UTC (rev 1481) @@ -9,7 +9,7 @@ Architecture: amd64 Priority: optional Suggests: timidity | fluidsynth -Depends: python (>=3.4), libc (>=6) +Depends: python3 (>=3.4) Recommends: lilypond (>=2.10) Description: Free cross-platform music score editor Canorus is a free next generation cross-platform music score editor @@ -87,6 +87,25 @@ /home/suamor/Qt/5.6/gcc_64/lib/libicui18n.so.56.1* -> libicui18n.so.56.1 -> /opt/qt/lib/x86_64-linux-gnu/ /home/suamor/Qt/5.6/gcc_64/lib/libicuuc.so.56* -> libicuuc.so.56 -> /opt/qt/lib/x86_64-linux-gnu/ /home/suamor/Qt/5.6/gcc_64/lib/libicuuc.so.56.1* -> libicuuc.so.56.1 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/projekte/canorus/release/canorus-0.7.3rc1/canorus-qt.sh* -> canorus-qt.sh -> /usr/bin +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Xml.so* -> libQt5Xml.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Xml.so.5* -> libQt5Xml.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Xml.so.5.6* -> libQt5Xml.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Xml.so.5.6.2* -> libQt5Xml.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5DBus.so* -> libQt5DBus.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5DBus.so.5* -> libQt5DBus.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5DBus.so.5.6* -> libQt5DBus.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5DBus.so.5.6.2* -> libQt5DBus.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/plugins/xcbglintegrations -> xcbglintegrations -> /opt/qt/plugins/ +/home/suamor/Qt/5.6/gcc_64/plugins/platformthemes -> platformthemes -> /opt/qt/plugins/ +/home/suamor/Qt/5.6/gcc_64/plugins/platforms -> platforms -> /opt/qt/plugins/ +/home/suamor/Qt/5.6/gcc_64/plugins/platforminputcontexts -> platforminputcontexts -> /opt/qt/plugins/ +/home/suamor/Qt/5.6/gcc_64/plugins/imageformats -> imageformats -> /opt/qt/plugins/ +/home/suamor/Qt/5.6/gcc_64/plugins/iconengines -> iconengines -> /opt/qt/plugins/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5XcbQpa.so* -> libQt5XcbQpa.so -> /opt/qt/lib/x86_64-linux-gnu +/home/suamor/Qt/5.6/gcc_64/lib/libQt5XcbQpa.so.5* -> libQt5XcbQpa.so.5 -> /opt/qt/lib/x86_64-linux-gnu +/home/suamor/Qt/5.6/gcc_64/lib/libQt5XcbQpa.so.5.6* -> libQt5XcbQpa.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu +/home/suamor/Qt/5.6/gcc_64/lib/libQt5XcbQpa.so.5.6.2* -> libQt5XcbQpa.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu <</FILES>> <<SCRIPTS>> <<PREINST>> @@ -104,7 +123,76 @@ <</SCRIPTS>> <<CHANGELOG>> <<DEST>>DEFAULT<</DEST>> +canorus (0.7.3~rc1-1ubuntu1) intrepid; urgency=low + * new upstream release + * xenial port + + -- Matevz Jekovec <mat...@gm...> Tue, 22 May 2017 14:55:22 +0100 + +canorus (0.7-1ubuntu1) intrepid; urgency=low + + * new upstream release + * intrepid port + + -- Matevz Jekovec <mat...@gm...> Tue, 07 Mar 2009 23:55:22 +0100 + +canorus (0.6-1ubuntu1) hardy; urgency=low + + * new upstream release + * hardy port + + -- Matevz Jekovec <mat...@gm...> Tue, 25 Nov 2008 01:30:24 +0100 + +canorus (0.5-1ubuntu1) gutsy; urgency=low + + * new upstream release + + -- Matevz Jekovec <mat...@gm...> Wed, 27 Jan 2008 22:30:52 +0100 + +canorus (0.4-1ubuntu1) gutsy; urgency=low + + * gutsy port + + -- Matevz Jekovec <mat...@gm...> Wed, 24 Oct 2007 18:08:12 +0100 + +canorus (0.4-1ubuntu1) feisty; urgency=low + + * new upstream release + + -- Matevz Jekovec <mat...@gm...> Tue, 28 Sep 2007 12:48:12 +0100 + +canorus (0.3.1-1ubuntu1) feisty; urgency=low + + * new upstream release + + -- Matevz Jekovec <mat...@gm...> Tue, 05 Jun 2007 18:48:15 +0100 + +canorus (0.3-1ubuntu1) feisty; urgency=low + + * new upstream release + + -- Matevz Jekovec <mat...@gm...> Sat, 12 May 2007 22:39:07 +0100 + +canorus (0.2.5svn-1ubuntu1) edgy; urgency=low + + * new upstream release + + -- Matevz Jekovec <mat...@gm...> Tue, 20 Mar 2007 04:34:07 +0100 + +canorus (0.1.0svn-1ubuntu1) edgy; urgency=low + + * new upstream release + * tested on fresh Ubuntu Edgy, works great + + -- Matevz Jekovec <mat...@gm...> Mon, 27 Nov 2006 15:37:27 +0100 + +canorus (0.0.99svn-0.1ubuntu1) edgy; urgency=low + + * initial .deb package + + -- Matevz Jekovec <mat...@gm...> Mon, 20 Nov 2006 01:18:27 +0100 + <</CHANGELOG>> <<COPYRIGHT>> This package was originally debianized by Matevž Jekovec <mat...@gm...> on @@ -129,7 +217,7 @@ 1 Name=Canorus Version=1.0 -Exec=/usr/bin/canorus +Exec=/usr/bin/canorus-qt.sh Comment=Canorus - Music Score Editor Icon=/usr/share/canorus/images/clogosm.png Type=Application This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-22 12:20:01
|
Revision: 1480 http://sourceforge.net/p/canorus/code/1480 Author: suamor Date: 2017-05-22 12:19:59 +0000 (Mon, 22 May 2017) Log Message: ----------- Add chapter for shipped binaries Modified Paths: -------------- trunk/README Modified: trunk/README =================================================================== --- trunk/README 2017-05-22 11:41:54 UTC (rev 1479) +++ trunk/README 2017-05-22 12:19:59 UTC (rev 1480) @@ -94,6 +94,22 @@ Install the created .deb package. +Debian based shipped binaries +============================= +We distribute binaries compiled with the official Qt 5.6 version. Built on xenial. + +The debian package has a wrapper script canorus-qt.sh for the debian package +that includes the libraries. + +This uses a different directory for the libraries intentionally to avoid +problem with an official installation of Qt 5.6 + +The second debian binaries expect Qt 5.6 to be installed with the official +installer in the /opt/Qt folder, precisely /opt/Qt/5.6/gcc_64/lib. + +They also may work with libraries of Qt 5.6 from your Distribution. +Avoid using these with later versions (f.e. 5.7/5.8/5.9) of Qt, instead rebuild. + Troubleshooting: ================ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-22 11:41:57
|
Revision: 1479 http://sourceforge.net/p/canorus/code/1479 Author: suamor Date: 2017-05-22 11:41:54 +0000 (Mon, 22 May 2017) Log Message: ----------- Debreate base file for easier creating of deb package Added Paths: ----------- trunk/canorus-debreate.dbp Added: trunk/canorus-debreate.dbp =================================================================== --- trunk/canorus-debreate.dbp (rev 0) +++ trunk/canorus-debreate.dbp 2017-05-22 11:41:54 UTC (rev 1479) @@ -0,0 +1,146 @@ +[DEBREATE-0.7.13] +<<CTRL>> +Package: canorus +Version: 0.7.3~rc1 +Maintainer: Matevz Jekovec <mat...@gm...> +Section: sound +Source: canorus +Homepage: http://canorus.org +Architecture: amd64 +Priority: optional +Suggests: timidity | fluidsynth +Depends: python (>=3.4), libc (>=6) +Recommends: lilypond (>=2.10) +Description: Free cross-platform music score editor + Canorus is a free next generation cross-platform music score editor + written in Qt5. It is a sequel of the well-known music score editor + for Linux, NoteEdit. + . + Canorus is extensible by using plugins written in Python or native C++, + offers a fast and straight-forward user interface written in Qt5, + a number of import and export filters for LilyPond, MusicXML, Midi, + NoteEdit and others. + +<</CTRL>> +<<FILES>> +1 +/home/suamor/projekte/canorus/release/build-0.7.3rc1-ubu64/install/share/canorus -> canorus -> /usr/share +/home/suamor/projekte/canorus/release/build-0.7.3rc1-ubu64/install/lib/_CanorusPython.so -> _CanorusPython.so -> /usr/lib +/home/suamor/projekte/canorus/release/build-0.7.3rc1-ubu64/install/lib/CanorusPython.py -> CanorusPython.py -> /usr/lib +/home/suamor/projekte/canorus/release/build-0.7.3rc1-ubu64/install/bin/canorus* -> canorus -> /usr/bin +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Svg.so* -> libQt5Svg.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Svg.so.5* -> libQt5Svg.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Svg.so.5.6* -> libQt5Svg.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Svg.so.5.6.2* -> libQt5Svg.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Test.so* -> libQt5Test.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Test.so.5* -> libQt5Test.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Test.so.5.6* -> libQt5Test.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Test.so.5.6.2* -> libQt5Test.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5PrintSupport.so* -> libQt5PrintSupport.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5PrintSupport.so.5* -> libQt5PrintSupport.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5PrintSupport.so.5.6* -> libQt5PrintSupport.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5PrintSupport.so.5.6.2* -> libQt5PrintSupport.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebEngineWidgets.so* -> libQt5WebEngineWidgets.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebEngineWidgets.so.5* -> libQt5WebEngineWidgets.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebEngineWidgets.so.5.6* -> libQt5WebEngineWidgets.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebEngineWidgets.so.5.6.2* -> libQt5WebEngineWidgets.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebEngineCore.so* -> libQt5WebEngineCore.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebEngineCore.so.5* -> libQt5WebEngineCore.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebEngineCore.so.5.6* -> libQt5WebEngineCore.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebEngineCore.so.5.6.2* -> libQt5WebEngineCore.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Widgets.so* -> libQt5Widgets.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Widgets.so.5* -> libQt5Widgets.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Widgets.so.5.6* -> libQt5Widgets.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Widgets.so.5.6.2* -> libQt5Widgets.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Gui.so* -> libQt5Gui.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Gui.so.5* -> libQt5Gui.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Gui.so.5.6* -> libQt5Gui.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Gui.so.5.6.2* -> libQt5Gui.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5MultimediaQuick_p.so* -> libQt5MultimediaQuick_p.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Qml.so* -> libQt5Qml.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Qml.so.5* -> libQt5Qml.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Qml.so.5.6* -> libQt5Qml.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Qml.so.5.6.2* -> libQt5Qml.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Core.so* -> libQt5Core.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Core.so.5* -> libQt5Core.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Core.so.5.6* -> libQt5Core.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Core.so.5.6.2* -> libQt5Core.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Quick.so* -> libQt5Quick.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Quick.so.5* -> libQt5Quick.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Quick.so.5.6* -> libQt5Quick.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Quick.so.5.6.2* -> libQt5Quick.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebChannel.so* -> libQt5WebChannel.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebChannel.so.5* -> libQt5WebChannel.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebChannel.so.5.6* -> libQt5WebChannel.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5WebChannel.so.5.6.2* -> libQt5WebChannel.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Network.so* -> libQt5Network.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Network.so.5* -> libQt5Network.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Network.so.5.6* -> libQt5Network.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Network.so.5.6.2* -> libQt5Network.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Positioning.so* -> libQt5Positioning.so -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Positioning.so.5* -> libQt5Positioning.so.5 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Positioning.so.5.6* -> libQt5Positioning.so.5.6 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libQt5Positioning.so.5.6.2* -> libQt5Positioning.so.5.6.2 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libicudata.so.56* -> libicudata.so.56 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libicudata.so.56.1* -> libicudata.so.56.1 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libicui18n.so.56* -> libicui18n.so.56 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libicui18n.so.56.1* -> libicui18n.so.56.1 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libicuuc.so.56* -> libicuuc.so.56 -> /opt/qt/lib/x86_64-linux-gnu/ +/home/suamor/Qt/5.6/gcc_64/lib/libicuuc.so.56.1* -> libicuuc.so.56.1 -> /opt/qt/lib/x86_64-linux-gnu/ +<</FILES>> +<<SCRIPTS>> +<<PREINST>> +0 +<</PREINST>> +<<POSTINST>> +0 +<</POSTINST>> +<<PRERM>> +0 +<</PRERM>> +<<POSTRM>> +0 +<</POSTRM>> +<</SCRIPTS>> +<<CHANGELOG>> +<<DEST>>DEFAULT<</DEST>> + +<</CHANGELOG>> +<<COPYRIGHT>> +This package was originally debianized by Matevž Jekovec <mat...@gm...> on +Sun, 19 Nov 2006 23:56:38 +0100. + +It was downloaded from http://canorus.sourceforge.net/ + +Upstream Authors: Matevž Jekovec <mat...@gm...>, + Reinhard Katzmann <su...@we...>, + All persons from AUTHORS + +Copyright 2006-2017 by authors mentioned above. + +Released under the GNU GPL v2 and GNU GPL v3. +Please see /usr/share/common-licenses/GPL-3 for the full license. + +QT5.6 binaries for Linux are part of the Qt binary delivery. +They are redistributable under the LGPL v2 and LGPL v3 license. +See http://doc.qt.io/qt-5.6/licensing.html for license details. +<</COPYRIGHT>> +<<MENU>> +1 +Name=Canorus +Version=1.0 +Exec=/usr/bin/canorus +Comment=Canorus - Music Score Editor +Icon=/usr/share/canorus/images/clogosm.png +Type=Application +Terminal=false +StartupNotify=true +Encoding=UTF-8 +Categories=Audio;Qt; +<</MENU>> +<<BUILD>> +1 +1 +1 +strip +<</BUILD>> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-22 11:40:24
|
Revision: 1478 http://sourceforge.net/p/canorus/code/1478 Author: suamor Date: 2017-05-22 11:40:21 +0000 (Mon, 22 May 2017) Log Message: ----------- Update of debian files Modified Paths: -------------- trunk/debian/changelog trunk/debian/control trunk/debian/copyright trunk/debian/dirs trunk/debian/docs Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2017-05-21 19:31:55 UTC (rev 1477) +++ trunk/debian/changelog 2017-05-22 11:40:21 UTC (rev 1478) @@ -1,3 +1,10 @@ +canorus (0.7.3~rc1-1ubuntu1) intrepid; urgency=low + + * new upstream release + * xenial port + + -- Matevz Jekovec <mat...@gm...> Tue, 22 May 2017 14:55:22 +0100 + canorus (0.7-1ubuntu1) intrepid; urgency=low * new upstream release Modified: trunk/debian/control =================================================================== --- trunk/debian/control 2017-05-21 19:31:55 UTC (rev 1477) +++ trunk/debian/control 2017-05-22 11:40:21 UTC (rev 1478) @@ -1,18 +1,14 @@ -Source: canorus -Section: sound -Priority: optional +Package: canorus +Version: 0.7.3~rc1 Maintainer: Matevz Jekovec <mat...@gm...> -Build-Depends: debhelper (>=4.0.0), g++, cmake (>=2.6), make, swig, python-dev (>=2.4), libqt4-dev (>=4.4.0), libasound2-dev -Standards-Version: 3.7.2 - -Package: canorus Section: sound +Source: canorus +Homepage: http://canorus.org +Architecture: amd64 Priority: optional -Architecture: amd64 i386 -Essential: no -Depends: libqt4-core (>=4.4.0), libqt4-gui (>=4.4.0), python (>=2.4) +Suggests: timidity | fluidsynth +Depends: python (>=2.4), libQt5Core (>=5.6), libQt5Gui (>=5.6), libQt5Widgets (>=5.6), libQt5WebEngineWidgets (>=5.6), libc (>=6) Recommends: lilypond (>=2.10) -Suggests: timidity | fluidsynth Description: Free cross-platform music score editor Canorus is a free next generation cross-platform music score editor written in Qt4. It is a sequel of the well-known music score editor @@ -21,7 +17,4 @@ Canorus is extensible by using plugins written in Python or native C++, offers a fast and straight-forward user interface written in Qt4, a number of import and export filters for LilyPond, MusicXML, Midi, - NoteEdit and others. - . - Homepage: http://canorus.org - + NoteEdit and others. \ No newline at end of file Modified: trunk/debian/copyright =================================================================== --- trunk/debian/copyright 2017-05-21 19:31:55 UTC (rev 1477) +++ trunk/debian/copyright 2017-05-22 11:40:21 UTC (rev 1478) @@ -1,12 +1,17 @@ -This package was debianized by Matevž Jekovec <mat...@gm...> on +This package was originally debianized by Matevž Jekovec <mat...@gm...> on Sun, 19 Nov 2006 23:56:38 +0100. -It was downloaded from http://canorus.berlios.de/ +It was downloaded from http://canorus.sourceforge.net/ Upstream Authors: Matevž Jekovec <mat...@gm...>, Reinhard Katzmann <su...@we...>, + All persons from AUTHORS -Copyright by authors mentioned above. +Copyright 2006-2017 by authors mentioned above. -Released under the GNU GPL. -Please see /usr/share/common-licenses/GPL for the full license. +Released under the GNU GPL v2 and GNU GPL v3. +Please see /usr/share/common-licenses/GPL-3 for the full license. + +QT5.6 binaries for Linux are part of the Qt binary delivery. +They are redistributable under the LGPL v2 and LGPL v3 license. +See http://doc.qt.io/qt-5.6/licensing.html for license details. Modified: trunk/debian/dirs =================================================================== --- trunk/debian/dirs 2017-05-21 19:31:55 UTC (rev 1477) +++ trunk/debian/dirs 2017-05-22 11:40:21 UTC (rev 1478) @@ -1,4 +1,8 @@ +opt/qt/lib +usr/bin +usr/lib usr/share/canorus usr/share/applications usr/share/app-install/desktop usr/share/fonts/truetype/canorus + Modified: trunk/debian/docs =================================================================== --- trunk/debian/docs 2017-05-21 19:31:55 UTC (rev 1477) +++ trunk/debian/docs 2017-05-22 11:40:21 UTC (rev 1478) @@ -1,3 +1,4 @@ README AUTHORS +NEWS VERSION This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-21 19:31:57
|
Revision: 1477 http://sourceforge.net/p/canorus/code/1477 Author: suamor Date: 2017-05-21 19:31:55 +0000 (Sun, 21 May 2017) Log Message: ----------- Updates to several tet files; Version Update; Fix for translation binary path; Add Dev Install prefix on Release build Modified Paths: -------------- trunk/AUTHORS trunk/CMakeLists.txt trunk/DEVELOPERS trunk/NEWS trunk/README trunk/VERSION trunk/src/CMakeLists.txt Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2017-05-20 21:53:46 UTC (rev 1476) +++ trunk/AUTHORS 2017-05-21 19:31:55 UTC (rev 1477) @@ -3,7 +3,7 @@ Matevž Jekovec <mat...@gm...> lead developer, Windows port, Debian/Ubuntu packages, cmake, Wiki site Reinhard Katzmann <su...@we...> - Qt4 GUI maestro, cmake, programming patterns + Qt4, Qt5 senior expert, cmake, developing with patterns, refactorings Itay Perl <ita...@gm...> bughunter, lots of GUI fixes and additions Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2017-05-20 21:53:46 UTC (rev 1476) +++ trunk/CMakeLists.txt 2017-05-21 19:31:55 UTC (rev 1477) @@ -3,6 +3,17 @@ # and to the root binary directory of the project as ${CANORUS_BINARY_DIR}. PROJECT(Canorus) +# Assume that Debug build is only done by developers -> install in build folder +# However be aware that this only works in a separate build folder! +IF("${CMAKE_BUILD_TYPE}" MATCHES "Debug") + SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install) + SET(CANORUS_DEV_INSTALL True) +ELSE("${CMAKE_BUILD_TYPE}" MATCHES "Debug") # Release + IF(${CANORUS_DEV_INSTALL} MATCHES True) + SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install) + ENDIF(${CANORUS_DEV_INSTALL} MATCHES True) +ENDIF("${CMAKE_BUILD_TYPE}" MATCHES "Debug") + # Don't build anything unless the version of CMake is high enough. cmake_minimum_required(VERSION 2.6) Modified: trunk/DEVELOPERS =================================================================== --- trunk/DEVELOPERS 2017-05-20 21:53:46 UTC (rev 1476) +++ trunk/DEVELOPERS 2017-05-21 19:31:55 UTC (rev 1477) @@ -1,4 +1,4 @@ - C++ developers for Qt4-based music score editor called Canorus + C++ developers for Qt5-based music score editor called Canorus ============================================================== This document is intended for developers interested in the project. Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2017-05-20 21:53:46 UTC (rev 1476) +++ trunk/NEWS 2017-05-21 19:31:55 UTC (rev 1477) @@ -1,3 +1,65 @@ +0.7.3 +===== +- Translation Updates +- GPLv3 compatibility +- Official compiler used for builds is gcc/mingw 5.3 / 5.4 +- Fixes in offset to measure numberings and pickup measures +- Command Settings updates +- Small updates to View setWorld functions regarding types +- Bindings for page movement (up, down, home, end) +- Fix for Appearence Dialog +- Qt4 no longer supported officially +- Adjustments for Qt4 after API fixes for Qt5 + (not removed except for helper dialog due to drop of webkit by Qt5.6) +- Other minor changes Midi/Shortcut +- Load Dialog Fix (shortcut settings) +- No longer differentiate before showing Load Dialog (settings) +- Save Dialog updated to behave same as Load Dialog (settings) +- Various fixes for shortcut settings +- Fix for cloning View +- Support Qt5 for Windows (build), adjusted build instructions +- Fix Windows Qt5 DLL installation +- Integrate Shortcut Settings finally into Settings View +- Support several types of shortcut settings +- Readme now contains several updates to reflect compatibility with + older dependent packages like swig and cmake +- added note checker +- note checker and midi command support for shortcut settings +- fixed some compilation issues on other platforms +- fix issue with new sheet; +- add dynamic keyboard helper for shortcut settings +- Add version information to installer +- Qt4 build settings separated +- Fixed mouse move lagging +- AutoConnect issue fixed for Print Preview +- Pass binary midi data directly to QTextStream, fixes midi export again. +- Add support for C++11 build (and later, depending on recent compiler used) +- Unified Edit mode with Select mode. Default mode now is Edit mode. +- Fixed missing uiSelectMode in CAActionStorage. +- Fixed showing selection area, if a user had a shaky hand +- New more simple help system (HTML) documentation system based on sphinx +- Migrated several guides to sphinx (sorry, the german guide needs still to be done) +- Fix when inserting note on empty bar line when already having edited + some notes on a different bar line +- Add check for alsa on Linux for rtmidi; +- Fixed old GUI bug: On Undo, On New document, Note checker not activated on Undo. +- On first Escape, the selection is cleared. On second Escape, we a context is deselected. +- Fixed console logging: No mode handled. +- Fixed edit text hiding when clicked on an existing music element. +- Fixed Text/Lyrics/Bookmarks saving when clicked outside of the text edit. Only Esc key explicitly cancels the editing. +- Fixed editing bookmarks. +- Fixed Text/Lyrics/Bookmarks lost when switching from Insert mode to Edit mode without confirming text edit content. +- Added panning the view forward when writing lyrics at the end of the screen. +- Added behaviour to text edit: Blank content deletes the text element. +- Lyrics, text and bookmarks: Text edit shows on mouse release to allows multiple selection. +- Fixed insert playable icon to be more meaningful. +- Fixed toolbars: When inserting clefs, time sigs, key sigs etc. the voice toolbar should not be visible. +- Fixed fake text edit, if adding a text illegaly to non-playable element. +- Fixed text edit popping back up, when switching from insert to edit mode. +- Show text edit when exactly one element is selected, otherwise, confirm any opened text edits and hide it. +- fix for pluginmanager when no plugins are available +- Streamline Translation with 5.6 (use official macros) + 0.7.2 ===== - Set SelectMode instead of NoDocumentMode when a new document.was created Modified: trunk/README =================================================================== --- trunk/README 2017-05-20 21:53:46 UTC (rev 1476) +++ trunk/README 2017-05-21 19:31:55 UTC (rev 1477) @@ -39,7 +39,7 @@ - $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake -DCANORUS_DEV_INSTALL=False Set it to true to do a test installation for a Release version, f.e. -- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake -DCMAKE_BUILD_TYPE=Release -DCANORUS_DEV_INSTALL=False +- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake -DCMAKE_BUILD_TYPE=Release -DCANORUS_DEV_INSTALL=True Testing Canorus =============== Modified: trunk/VERSION =================================================================== --- trunk/VERSION 2017-05-20 21:53:46 UTC (rev 1476) +++ trunk/VERSION 2017-05-21 19:31:55 UTC (rev 1477) @@ -1 +1 @@ -0.7.2rc1 +0.7.3rc1 Modified: trunk/src/CMakeLists.txt =================================================================== --- trunk/src/CMakeLists.txt 2017-05-20 21:53:46 UTC (rev 1476) +++ trunk/src/CMakeLists.txt 2017-05-21 19:31:55 UTC (rev 1477) @@ -483,7 +483,8 @@ # Set translation files FILE(GLOB Canorus_Translation_Srcs "lang/*.ts") # lang/*.ts -> Canorus_Translation_Srcs -STRING(REGEX REPLACE "\\.ts" ".qm" Canorus_Translation_Bins "${Canorus_Translation_Srcs}") # Set Canorus_Translation_Bins to same values as Canorus_Translation_Srcs with different extensions +#STRING(REGEX REPLACE "\\.ts" ".qm" Canorus_Translation_Bins "${Canorus_Translation_Srcs}") # Set Canorus_Translation_Bins to same values as Canorus_Translation_Srcs with different extensions +FILE(GLOB Canorus_Translation_Bins ${CMAKE_BINARY_DIR}"/*.qm") # lang/*.ts -> Canorus_Translation_Srcs SET(Canorus_Fonts # Music fonts needed by Canorus fonts/CenturySchL-BoldItal.ttf # Century family needed for numbers and signs @@ -717,7 +718,7 @@ ############### # Dev Install # ############### -message("CANORUS_DEV_INSTALL " ${CANORUS_DEV_INSTALL}) +message("CANORUS_DEV_INSTALL " ${CANORUS_DEV_INSTALL} " CANORUS_INSTALL_PREFIX " ${CANORUS_INSTALL_PREFIX}) IF(${CANORUS_DEV_INSTALL} MATCHES True) ADD_CUSTOM_COMMAND( TARGET canorus @@ -734,8 +735,8 @@ RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_BIN_DIR} ) IF(USE_RUBY) - INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR}) - INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}) + INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR}) + INSTALL(TARGETS ${SWIG_MODULE_CanorusRuby_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_DATA_DIR}) ENDIF(USE_RUBY) IF(USE_PYTHON) INSTALL(TARGETS ${SWIG_MODULE_CanorusPython_REAL_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CANORUS_INSTALL_LIB_DIR}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-20 21:53:49
|
Revision: 1476 http://sourceforge.net/p/canorus/code/1476 Author: suamor Date: 2017-05-20 21:53:46 +0000 (Sat, 20 May 2017) Log Message: ----------- Fix cmake prefix path in examples Modified Paths: -------------- trunk/README Modified: trunk/README =================================================================== --- trunk/README 2017-05-20 16:04:42 UTC (rev 1475) +++ trunk/README 2017-05-20 21:53:46 UTC (rev 1476) @@ -30,16 +30,16 @@ (make sure to remove Swig 2.0 before using Swig 3.0) - Run cmake with prefix to the Qt installation path (f.e. "/opt/Qt") - Create a build folder, outside the source folder and "cd" into it - $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64 ../canorus/trunk + $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake ../canorus/trunk - Ignore the warning about the missing ruby package - make -j4 (for dual-core use -j2 switch), on Intel i7 use -j8 / -j4 Note that if you use the old way of building canorus you have to disable the local installation of Canorus when calling cmake: -- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64 -DCANORUS_DEV_INSTALL=False +- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake -DCANORUS_DEV_INSTALL=False Set it to true to do a test installation for a Release version, f.e. -- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64 -DCMAKE_BUILD_TYPE=Release -DCANORUS_DEV_INSTALL=False +- $ cmake -DCMAKE_PREFIX_PATH=/opt/Qt/5.6/gcc_64/lib/cmake -DCMAKE_BUILD_TYPE=Release -DCANORUS_DEV_INSTALL=False Testing Canorus =============== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-20 16:04:45
|
Revision: 1475 http://sourceforge.net/p/canorus/code/1475 Author: suamor Date: 2017-05-20 16:04:42 +0000 (Sat, 20 May 2017) Log Message: ----------- Add build src path to includes Modified Paths: -------------- trunk/src/CMakeLists.txt Modified: trunk/src/CMakeLists.txt =================================================================== --- trunk/src/CMakeLists.txt 2017-05-20 09:56:18 UTC (rev 1474) +++ trunk/src/CMakeLists.txt 2017-05-20 16:04:42 UTC (rev 1475) @@ -568,6 +568,7 @@ INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/ui") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/widgets") INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/import") +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # These lines add the include paths of the Qt # directory to the compiler include paths @@ -705,6 +706,10 @@ # Translation # ############### qt5_create_translation(CANORUS_QM_FILES ${Canorus_UIC_Srcs} ${Canorus_Srcs} ${Canorus_Translation_Srcs} lang/template.ts) +# Workaround for issue of duplicate ts files getting generated +# Please write on the Canorus Dev List for a better +SET(TSFOLDER ${CMAKE_SOURCE_DIR}/src/lang) +FILE(REMOVE ${TSFOLDER}/*_*.ts) qt5_add_translation(CANORUS_QM_FILES ${Canorus_Translation_Srcs} ) ADD_CUSTOM_TARGET(canorus_qm DEPENDS ${CANORUS_QM_FILES}) ADD_DEPENDENCIES(canorus canorus_qm) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-20 09:56:19
|
Revision: 1474 http://sourceforge.net/p/canorus/code/1474 Author: suamor Date: 2017-05-20 09:56:18 +0000 (Sat, 20 May 2017) Log Message: ----------- 0.7.3rc1 Added Paths: ----------- tags/0.7.3rc1/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2017-05-19 19:40:57
|
Revision: 1473 http://sourceforge.net/p/canorus/code/1473 Author: suamor Date: 2017-05-19 19:40:54 +0000 (Fri, 19 May 2017) Log Message: ----------- Fix missing creation of other ts files issue; unfortunately this way additionally ts files are created (not to be used, duplicates) Modified Paths: -------------- trunk/src/CMakeLists.txt Modified: trunk/src/CMakeLists.txt =================================================================== --- trunk/src/CMakeLists.txt 2017-05-19 19:09:47 UTC (rev 1472) +++ trunk/src/CMakeLists.txt 2017-05-19 19:40:54 UTC (rev 1473) @@ -704,7 +704,7 @@ ############### # Translation # ############### -qt5_create_translation(CANORUS_QM_FILES ${Canorus_UIC_Srcs} ${Canorus_Srcs} lang/template.ts OPTIONS -noobsolete) +qt5_create_translation(CANORUS_QM_FILES ${Canorus_UIC_Srcs} ${Canorus_Srcs} ${Canorus_Translation_Srcs} lang/template.ts) qt5_add_translation(CANORUS_QM_FILES ${Canorus_Translation_Srcs} ) ADD_CUSTOM_TARGET(canorus_qm DEPENDS ${CANORUS_QM_FILES}) ADD_DEPENDENCIES(canorus canorus_qm) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |