Merge branch 'master' of https://github.com/tildearrow/furnace into ymf278b

README.md

@@ -351,6 +351,8 @@ it's all speed 1 though, so don't expect any songs to be nicely laid out with in
 
 nope. it's not implemented.
 
+also, Furnace isn't a MIDI tracker.
+
 > it doesn't open under macOS!
 
 this is due to Apple's application signing policy. a workaround is to right click on the Furnace app icon and select Open.
@@ -380,6 +382,12 @@ Furnace keeps backups of the songs you've worked on before. go to **file > resto
 
 **not yet!** coming in 0.7 though, eventually...
 
+> Roland MT-32 support?
+
+MT-32 is used with MIDI in 99.999% of situations. it lacks a direct register interface.
+
+also, Furnace is not a MIDI tracker....
+
 > my .dmf song sounds odd at a certain point
 
 Furnace's .dmf compatibility isn't perfect and it's mostly because DefleMask does things different.

doc/1-intro/glossary.md

@@ -51,6 +51,8 @@
 **FM**: frequency modulation. this is a method of generating sound that uses one operator's amplitude to modify another operator's frequency.
 - the FM in Yamaha chips is more accurately called _phase modulation,_ which uses a different method of computation to achieve similar results.
 
+**.ftm**: FamiTracker Module.
+
 **.fui**: a Furnace instrument file.
 
 **.fur**: a Furnace module file.
@@ -64,6 +66,8 @@
 **interpolate**: to fill in the area between two values with a smooth ramp of values in between.
 - some sample-based chips can interpolate, filtering out unwanted harmonics.
 
+**.it**: Impulse Tracker module.
+
 **ladder effect**: an inaccurate yet common term for the DAC distortion that affects some Yamaha FM chips.
 
 **LFO**: low frequency oscillator. a wave with a slow period (often below hearing range) used to alter other sounds.
@@ -105,6 +109,8 @@
 
 **register**: a memory location within a sound chip. "register view" shows all the relevant memory of all chips in use.
 
+**.s3m**: ScreamTracker 3 Module.
+
 **sample** (1): a digitally recorded sound. usually stored as some variant of PCM.
 - these can take up a lot of room depending on length and sample rate, thus older systems tend to use short, lower quality samples.
 
@@ -140,4 +146,6 @@
 
 **wavetable** (2): an ordered group of wavetables(1) used in sequence within a single instrument.
 
+**.xm**: eXtended Module. the file format of songs made with FastTracker 2.
+
 **.zsm**: ZSound Music. a VGM-like file meant specifically for the Commander X16 computer.

doc/2-interface/export.md

@@ -82,3 +82,24 @@ it's not really useful, unless you're a developer and want to use a command stre
 
 - **export**: exports in Furnace's own command stream format (FCS). see `export-tech.md` in `papers/` for details.
 
+## export DMF
+
+this option allows you to save your song as a .dmf which can be opened in DefleMask.
+
+the following systems are supported when saving as 1.0/legacy:
+- Sega Genesis/Mega Drive (YM2612 + SN76489)
+- Sega Genesis/Mega Drive (YM2612 + SN76489, extended channel 3)
+- Sega Master System
+- Game Boy
+- PC Engine
+- NES
+- Commodore 64
+- Arcade (YM2151 + SegaPCM 5-channel compatibility)
+- Neo Geo CD (DefleMask 1.0+)
+
+the following systems are supported when saving as 1.1.3+:
+- Sega Master System (with FM expansion)
+- NES + Konami VRC7
+- Famicom Disk System
+
+only use this option if you really need it. there are many features which DefleMask does not support, such as a variety of effects, FM macros and pitched samples, so these will be lost.

doc/2-interface/formats.md

@@ -0,0 +1,53 @@
+# file formats
+
+this is a list of file formats that Furnace supports.
+
+## song/module
+
+- Furnace song (.fur)
+- import:
+  - DefleMask module (.dmf)
+  - FamiTracker module (.ftm)
+  - Amiga tracker module (.mod)
+  - Scream Tracker 3 module (.s3m)
+  - FastTracker 2 module (.xm)
+  - Impulse Tracker module (.it)
+  - Future Composer module (.fc13/.fc14/.fc/.smod)
+- export:
+  - DefleMask module (.dmf)
+  - VGM (.vgm)
+  - ZSound Music (.zsm)
+
+## instrument
+
+- load/save:
+  - Furnace instrument (.fui)
+  - DefleMask preset/patch (.dmp)
+- load only:
+  - TFM Music Maker instrument (.tfi)
+  - VGM Music Maker instrument (.vgi)
+  - Scream Tracker 3 instrument (.s3i)
+  - SoundBlaster instrument (.sbi)
+  - Wohlstand OPL instrument (.opli)
+  - Wohlstand OPN instrument (.opni)
+  - Gens KMod patch dump (.y12)
+  - BNK file (AdLib) (.bnk)
+  - FF preset bank (.ff)
+  - 2612edit GYB preset bank (.gyb)
+  - VOPM preset bank (.opm)
+  - Wohlstand WOPL bank (.wopl)
+  - Wohlstand WOPN bank (.wopn)
+
+## wavetable
+
+- load/save:
+  - Furnace wavetable (.fuw)
+  - DefleMask wavetable (.dmw)
+  - raw wavetable data
+
+## sample
+
+- load/save
+  - Wave file (.wav)
+  - raw sample data
+- load only:

doc/2-interface/menu-bar.md

@@ -8,30 +8,13 @@ items in _italic_ don't appear in basic mode and are only available in advanced
 
 - **new...**: creates a new song.
 - **open...**: opens the file picker, allowing you to select a song to open.
+  - see [file formats](formats.md) for a list of formats Furnace is able to open.
 - **open recent**: contains a list of the songs you've opened before.
   - **clear history**: erases the file history.
 
 - **save**: saves the current song.
   - opens the file picker if this is a new song, or a backup.
 - **save as...**: opens the file picker, allowing you to save the song under a different name.
-- **save as .dmf (1.1.3+)...**: opens the file picker, allowing you to save your song as a .dmf which is compatible with DefleMask 1.1.3 onwards.
-  - this will only work with the systems mentioned in the next option, plus:
-    - Sega Master System (with FM expansion)
-    - NES + Konami VRC7
-    - Famicom Disk System
-  - only use this option if you really need it. there are features which DefleMask does not support, like some effects and FM macros, so these will be lost.
-- **save as .dmf (1.0/legacy)...**: opens the file picker, allowing you to save your song as a .dmf which is compatible with DefleMask Legacy (0.12) or 1.0.
-  - this will only work on the following systems:
-    - Sega Genesis/Mega Drive (YM2612 + SN76489)
-    - Sega Genesis/Mega Drive (YM2612 + SN76489, extended channel 3)
-    - Sega Master System
-    - Game Boy
-    - PC Engine
-    - NES
-    - Commodore 64
-    - Arcade (YM2151 + SegaPCM 5-channel compatibility)
-    - Neo Geo CD (DefleMask 1.0+)
-  - only use this option if you really need it. there are features which DefleMask does not support, like some effects and FM macros, so these will be lost.
 
 - **export**: allows you to export your song into other formats, such as audio files, VGM and more. see the [export](export.md) page for more information.
 

scripts/update-po.sh

@@ -19,7 +19,7 @@ cd po
 for i in ${EXPORT_LANGS[@]}; do
   if [ -e "$i".po ]; then
     echo "merging $i"".po..."
-    msgmerge --backup=none -U "$i".po furnace.pot || exit 1
+    msgmerge --backup=none -N -U "$i".po furnace.pot || exit 1
   else
     echo "creating $i"".po..."
     msginit -i furnace.pot -l "$i".UTF-8 --no-translator || exit 1