Move UTF8_xxx string literal macros to new header in lib/util

scripts/src/lib.lua

@@ -124,6 +124,7 @@ end
 		MAME_DIR .. "src/lib/util/unzip.cpp",
 		MAME_DIR .. "src/lib/util/unzip.h",
 		MAME_DIR .. "src/lib/util/un7z.cpp",
+		MAME_DIR .. "src/lib/util/utf8.h",
 		MAME_DIR .. "src/lib/util/utilfwd.h",
 		MAME_DIR .. "src/lib/util/vbiparse.cpp",
 		MAME_DIR .. "src/lib/util/vbiparse.h",

src/devices/bus/abckb/abc800kb.cpp

@@ -71,6 +71,8 @@ XR22-050-3B Pinout
 #include "emu.h"
 #include "abc800kb.h"
 
+#include "utf8.h"
+
 
 
 //**************************************************************************

src/devices/bus/abckb/abc99.cpp

@@ -54,8 +54,11 @@ Notes:
 
 #include "emu.h"
 #include "abc99.h"
+
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 
 //**************************************************************************

src/devices/bus/adamnet/kb.cpp

@@ -9,6 +9,8 @@
 #include "emu.h"
 #include "kb.h"
 
+#include "utf8.h"
+
 
 
 //**************************************************************************

src/devices/bus/pc_kbd/ec1841.cpp

@@ -34,6 +34,8 @@
 #include "emu.h"
 #include "ec1841.h"
 
+#include "utf8.h"
+
 
 //#define LOG_GENERAL (1U <<  0) //defined in logmacro.h already
 #define LOG_KEYBOARD  (1U <<  1)

src/devices/bus/pc_kbd/pcat84.cpp

@@ -27,6 +27,8 @@
 #include "emu.h"
 #include "pcat84.h"
 
+#include "utf8.h"
+
 
 
 //**************************************************************************

src/devices/bus/pc_kbd/pcxt83.cpp

@@ -19,6 +19,8 @@
 #include "emu.h"
 #include "pcxt83.h"
 
+#include "utf8.h"
+
 
 
 //**************************************************************************

src/devices/bus/sg1000_exp/sk1100.cpp

@@ -19,6 +19,7 @@ TODO:
 #include "emu.h"
 #include "sk1100.h"
 #include "softlist_dev.h"
+#include "utf8.h"
 
 
 

src/devices/bus/uts_kbd/400kbd.cpp

@@ -27,6 +27,8 @@
 
 #include "cpu/mcs48/mcs48.h"
 
+#include "utf8.h"
+
 
 DEFINE_DEVICE_TYPE(UTS_400_KEYBOARD, uts_400_keyboard_device, "uts_400kbd", "UTS 400-Format Keyboard (F3621-04-000)")
 

src/emu/emucore.h

@@ -199,47 +199,6 @@ constexpr int ROT270               = ORIENTATION_SWAP_XY | ORIENTATION_FLIP_Y;
 /// \}
 
 
-// these are UTF-8 encoded strings for common characters
-#define UTF8_NBSP               "\xc2\xa0"          /* non-breaking space */
-
-#define UTF8_MULTIPLY           "\xc3\x97"          /* multiplication sign */
-#define UTF8_DIVIDE             "\xc3\xb7"          /* division sign */
-#define UTF8_SQUAREROOT         "\xe2\x88\x9a"      /* square root symbol */
-#define UTF8_PLUSMINUS          "\xc2\xb1"          /* plusminus symbol */
-
-#define UTF8_POW_2              "\xc2\xb2"          /* superscript 2 */
-#define UTF8_POW_X              "\xcb\xa3"          /* superscript x */
-#define UTF8_POW_Y              "\xca\xb8"          /* superscript y */
-#define UTF8_PRIME              "\xca\xb9"          /* prime symbol */
-#define UTF8_DEGREES            "\xc2\xb0"          /* degrees symbol */
-
-#define UTF8_SMALL_PI           "\xcf\x80"          /* Greek small letter pi */
-#define UTF8_CAPITAL_SIGMA      "\xce\xa3"          /* Greek capital letter sigma */
-#define UTF8_CAPITAL_DELTA      "\xce\x94"          /* Greek capital letter delta */
-
-#define UTF8_MACRON             "\xc2\xaf"          /* macron symbol */
-#define UTF8_NONSPACE_MACRON    "\xcc\x84"          /* nonspace macron, use after another char */
-
-#define a_RING                  "\xc3\xa5"          /* small a with a ring */
-#define a_UMLAUT                "\xc3\xa4"          /* small a with an umlaut */
-#define o_UMLAUT                "\xc3\xb6"          /* small o with an umlaut */
-#define u_UMLAUT                "\xc3\xbc"          /* small u with an umlaut */
-#define e_ACUTE                 "\xc3\xa9"          /* small e with an acute */
-#define n_TILDE                 "\xc3\xb1"          /* small n with a tilde */
-
-#define A_RING                  "\xc3\x85"          /* capital A with a ring */
-#define A_UMLAUT                "\xc3\x84"          /* capital A with an umlaut */
-#define O_UMLAUT                "\xc3\x96"          /* capital O with an umlaut */
-#define U_UMLAUT                "\xc3\x9c"          /* capital U with an umlaut */
-#define E_ACUTE                 "\xc3\x89"          /* capital E with an acute */
-#define N_TILDE                 "\xc3\x91"          /* capital N with a tilde */
-
-#define UTF8_LEFT               "\xe2\x86\x90"      /* cursor left */
-#define UTF8_RIGHT              "\xe2\x86\x92"      /* cursor right */
-#define UTF8_UP                 "\xe2\x86\x91"      /* cursor up */
-#define UTF8_DOWN               "\xe2\x86\x93"      /* cursor down */
-
-
 
 //**************************************************************************
 //  COMMON MACROS

src/frontend/mame/ui/devopt.cpp

@@ -15,6 +15,8 @@
 #include "romload.h"
 #include "screen.h"
 
+#include "utf8.h"
+
 
 namespace ui {
 

src/frontend/mame/ui/info.cpp

@@ -21,6 +21,8 @@
 #include "softlist.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 #include <set>
 #include <sstream>
 #include <type_traits>

src/frontend/mame/ui/ui.cpp

@@ -46,6 +46,8 @@
 #include "../osd/modules/lib/osdlib.h"
 #include "../osd/modules/lib/osdobj_common.h"
 
+#include "utf8.h"
+
 #include <chrono>
 #include <functional>
 #include <type_traits>

src/frontend/mame/ui/videoopt.cpp

@@ -14,6 +14,8 @@
 #include "rendlay.h"
 #include "rendutil.h"
 
+#include "utf8.h"
+
 
 namespace ui {
 

src/lib/util/utf8.h

@@ -0,0 +1,54 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles, Curt Coder, hap
+/***************************************************************************
+
+    utf8.h
+
+    UTF-8 string literals.
+
+***************************************************************************/
+
+#ifndef MAME_LIB_UTIL_UTF8_H
+#define MAME_LIB_UTIL_UTF8_H
+
+// these are UTF-8 encoded strings for common characters
+#define UTF8_NBSP               "\xc2\xa0"          /* non-breaking space */
+
+#define UTF8_MULTIPLY           "\xc3\x97"          /* multiplication sign */
+#define UTF8_DIVIDE             "\xc3\xb7"          /* division sign */
+#define UTF8_SQUAREROOT         "\xe2\x88\x9a"      /* square root symbol */
+#define UTF8_PLUSMINUS          "\xc2\xb1"          /* plusminus symbol */
+
+#define UTF8_POW_2              "\xc2\xb2"          /* superscript 2 */
+#define UTF8_POW_X              "\xcb\xa3"          /* superscript x */
+#define UTF8_POW_Y              "\xca\xb8"          /* superscript y */
+#define UTF8_PRIME              "\xca\xb9"          /* prime symbol */
+#define UTF8_DEGREES            "\xc2\xb0"          /* degrees symbol */
+
+#define UTF8_SMALL_PI           "\xcf\x80"          /* Greek small letter pi */
+#define UTF8_CAPITAL_SIGMA      "\xce\xa3"          /* Greek capital letter sigma */
+#define UTF8_CAPITAL_DELTA      "\xce\x94"          /* Greek capital letter delta */
+
+#define UTF8_MACRON             "\xc2\xaf"          /* macron symbol */
+#define UTF8_NONSPACE_MACRON    "\xcc\x84"          /* nonspace macron, use after another char */
+
+#define a_RING                  "\xc3\xa5"          /* small a with a ring */
+#define a_UMLAUT                "\xc3\xa4"          /* small a with an umlaut */
+#define o_UMLAUT                "\xc3\xb6"          /* small o with an umlaut */
+#define u_UMLAUT                "\xc3\xbc"          /* small u with an umlaut */
+#define e_ACUTE                 "\xc3\xa9"          /* small e with an acute */
+#define n_TILDE                 "\xc3\xb1"          /* small n with a tilde */
+
+#define A_RING                  "\xc3\x85"          /* capital A with a ring */
+#define A_UMLAUT                "\xc3\x84"          /* capital A with an umlaut */
+#define O_UMLAUT                "\xc3\x96"          /* capital O with an umlaut */
+#define U_UMLAUT                "\xc3\x9c"          /* capital U with an umlaut */
+#define E_ACUTE                 "\xc3\x89"          /* capital E with an acute */
+#define N_TILDE                 "\xc3\x91"          /* capital N with a tilde */
+
+#define UTF8_LEFT               "\xe2\x86\x90"      /* cursor left */
+#define UTF8_RIGHT              "\xe2\x86\x92"      /* cursor right */
+#define UTF8_UP                 "\xe2\x86\x91"      /* cursor up */
+#define UTF8_DOWN               "\xe2\x86\x93"      /* cursor down */
+
+#endif // MAME_LIB_UTIL_UTF8_H

src/mame/acorn/accomm.cpp

@@ -44,6 +44,7 @@
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
+#include "utf8.h"
 
 #include "accomm.lh"
 

src/mame/acorn/acrnsys.cpp

@@ -65,6 +65,7 @@
 #include "bus/centronics/ctronics.h"
 #include "bus/acorn/bus.h"
 #include "softlist_dev.h"
+#include "utf8.h"
 
 namespace {
 

src/mame/acorn/acrnsys1.cpp

@@ -53,6 +53,7 @@ Note that left-most digit is not wired up, and therefore will always be blank.
 #include "machine/timer.h"
 #include "imagedev/cassette.h"
 #include "speaker.h"
+#include "utf8.h"
 
 #include "acrnsys1.lh"
 

src/mame/acorn/atom.cpp

@@ -122,6 +122,7 @@ Hardware:   PPIA 8255
 #include "screen.h"
 #include "softlist_dev.h"
 #include "speaker.h"
+#include "utf8.h"
 
 /***************************************************************************
     PARAMETERS

src/mame/acorn/bbc.cpp

@@ -55,6 +55,8 @@
 #include "formats/uef_cas.h"
 #include "formats/csw_cas.h"
 
+#include "utf8.h"
+
 #include "bbc.lh"
 #include "bbcm.lh"
 

src/mame/act/victor9k_kb.cpp

@@ -337,6 +337,8 @@ Y11       104 103 102 101 100 99  98  97      kN/A k.   k00  k0   RGHT LEFT PAUS
 #include "emu.h"
 #include "victor9k_kb.h"
 
+#include "utf8.h"
+
 
 
 //**************************************************************************

src/mame/agat/agatkeyb.cpp

@@ -10,6 +10,7 @@
 
 #include "agatkeyb.h"
 #include "machine/keyboard.ipp"
+#include "utf8.h"
 
 
 /***************************************************************************

src/mame/amstrad/amstrad.cpp

@@ -111,6 +111,7 @@ Some bugs left :
 #include "machine/ram.h"
 #include "softlist.h"
 #include "speaker.h"
+#include "utf8.h"
 
 #define MANUFACTURER_NAME 0x07
 #define TV_REFRESH_RATE 0x10

src/mame/amstrad/pc1512kb.cpp

@@ -9,6 +9,7 @@
 #include "emu.h"
 #include "pc1512kb.h"
 
+#include "utf8.h"
 
 
 //**************************************************************************

src/mame/apple/apple2.cpp

@@ -61,6 +61,8 @@ II Plus: RAM options reduced to 16/32/48 KB.
 
 #include "formats/ap2_dsk.h"
 
+#include "utf8.h"
+
 
 namespace {
 

src/mame/apple/apple2e.cpp

@@ -152,6 +152,8 @@ MIG RAM page 2 $CE02 is the speaker/slot bitfield and $CE03 is the paddle/accele
 #include "formats/ap2_dsk.h"
 #include "formats/ap_dsk35.h"
 
+#include "utf8.h"
+
 
 namespace {
 

src/mame/apple/apple2gs.cpp

@@ -85,6 +85,8 @@
 #include "formats/ap_dsk35.h"
 #include "formats/ap2_dsk.h"
 
+#include "utf8.h"
+
 
 namespace {
 

src/mame/apple/apple3.cpp

@@ -29,6 +29,8 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 void apple3_state::apple3_map(address_map &map)
 {
 	map(0x0000, 0xffff).rw(FUNC(apple3_state::apple3_memory_r), FUNC(apple3_state::apple3_memory_w));

src/mame/apple/tk2000.cpp

@@ -37,6 +37,8 @@
 
 #include "formats/ap2_dsk.h"
 
+#include "utf8.h"
+
 
 namespace {
 

src/mame/atari/atarist.cpp

@@ -53,6 +53,8 @@
 #include "formats/dfi_dsk.h"
 #include "formats/ipf_dsk.h"
 
+#include "utf8.h"
+
 
 //**************************************************************************
 //  CONSTANTS / MACROS

src/mame/atari/pofo_kbd.cpp

@@ -7,6 +7,8 @@
 
 #include "machine/keyboard.ipp"
 
+#include "utf8.h"
+
 DEFINE_DEVICE_TYPE(POFO_KEYBOARD, pofo_keyboard_device, "pofo_keyboard", "Atari Portfolio keyboard");
 
 pofo_keyboard_device::pofo_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :

src/mame/ausnz/poly.cpp

@@ -34,6 +34,7 @@
 #include "poly.h"
 #include "formats/flex_dsk.h"
 #include "softlist_dev.h"
+#include "utf8.h"
 
 
 void poly_state::poly_bank(address_map &map)

src/mame/ausnz/super80.cpp

@@ -213,6 +213,8 @@ ToDo:
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 #include "super80.lh"
 
 

src/mame/bondwell/bw12.cpp

@@ -32,6 +32,7 @@
 #include "screen.h"
 #include "softlist_dev.h"
 #include "speaker.h"
+#include "utf8.h"
 
 /*
 

src/mame/canon/canon_s80.cpp

@@ -153,6 +153,7 @@ Notes:
 #include "video/hd44780.h"
 #include "emupal.h"
 #include "screen.h"
+#include "utf8.h"
 
 
 namespace {

src/mame/casio/pb1000.cpp

@@ -36,6 +36,8 @@
 #include "bus/generic/carts.h"
 #include "bus/generic/slot.h"
 
+#include "utf8.h"
+
 
 class pb1000_state : public driver_device
 {

src/mame/commodore/cbm2.cpp

@@ -39,6 +39,8 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 #define PLA1_TAG        "u78"
 #define PLA2_TAG        "u88"
 #define MOS6567_TAG     "u23"

src/mame/comx/comx35.cpp

@@ -21,6 +21,7 @@
 #include "formats/imageutl.h"
 #include "screen.h"
 #include "softlist_dev.h"
+#include "utf8.h"
 
 /***************************************************************************
     PARAMETERS

src/mame/ddr/huebler.cpp

@@ -39,6 +39,7 @@ Cassette considerations
 #include "huebler.h"
 #include "speaker.h"
 #include "screen.h"
+#include "utf8.h"
 
 /* Keyboard */
 

src/mame/ddr/jtc.cpp

@@ -28,6 +28,7 @@ To Do:
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
+#include "utf8.h"
 
 #define UB8830D_TAG     "ub8830d"
 #define CENTRONICS_TAG  "centronics"

src/mame/epson/hx20.cpp

@@ -43,6 +43,7 @@
 #include "screen.h"
 #include "softlist_dev.h"
 #include "speaker.h"
+#include "utf8.h"
 
 
 //**************************************************************************

src/mame/epson/px8.cpp

@@ -40,6 +40,8 @@
 
 #include "px8.lh"
 
+#include "utf8.h"
+
 
 /***************************************************************************
     CONSTANTS

src/mame/grundy/newbrain.cpp

@@ -53,6 +53,8 @@
 #include "speaker.h"
 #include "screen.h"
 
+#include "utf8.h"
+
 #include "newbrain.lh"
 #include "newbraina.lh"
 

src/mame/handheld/hh_cops1.cpp

@@ -25,6 +25,8 @@ TODO:
 
 #include "speaker.h"
 
+#include "utf8.h"
+
 // internal artwork
 #include "cambrp.lh"
 #include "mbaskb.lh"

src/mame/handheld/hh_rw5000.cpp

@@ -27,6 +27,8 @@ ROM source notes when dumped from another model, but confident it's the same:
 
 #include "speaker.h"
 
+#include "utf8.h"
+
 // internal artwork
 #include "autorace.lh"
 #include "gravity.lh"

src/mame/handheld/hh_tms1k.cpp

@@ -221,6 +221,8 @@ on Joerg Woerner's datamath.org: http://www.datamath.org/IC_List.htm
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 // internal artwork
 #include "t7in1ss.lh"
 #include "alphie.lh"

src/mame/isc/compucolor.cpp

@@ -31,6 +31,7 @@
 #include "emupal.h"
 #include "screen.h"
 #include "softlist_dev.h"
+#include "utf8.h"
 
 #define I8080_TAG   "ua2"
 #define TMS5501_TAG "ud2"

src/mame/kyocera/kyocera.cpp

@@ -61,9 +61,12 @@
 
 #include "emu.h"
 #include "kyocera.h"
+
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 /* Read/Write Handlers */
 
 uint8_t pc8201_state::bank_r()

src/mame/matsushita/jr100.cpp

@@ -54,16 +54,20 @@ TODO:
 ****************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/m6800/m6800.h"
 #include "imagedev/cassette.h"
 #include "imagedev/snapquik.h"
 #include "machine/6522via.h"
 #include "machine/timer.h"
 #include "sound/spkrdev.h"
+
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 namespace {
 

src/mame/matsushita/jr200.cpp

@@ -57,12 +57,16 @@ TODO:
 ****************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/m6800/m6800.h"
 #include "sound/beep.h"
+
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 class jr200_state : public driver_device
 {

src/mame/memotech/mtx.cpp

@@ -29,6 +29,8 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 /***************************************************************************
     MEMORY MAPS

src/mame/misc/neoprint.cpp

@@ -33,6 +33,8 @@
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 namespace {
 

src/mame/nec/pc8001.cpp

@@ -42,6 +42,7 @@
 #include "screen.h"
 #include "softlist_dev.h"
 #include "speaker.h"
+#include "utf8.h"
 
 WRITE_LINE_MEMBER( pc8001_base_state::crtc_reverse_w )
 {

src/mame/nec/pc8401a.cpp

@@ -35,6 +35,8 @@
 
 #include "bus/rs232/rs232.h"
 
+#include "utf8.h"
+
 /* Fake Keyboard */
 
 void pc8401a_state::scan_keyboard()

src/mame/nec/pc8801.cpp

@@ -108,6 +108,8 @@
 
 #include "softlist_dev.h"
 
+#include "utf8.h"
+
 
 #define PC8801FH_OSC1   XTAL(28'636'363)
 #define PC8801FH_OSC2   XTAL(42'105'200)

src/mame/nokia/mm1kb.cpp

@@ -10,6 +10,7 @@
 #include "mm1kb.h"
 #include "screen.h"
 #include "speaker.h"
+#include "utf8.h"
 
 
 

src/mame/osborne/vixen.cpp

@@ -70,6 +70,7 @@ Notes:
 #include "screen.h"
 #include "softlist_dev.h"
 #include "speaker.h"
+#include "utf8.h"
 
 
 namespace {

src/mame/pc/europc_kbd.cpp

@@ -24,6 +24,8 @@
 
 #include "cpu/m6805/m68705.h"
 
+#include "utf8.h"
+
 //**************************************************************************
 //  LLE KEYBOARD DEVICE
 //**************************************************************************

src/mame/pc/kb_poisk1.h

@@ -10,6 +10,8 @@
  * F12 - XXX
  */
 
+#include "utf8.h"
+
 INPUT_PORTS_START( poisk1_keyboard_v89 )
 	PORT_START("Y1")
 	PORT_BIT( 0x001, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}') // scancode 0x55

src/mame/positron/positron.cpp

@@ -40,6 +40,8 @@
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 // Debugging
 #define VERBOSE 0

src/mame/psion/psion5.cpp

@@ -18,6 +18,8 @@
 
 #include "psion5.h"
 
+#include "utf8.h"
+
 #define LOG_UNKNOWNS        (1 << 0)
 #define LOG_IRQ             (1 << 1)
 #define LOG_DISPLAY         (1 << 2)

src/mame/samsung/spc1500.cpp

@@ -239,6 +239,8 @@ TODO:
 
 #include "formats/spc1000_cas.h"
 
+#include "utf8.h"
+
 
 namespace {
 

src/mame/sanyo/mbc55x_kbd.cpp

@@ -22,6 +22,8 @@
 #include "cpu/mcs48/mcs48.h"
 #include "machine/keyboard.ipp"
 
+#include "utf8.h"
+
 //**************************************************************************
 //  DEVICE TYPE DEFINITION
 //**************************************************************************

src/mame/sanyo/phc25.cpp

@@ -45,6 +45,8 @@ RUN
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 /* Read/Write Handlers */
 

src/mame/sharp/mz2000.cpp

@@ -37,6 +37,8 @@
 #include "formats/2d_dsk.h"
 #include "formats/mz_cas.h"
 
+#include "utf8.h"
+
 
 #define MASTER_CLOCK 17.73447_MHz_XTAL  / 5  /* TODO: was 4 MHz, but otherwise cassette won't work due of a bug with MZF support ... */
 

src/mame/siemens/pcd_kbd.cpp

@@ -7,6 +7,8 @@
 #include "sound/spkrdev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 DEFINE_DEVICE_TYPE(PCD_KEYBOARD, pcd_keyboard_device, "pcd_kbd", "Siemens PC-D Keyboard")
 
 ROM_START( pcd_keyboard )

src/mame/sinclair/ql.cpp

@@ -89,6 +89,8 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 #define SCREEN_TAG  "screen"
 

src/mame/skeleton/aaa.cpp

@@ -7,14 +7,18 @@ Skeleton driver for Ann Arbor Ambassador terminal.
 ************************************************************************************************************************************/
 
 #include "emu.h"
+
 #include "bus/rs232/rs232.h"
 #include "cpu/z80/z80.h"
 #include "machine/74259.h"
 #include "machine/input_merger.h"
 #include "machine/scn_pci.h"
 #include "machine/nvram.h"
+
 #include "screen.h"
 
+#include "utf8.h"
+
 class aaa_state : public driver_device
 {
 public:

src/mame/skeleton/blw700i.cpp

@@ -14,12 +14,16 @@
 ****************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/h8/h83003.h"
-#include "machine/nvram.h"
 #include "machine/at28c16.h"
+#include "machine/nvram.h"
+#include "machine/timer.h"
+
 #include "screen.h"
 #include "speaker.h"
-#include "machine/timer.h"
+
+#include "utf8.h"
 
 class lw700i_state : public driver_device
 {

src/mame/skeleton/eurit.cpp

@@ -7,12 +7,16 @@
 ****************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/m37710/m37710.h"
 #include "machine/am79c30.h"
 #include "video/hd44780.h"
+
 #include "emupal.h"
 #include "screen.h"
 
+#include "utf8.h"
+
 class eurit_state : public driver_device
 {
 public:

src/mame/skeleton/gm1000.cpp

@@ -13,6 +13,7 @@
 #include "video/hd44780.h"
 #include "emupal.h"
 #include "screen.h"
+#include "utf8.h"
 
 namespace {
 

src/mame/skeleton/itt3030.cpp

@@ -192,6 +192,7 @@ Beeper Circuit, all ICs shown:
 
 
 #include "emu.h"
+
 #include "cpu/mcs48/mcs48.h"        //Keyboard MCU ... talks to the 8278 on the keyboard circuit
 #include "cpu/z80/z80.h"
 #include "imagedev/floppy.h"
@@ -200,12 +201,15 @@ Beeper Circuit, all ICs shown:
 #include "machine/wd_fdc.h"
 #include "sound/beep.h"
 #include "video/tms9927.h"          //Display hardware
+
 #include "emupal.h"
 #include "screen.h"
 #include "softlist_dev.h"
 #include "speaker.h"
+
 #include "formats/itt3030_dsk.h"
-#include "debugger.h"
+
+#include "utf8.h"
 
 #define MAIN_CLOCK XTAL_4.194MHz
 

src/mame/skeleton/shine.cpp

@@ -19,6 +19,7 @@ but the syntax has yet to be worked out. BAUD [0-9] is allowed but what is it do
 ************************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/m6502/m6502.h"
 #include "imagedev/cassette.h"
 #include "imagedev/floppy.h"
@@ -29,10 +30,13 @@ but the syntax has yet to be worked out. BAUD [0-9] is allowed but what is it do
 #include "sound/spkrdev.h"
 #include "video/mc6847.h"
 #include "bus/centronics/ctronics.h"
+
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 class shine_state : public driver_device
 {

src/mame/skeleton/squale.cpp

@@ -95,6 +95,8 @@ TODO
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 #define MAIN_CLOCK           14_MHz_XTAL
 #define AY_CLOCK             MAIN_CLOCK / 8     /* 1.75 Mhz */

src/mame/svi/svi318.cpp

@@ -27,6 +27,8 @@
 
 #include "formats/svi_cas.h"
 
+#include "utf8.h"
+
 
 //**************************************************************************
 //  CONSTANTS & MACROS

src/mame/ta/alphatpc16.cpp

@@ -58,10 +58,13 @@ via the PC 16 Terminal, operates independently after programming), connects to t
 #include "sound/beep.h"
 #include "cpu/mcs48/mcs48.h"
 #include "cpu/z80/z80.h"
+
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 namespace {
 
@@ -77,10 +80,7 @@ public:
 		m_wdfdc(*this, "wdfdc"),
 		m_ram(*this, RAM_TAG),
 		m_z80(*this, "z80"),
-		m_flop0(*this, "wdfdc:0"),
-		m_flop1(*this, "wdfdc:1"),
-		m_flop2(*this, "wdfdc:2"),
-		m_flop3(*this, "wdfdc:3"),
+		m_flop(*this, "wdfdc:%u", 0),
 		m_keys(*this, "KEYS.%u", 0)
 	{ }
 
@@ -115,10 +115,7 @@ private:
 	required_device<wd1770_device> m_wdfdc;
 	required_device<ram_device> m_ram;
 	required_device<cpu_device> m_z80;
-	required_device<floppy_connector> m_flop0;
-	required_device<floppy_connector> m_flop1;
-	required_device<floppy_connector> m_flop2;
-	required_device<floppy_connector> m_flop3;
+	required_device_array<floppy_connector, 4> m_flop;
 	required_ioport_array<8> m_keys;
 
 	u8 m_p1 = 0, m_p2 = 0, m_data = 0, m_p40 = 0;
@@ -128,7 +125,7 @@ private:
 void alphatpc16_state::machine_start()
 {
 	m_maincpu->space(AS_PROGRAM).install_ram(0, m_ram->size() - 1, m_ram->pointer());
-	m_wdfdc->set_floppy(m_flop0->get_device());
+	m_wdfdc->set_floppy(m_flop[0]->get_device());
 
 	m_bsy = false;
 	m_req = false;
@@ -171,16 +168,16 @@ u8 alphatpc16_state::p00_r()
 	switch(m_p40 & 0xf0)
 	{
 		case 0x00:
-			ret |= m_flop0->get_device()->exists() << 3;
+			ret |= m_flop[0]->get_device()->exists() << 3;
 			break;
 		case 0x10:
-			ret |= m_flop1->get_device()->exists() << 3;
+			ret |= m_flop[1]->get_device()->exists() << 3;
 			break;
 		case 0x20:
-			ret |= m_flop2->get_device()->exists() << 3;
+			ret |= m_flop[2]->get_device()->exists() << 3;
 			break;
 		case 0x40:
-			ret |= m_flop3->get_device()->exists() << 3;
+			ret |= m_flop[3]->get_device()->exists() << 3;
 			break;
 	}
 	return ret;
@@ -191,20 +188,20 @@ void alphatpc16_state::p40_w(u8 data)
 	switch(data & 0xf0)
 	{
 		case 0x00:
-			m_wdfdc->set_floppy(m_flop0->get_device());
-			m_flop0->get_device()->ss_w(BIT(data, 2));
+			m_wdfdc->set_floppy(m_flop[0]->get_device());
+			m_flop[0]->get_device()->ss_w(BIT(data, 2));
 			break;
 		case 0x10:
-			m_wdfdc->set_floppy(m_flop1->get_device());
-			m_flop1->get_device()->ss_w(BIT(data, 2));
+			m_wdfdc->set_floppy(m_flop[1]->get_device());
+			m_flop[1]->get_device()->ss_w(BIT(data, 2));
 			break;
 		case 0x20:
-			m_wdfdc->set_floppy(m_flop2->get_device());
-			m_flop2->get_device()->ss_w(BIT(data, 2));
+			m_wdfdc->set_floppy(m_flop[2]->get_device());
+			m_flop[2]->get_device()->ss_w(BIT(data, 2));
 			break;
 		case 0x40:
-			m_wdfdc->set_floppy(m_flop3->get_device());
-			m_flop3->get_device()->ss_w(BIT(data, 2));
+			m_wdfdc->set_floppy(m_flop[3]->get_device());
+			m_flop[3]->get_device()->ss_w(BIT(data, 2));
 			break;
 	}
 	m_p40 = data;
@@ -503,11 +500,11 @@ void alphatpc16_state::alphatpc16(machine_config &config)
 	m_z80->set_addrmap(AS_PROGRAM, &alphatpc16_state::apc16_z80_map);
 	m_z80->set_addrmap(AS_IO, &alphatpc16_state::apc16_z80_io);
 	WD1770(config, m_wdfdc, 8_MHz_XTAL);
-	FLOPPY_CONNECTOR(config, m_flop0, atpc16_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
-	dynamic_cast<device_slot_interface *>(m_flop0.target())->set_fixed(true);
-	FLOPPY_CONNECTOR(config, m_flop1, atpc16_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
-	FLOPPY_CONNECTOR(config, m_flop2, atpc16_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
-	FLOPPY_CONNECTOR(config, m_flop3, atpc16_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
+	FLOPPY_CONNECTOR(config, m_flop[0], atpc16_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
+	dynamic_cast<device_slot_interface *>(m_flop[0].target())->set_fixed(true);
+	FLOPPY_CONNECTOR(config, m_flop[1], atpc16_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
+	FLOPPY_CONNECTOR(config, m_flop[2], atpc16_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
+	FLOPPY_CONNECTOR(config, m_flop[3], atpc16_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
 
 	i8741a_device& i8741(I8741A(config, "i8741", 4.608_MHz_XTAL));
 	i8741.p1_in_cb().set(FUNC(alphatpc16_state::p1_r));

src/mame/tangerine/microtan.cpp

@@ -63,6 +63,8 @@
 #include "screen.h"
 #include "softlist_dev.h"
 
+#include "utf8.h"
+
 
 void microtan_state::mt65_map(address_map &map)
 {

src/mame/tangerine/oric.cpp

@@ -38,6 +38,8 @@
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 #include "formats/oric_dsk.h"
 #include "formats/oric_tap.h"
 

src/mame/telenova/compiskb.cpp

@@ -11,6 +11,8 @@
 
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 
 //**************************************************************************

src/mame/telercas/tmc600.cpp

@@ -97,6 +97,8 @@ Notes:
 #include "emu.h"
 #include "tmc600.h"
 
+#include "utf8.h"
+
 uint8_t tmc600_state::rtc_r()
 {
 	m_rtc_int = m_vismac_reg_latch >> 3;

src/mame/televideo/tv910.cpp

@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "emu.h"
+
 #include "bus/rs232/rs232.h"
 #include "cpu/m6502/m6502.h"
 #include "machine/input_merger.h"
@@ -31,9 +32,12 @@
 #include "machine/mos6551.h"
 #include "sound/beep.h"
 #include "video/mc6845.h"
+
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 #define ACIA_TAG    "acia"
 #define CRTC_TAG    "crtc"
 #define RS232_TAG   "rs232"

src/mame/televideo/tv950kb.cpp

@@ -2,12 +2,13 @@
 // copyright-holders:AJR
 /***********************************************************************************************************************************
 
-TeleVideo 950 101-key serial keyboard emulation.
+    TeleVideo 950 101-key serial keyboard emulation.
 
 ************************************************************************************************************************************/
 
 #include "emu.h"
 #include "tv950kb.h"
+#include "utf8.h"
 
 DEFINE_DEVICE_TYPE(TV950_KEYBOARD, tv950kb_device, "tv950kb", "TeleVideo 950 Keyboard")
 

src/mame/thomson/thomson.cpp

@@ -97,6 +97,8 @@
 #include "formats/basicdsk.h"
 #include "formats/cd90_640_dsk.h"
 
+#include "utf8.h"
+
 
 /**************************** common *******************************/
 

src/mame/ti/exelv.cpp

@@ -113,6 +113,8 @@ TODO:
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 #define VERBOSE 0
 #include "logmacro.h"
 

src/mame/ti/ti74.cpp

@@ -80,6 +80,8 @@
 #include "screen.h"
 #include "softlist_dev.h"
 
+#include "utf8.h"
+
 #include "ti74.lh"
 #include "ti95.lh"
 

src/mame/tiki/tiki100.cpp

@@ -34,6 +34,8 @@
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 /* Memory Banking */
 

src/mame/tomy/tutor.cpp

@@ -182,6 +182,8 @@ A=AMA, P=PRO, these keys don't exist, and so the games cannot be played.
 #include "softlist_dev.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 namespace {
 

src/mame/trainer/amico2k.cpp

@@ -33,6 +33,8 @@
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
 #include "machine/i8255.h"
+#include "utf8.h"
+
 #include "amico2k.lh"
 
 

src/mame/trs/lnw80.cpp

@@ -79,6 +79,7 @@ To Do / Status:
 #include "machine/input_merger.h"
 #include "formats/td0_dsk.h"
 #include "softlist_dev.h"
+#include "utf8.h"
 
 namespace {
 

src/mame/trs/max80.cpp

@@ -57,6 +57,7 @@ Status: Beeps every so often. Unable to read the disk.
 ***************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/z80/z80.h"
 //#include "machine/ram.h"
 #include "imagedev/floppy.h"
@@ -70,13 +71,17 @@ Status: Beeps every so often. Unable to read the disk.
 #include "sound/beep.h"
 #include "machine/timer.h"
 #include "video/mc6845.h"
+
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
+
 #include "formats/imd_dsk.h"
 //#include "formats/trs80_dsk.h"
 //#include "formats/dmk_dsk.h"
 
+#include "utf8.h"
+
 class max80_state : public driver_device
 {
 public:

src/mame/trs/meritum.cpp

@@ -66,6 +66,8 @@ For Model III:
 #include "emupal.h"
 #include "softlist_dev.h"
 
+#include "utf8.h"
+
 class meritum_state : public trs80_state
 {
 public:

src/mame/trs/radionic.cpp

@@ -114,6 +114,8 @@ To Do / Status:
 #include "machine/clock.h"
 #include "bus/rs232/rs232.h"
 #include "softlist_dev.h"
+#include "utf8.h"
+
 #define MASTER_XTAL 12164800
 
 

src/mame/trs/trs80.cpp

@@ -157,6 +157,7 @@ ht1080z    works
 #include "machine/input_merger.h"
 #include "sound/ay8910.h"
 #include "softlist_dev.h"
+#include "utf8.h"
 
 
 void trs80_state::trs80_mem(address_map &map)

src/mame/trs/trs80m2kb.cpp

@@ -9,6 +9,8 @@
 #include "emu.h"
 #include "trs80m2kb.h"
 
+#include "utf8.h"
+
 
 
 //**************************************************************************

src/mame/trs/trs80m3.cpp

@@ -82,6 +82,8 @@ trs80m4p:  Floppy not working, so machine is useless.
 #include "formats/trs80_dsk.h"
 #include "formats/dmk_dsk.h"
 
+#include "utf8.h"
+
 
 
 void trs80m3_state::m3_mem(address_map &map)

src/mame/ussr/pyl601.cpp

@@ -50,6 +50,8 @@ The BASIC
 
 #include "formats/pyldin_dsk.h"
 
+#include "utf8.h"
+
 
 class pyl601_state : public driver_device
 {

src/mame/visual/v102_kbd.cpp

@@ -15,6 +15,8 @@ through software commands.
 #include "emu.h"
 #include "v102_kbd.h"
 
+#include "utf8.h"
+
 DEFINE_DEVICE_TYPE(V102_KEYBOARD, v102_keyboard_device, "v102_kbd", "Visual 102 Keyboard")
 DEFINE_DEVICE_TYPE(V550_KEYBOARD, v550_keyboard_device, "v550_kbd", "Visual 550 Keyboard")
 

src/mame/visual/v1050.cpp

@@ -157,6 +157,8 @@ Notes:
 #include "softlist.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 
 void v1050_state::set_interrupt(int line, int state)
 {

src/mame/vtech/crvision.cpp

@@ -149,6 +149,7 @@ TODO:
 #include "crvision.h"
 #include "softlist_dev.h"
 #include "speaker.h"
+#include "utf8.h"
 
 
 /***************************************************************************

src/mame/vtech/laser3k.cpp

@@ -31,16 +31,20 @@
 ***************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/m6502/m6502.h"
 #include "machine/bankdev.h"
 #include "machine/ram.h"
 #include "machine/kb3600.h"
 #include "sound/sn76496.h"
 #include "sound/spkrdev.h"
+
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
 
+#include "utf8.h"
+
 enum
 {
 	TEXT = 0,