diff --git a/app/qml/FontPixels.qml b/app/qml/FontPixels.qml index 6ff85da..91129b3 100644 --- a/app/qml/FontPixels.qml +++ b/app/qml/FontPixels.qml @@ -35,8 +35,17 @@ QtObject{ ListElement{ name: "COMMODORE_PET" text: "Commodore PET (1977)" - source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf" - lineSpacing: 2 + source: "fonts/1977-commodore-pet/PetMe.ttf" + lineSpacing: 3 + pixelSize: 8 + baseScaling: 4.0 + fontWidth: 0.8 + } + ListElement{ + name: "IBM_PC" + text: "IBM PC (1981)" + source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf" + lineSpacing: 3 pixelSize: 8 baseScaling: 4.0 fontWidth: 0.8 @@ -80,7 +89,7 @@ QtObject{ ListElement{ name: "ATARI_400" text: "Atari 400-800 (1979)" - source: "fonts/1979-atari-400-800/ATARI400800_original.TTF" + source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf" lineSpacing: 3 pixelSize: 8 baseScaling: 4.0 @@ -89,7 +98,7 @@ QtObject{ ListElement{ name: "COMMODORE_64" text: "Commodore 64 (1982)" - source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf" + source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf" lineSpacing: 3 pixelSize: 8 baseScaling: 4.0 diff --git a/app/qml/FontScanlines.qml b/app/qml/FontScanlines.qml index eebf00b..f60e4a6 100644 --- a/app/qml/FontScanlines.qml +++ b/app/qml/FontScanlines.qml @@ -35,12 +35,21 @@ QtObject{ ListElement{ name: "COMMODORE_PET" text: "Commodore PET (1977)" - source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf" - lineSpacing: 2 + source: "fonts/1977-commodore-pet/PetMe.ttf" + lineSpacing: 3 pixelSize: 8 baseScaling: 4.0 fontWidth: 0.7 } + ListElement{ + name: "IBM_PC" + text: "IBM PC (1981)" + source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf" + lineSpacing: 3 + pixelSize: 8 + baseScaling: 4.0 + fontWidth: 0.8 + } ListElement{ name: "PROGGY_TINY" text: "Proggy Tiny (Modern)" @@ -80,7 +89,7 @@ QtObject{ ListElement{ name: "ATARI_400" text: "Atari 400-800 (1979)" - source: "fonts/1979-atari-400-800/ATARI400800_original.TTF" + source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf" lineSpacing: 3 pixelSize: 8 baseScaling: 4.0 @@ -89,7 +98,7 @@ QtObject{ ListElement{ name: "COMMODORE_64" text: "Commodore 64 (1982)" - source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf" + source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf" lineSpacing: 3 pixelSize: 8 baseScaling: 4.0 diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml index 16d4815..b839d3c 100644 --- a/app/qml/Fonts.qml +++ b/app/qml/Fonts.qml @@ -93,8 +93,8 @@ QtObject{ ListElement{ name: "COMMODORE_PET_SCALED" text: "Commodore PET (1977)" - source: "fonts/1977-commodore-pet/COMMODORE_PET.ttf" - lineSpacing: 2 + source: "fonts/1977-commodore-pet/PetMe.ttf" + lineSpacing: 3 pixelSize: 8 baseScaling: 3.5 fontWidth: 0.7 @@ -129,7 +129,7 @@ QtObject{ ListElement{ name: "ATARI_400_SCALED" text: "Atari 400-800 (1979)" - source: "fonts/1979-atari-400-800/ATARI400800_original.TTF" + source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf" lineSpacing: 3 pixelSize: 8 baseScaling: 3.5 @@ -138,10 +138,22 @@ QtObject{ isSystemFont: false family: "" } + ListElement{ + name: "IBM_PC_SCALED" + text: "IBM PC (1981)" + source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf" + lineSpacing: 3 + pixelSize: 8 + baseScaling: 4.0 + fontWidth: 0.8 + lowResolutionFont: true + isSystemFont: false + family: "" + } ListElement{ name: "COMMODORE_64_SCALED" text: "Commodore 64 (1982)" - source: "fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf" + source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf" lineSpacing: 3 pixelSize: 8 baseScaling: 3.5 @@ -150,22 +162,10 @@ QtObject{ isSystemFont: false family: "" } - ListElement{ - name: "ATARI_ST_SCALED" - text: "Atari ST (1985)" - source: "fonts/1985-atari-st/AtariST8x16SystemFont.ttf" - lineSpacing: 3 - pixelSize: 16 - baseScaling: 2.0 - fontWidth: 1.0 - lowResolutionFont: true - isSystemFont: false - family: "" - } ListElement{ name: "IBM_DOS" text: "IBM DOS (1985)" - source: "fonts/1985-ibm-pc-vga/Perfect DOS VGA 437 Win.ttf" + source: "fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf" lineSpacing: 3 pixelSize: 16 baseScaling: 2.0 @@ -207,17 +207,6 @@ QtObject{ isSystemFont: false family: "" } - ListElement{ - name: "MONACO" - text: "HD: Monaco (Modern)" - source: "fonts/modern-monaco/monaco.ttf" - lineSpacing: 0.1 - pixelSize: 30 - fontWidth: 1.0 - lowResolutionFont: false - isSystemFont: false - family: "" - } ListElement{ name: "INCONSOLATA" text: "HD: Inconsolata (Modern)" @@ -240,18 +229,6 @@ QtObject{ isSystemFont: false family: "" } - ListElement{ - name: "Knight_TV" - text: "Knight TV (1975)" - source: "fonts/1975-knight-tv/KnightTVMedium.ttf" - lineSpacing: 0.2 - pixelSize: 10 - fontWidth: 1.0 - baseScaling: 3.0 - lowResolutionFont: true - isSystemFont: false - family: "" - } } Component.onCompleted: addSystemFonts() diff --git a/app/qml/fonts/1975-knight-tv/KnightTVMedium.ttf b/app/qml/fonts/1975-knight-tv/KnightTVMedium.ttf deleted file mode 100644 index 4d133fb..0000000 Binary files a/app/qml/fonts/1975-knight-tv/KnightTVMedium.ttf and /dev/null differ diff --git a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_128.ttf b/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_128.ttf deleted file mode 100644 index 4aa5e41..0000000 Binary files a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_128.ttf and /dev/null differ diff --git a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_128_2y.ttf b/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_128_2y.ttf deleted file mode 100644 index 731ff9d..0000000 Binary files a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_128_2y.ttf and /dev/null differ diff --git a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_2x.ttf b/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_2x.ttf deleted file mode 100644 index fe9be86..0000000 Binary files a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_2x.ttf and /dev/null differ diff --git a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_2y.ttf b/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_2y.ttf deleted file mode 100644 index 988023e..0000000 Binary files a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_2y.ttf and /dev/null differ diff --git a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_64.ttf b/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_64.ttf deleted file mode 100644 index 2b1667c..0000000 Binary files a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_64.ttf and /dev/null differ diff --git a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_64_2y.ttf b/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_64_2y.ttf deleted file mode 100644 index 54c6cb6..0000000 Binary files a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET_64_2y.ttf and /dev/null differ diff --git a/app/qml/fonts/1977-commodore-pet/COMMODORE_PET.ttf b/app/qml/fonts/1977-commodore-pet/PetMe.ttf similarity index 100% rename from app/qml/fonts/1977-commodore-pet/COMMODORE_PET.ttf rename to app/qml/fonts/1977-commodore-pet/PetMe.ttf diff --git a/app/qml/fonts/1979-atari-400-800/ATARI400800_original.TTF b/app/qml/fonts/1979-atari-400-800/ATARI400800_original.TTF deleted file mode 100644 index 4a69e6d..0000000 Binary files a/app/qml/fonts/1979-atari-400-800/ATARI400800_original.TTF and /dev/null differ diff --git a/app/qml/fonts/1979-atari-400-800/ATARI400800_squared.TTF b/app/qml/fonts/1979-atari-400-800/ATARI400800_squared.TTF deleted file mode 100644 index ef9bcbb..0000000 Binary files a/app/qml/fonts/1979-atari-400-800/ATARI400800_squared.TTF and /dev/null differ diff --git a/app/qml/fonts/1979-atari-400-800/AtariClassic-Regular.ttf b/app/qml/fonts/1979-atari-400-800/AtariClassic-Regular.ttf new file mode 100644 index 0000000..a4f61c6 Binary files /dev/null and b/app/qml/fonts/1979-atari-400-800/AtariClassic-Regular.ttf differ diff --git a/app/qml/fonts/1979-atari-400-800/Read Me.pdf b/app/qml/fonts/1979-atari-400-800/Read Me.pdf new file mode 100644 index 0000000..3d5e420 Binary files /dev/null and b/app/qml/fonts/1979-atari-400-800/Read Me.pdf differ diff --git a/app/qml/fonts/1979-atari-400-800/ReadMe.rtf b/app/qml/fonts/1979-atari-400-800/ReadMe.rtf deleted file mode 100644 index a36354c..0000000 --- a/app/qml/fonts/1979-atari-400-800/ReadMe.rtf +++ /dev/null @@ -1,317 +0,0 @@ -{\rtf1\ansi\deff0\deftab720{\fonttbl{\f0\fswiss MS Sans Serif;}{\f1\froman\fcharset2 Symbol;}{\f2\fmodern\fprq1 Atari Classic Chunky;}{\f3\froman Times New Roman;}{\f4\fswiss\fprq2 Arial;}} -{\colortbl\red0\green0\blue0;\red0\green0\blue255;} -\deflang1033\pard\plain\f2\fs24\cf1 Atari Classic TrueType Fonts \plain\f2\fs24\cf0 -\par \plain\f4\fs16\cf0 (Windows Version 1.1) -\par Created by Mark Simonson (v.1.0-1998, v.1.1-2001) -\par marksim@bitstream.net -\par Website: Mac/Atari Fusion--Atari Home Computer Resources for Mac Users -\par http://www2.bitstream.net/~marksim/atarimac/ -\par Macintosh version also available. -\par -\par With these fonts installed, you can view and print Atari text files in any text editor that allows you to change fonts (WordPad, for example). Tip: In order to get the correct line breaks, you will need to change the ATASCII return character (155) to the DOS LF character. (In the Character Map accessory, the ATASCII return is the blank character that comes just before the inverse up-arrow.) -\par -\par There are three different fonts. \plain\f4\fs16\cf0\b Atari Classic Chunky \plain\f4\fs16\cf0 is a pixel-for-pixel copy of the original ATASCII character set. \plain\f4\fs16\cf0\b Atari Classic Smooth \plain\f4\fs16\cf0 interprets the pixel aliasing (stair steps) as diagonal lines. \plain\f4\fs16\cf0\b Atari Classic Extrasmooth \plain\f4\fs16\cf0 refines this idea further with the addition of curves. \plain\f4\fs16\cf0\b Smooth\plain\f4\fs16\cf0 and \plain\f4\fs16\cf0\b Extrasmooth\plain\f4\fs16\cf0 were designed for better appearance and legibility at larger sizes and on print-outs. Use the one that looks best to you. -\par -\par These fonts will tend to look uneven at font sizes that do not correspond to the 8-by-8 pixel grid that the characters are based on. Because Windows assumes 96ppi screen resolution, they will look best in a font size that is a multiple of 6 (i.e., 6pt, 12pt, 18pt, etc.). (In Windows, 6 points = 8 pixels.) -\par -\par The Atari Classic TrueType fonts duplicate the ATASCII character set on a low-level basis. Unlike a normal Windows font, ATASCII utilizes all character codes from $00 to $FF (0 to 255). The lower half are normal characters; the upper half are inverse versions of the lower half. The basic ASCII characters ($00 to $7F) correspond fairly closely except for the first 32, which don't normally contain characters in a Windows font. -\par -\par Due to differences between the way Windows and the Atari use character codes, not all characters will display properly in Windows. In fact, some characters will not display at all (though they do exist in the font). Unfortunately, this is due to certain character codes being reserved in Windows and there doesn't appear to be any way to work around it. The character codes affected are: $00-$1F (0-31), $7F-$81 (127-129), $8D-$90 (141-144), $9D (157), and $9F (158). -\par -\par Not all characters can be typed from the keyboard. You can however copy characters as needed from this document (see tables below). The Character Map desk accessory can help also. -\par -\par \plain\f4\fs16\cf0\b ATASCII CHARACTER SET TABLES -\par \plain\f4\fs16\cf0 -\par In order to see the ATASCII character set with these tables, the Atari Classic TrueType fonts must be installed. Characters that are not displayed properly are due to character code usage differences between ATASCII and Windows (see above). -\par -\par -\par \plain\f4\fs16\cf0\b TABLE 1: ATASCII Character Dump Block -\par \plain\f4\fs16\cf0 -\par All characters (ATASCII $00 thru $FF) 16 characters per -\par line. -\par -\par -\par \plain\f2\fs12\cf0 \'01\'02\'03\'04\'05\'06\'07\'08\tab -\par \'0b\'0c -\par \'0e\'0f -\par \'10\'11\'12\'13\'14\'15\'16\'17\'18\'19\'1a\'1b\'1c\'1d\'1e\'1f -\par !"#$%&'()*+,-./ -\par 0123456789:;<=>? -\par @ABCDEFGHIJKLMNO -\par PQRSTUVWXYZ[\\]^_ -\par `abcdefghijklmno -\par pqrstuvwxyz\{|\}~ -\par \'80\'81\'82\'83\'84\'85\'86\'87\'88\'89\'8a\'8b\'8c\'8d\'8e\'8f -\par \'90''""\bullet \endash \emdash \'98\'99\'9a \'9c\'9d\'9e\'9f -\par \~\'a1\'a2\'a3\'a4\'a5\'a6\'a7\'a8\'a9\'aa\'ab\'ac\'ad\'ae\'af -\par \'b0\'b1\'b2\'b3\'b4\'b5\'b6\'b7\'b8\'b9\'ba\'bb\'bc\'bd\'be\'bf -\par \'c0\'c1\'c2\'c3\'c4\'c5\'c6\'c7\'c8\'c9\'ca\'cb\'cc\'cd\'ce\'cf -\par \'d0\'d1\'d2\'d3\'d4\'d5\'d6\'d7\'d8\'d9\'da\'db\'dc\'dd\'de\'df -\par \'e0\'e1\'e2\'e3\'e4\'e5\'e6\'e7\'e8\'e9\'ea\'eb\'ec\'ed\'ee\'ef -\par \'f0\'f1\'f2\'f3\'f4\'f5\'f6\'f7\'f8\'f9\'fa\'fb\'fc\'fd\'fe\'ff -\par \plain\f4\fs16\cf0 -\par -\par \plain\f4\fs16\cf0\b TABLE 2: ATASCII Character Dump List -\par \plain\f4\fs16\cf0 -\par All characters (ATASCII $00 thru $FF) one character per -\par line with hexadecimal value indicated on the left. -\par -\par \plain\f2\fs12\cf0 00= -\par 01=\'01 -\par 02=\'02 -\par 03=\'03 -\par 04=\'04 -\par 05=\'05 -\par 06=\'06 -\par 07=\'07 -\par 08=\'08 -\par 09=\tab -\par 0A= -\par -\par 0B=\'0b -\par 0C=\'0c -\par 0D= -\par 0E=\'0e -\par 0F=\'0f -\par 10=\'10 -\par 11=\'11 -\par 12=\'12 -\par 13=\'13 -\par 14=\'14 -\par 15=\'15 -\par 16=\'16 -\par 17=\'17 -\par 18=\'18 -\par 19=\'19 -\par 1A=\'1a -\par 1B=\'1b -\par 1C=\'1c -\par 1D=\'1d -\par 1E=\'1e -\par 1F=\'1f -\par 20= -\par 21=! -\par 22=" -\par 23=# -\par 24=$ -\par 25=% -\par 26=& -\par 27=' -\par 28=( -\par 29=) -\par 2A=* -\par 2B=+ -\par 2C=, -\par 2D=- -\par 2E=. -\par 2F=/ -\par 30=0 -\par 31=1 -\par 32=2 -\par 33=3 -\par 34=4 -\par 35=5 -\par 36=6 -\par 37=7 -\par 38=8 -\par 39=9 -\par 3A=: -\par 3B=; -\par 3C=< -\par 3D== -\par 3E=> -\par 3F=? -\par 40=@ -\par 41=A -\par 42=B -\par 43=C -\par 44=D -\par 45=E -\par 46=F -\par 47=G -\par 48=H -\par 49=I -\par 4A=J -\par 4B=K -\par 4C=L -\par 4D=M -\par 4E=N -\par 4F=O -\par 50=P -\par 51=Q -\par 52=R -\par 53=S -\par 54=T -\par 55=U -\par 56=V -\par 57=W -\par 58=X -\par 59=Y -\par 5A=Z -\par 5B=[ -\par 5C=\\ -\par 5D=] -\par 5E=^ -\par 5F=_ -\par 60=` -\par 61=a -\par 62=b -\par 63=c -\par 64=d -\par 65=e -\par 66=f -\par 67=g -\par 68=h -\par 69=i -\par 6A=j -\par 6B=k -\par 6C=l -\par 6D=m -\par 6E=n -\par 6F=o -\par 70=p -\par 71=q -\par 72=r -\par 73=s -\par 74=t -\par 75=u -\par 76=v -\par 77=w -\par 78=x -\par 79=y -\par 7A=z -\par 7B=\{ -\par 7C=| -\par 7D=\} -\par 7E=~ -\par 7F= -\par 80=\'80 -\par 81=\'81 -\par 82=\'82 -\par 83=\'83 -\par 84=\'84 -\par 85=\'85 -\par 86=\'86 -\par 87=\'87 -\par 88=\'88 -\par 89=\'89 -\par 8A=\'8a -\par 8B=\'8b -\par 8C=\'8c -\par 8D=\'8d -\par 8E=\'8e -\par 8F=\'8f -\par 90=\'90 -\par 91=' -\par 92=' -\par 93=" -\par 94=" -\par 95=\bullet -\par 96=\endash -\par 97=\emdash -\par 98=\'98 -\par 99=\'99 -\par 9A=\'9a -\par 9B= -\par 9C=\'9c -\par 9D=\'9d -\par 9E=\'9e -\par 9F=\'9f -\par A0=\~ -\par A1=\'a1 -\par A2=\'a2 -\par A3=\'a3 -\par A4=\'a4 -\par A5=\'a5 -\par A6=\'a6 -\par A7=\'a7 -\par A8=\'a8 -\par A9=\'a9 -\par AA=\'aa -\par AB=\'ab -\par AC=\'ac -\par AD=\'ad -\par AE=\'ae -\par AF=\'af -\par B0=\'b0 -\par B1=\'b1 -\par B2=\'b2 -\par B3=\'b3 -\par B4=\'b4 -\par B5=\'b5 -\par B6=\'b6 -\par B7=\'b7 -\par B8=\'b8 -\par B9=\'b9 -\par BA=\'ba -\par BB=\'bb -\par BC=\'bc -\par BD=\'bd -\par BE=\'be -\par BF=\'bf -\par C0=\'c0 -\par C1=\'c1 -\par C2=\'c2 -\par C3=\'c3 -\par C4=\'c4 -\par C5=\'c5 -\par C6=\'c6 -\par C7=\'c7 -\par C8=\'c8 -\par C9=\'c9 -\par CA=\'ca -\par CB=\'cb -\par CC=\'cc -\par CD=\'cd -\par CE=\'ce -\par CF=\'cf -\par D0=\'d0 -\par D1=\'d1 -\par D2=\'d2 -\par D3=\'d3 -\par D4=\'d4 -\par D5=\'d5 -\par D6=\'d6 -\par D7=\'d7 -\par D8=\'d8 -\par D9=\'d9 -\par DA=\'da -\par DB=\'db -\par DC=\'dc -\par DD=\'dd -\par DE=\'de -\par DF=\'df -\par E0=\'e0 -\par E1=\'e1 -\par E2=\'e2 -\par E3=\'e3 -\par E4=\'e4 -\par E5=\'e5 -\par E6=\'e6 -\par E7=\'e7 -\par E8=\'e8 -\par E9=\'e9 -\par EA=\'ea -\par EB=\'eb -\par EC=\'ec -\par ED=\'ed -\par EE=\'ee -\par EF=\'ef -\par F0=\'f0 -\par F1=\'f1 -\par F2=\'f2 -\par F3=\'f3 -\par F4=\'f4 -\par F5=\'f5 -\par F6=\'f6 -\par F7=\'f7 -\par F8=\'f8 -\par F9=\'f9 -\par FA=\'fa -\par FB=\'fb -\par FC=\'fc -\par FD=\'fd -\par FE=\'fe -\par FF=\'ff -\par } - \ No newline at end of file diff --git a/app/qml/fonts/1981-ibm-pc/LICENSE.TXT b/app/qml/fonts/1981-ibm-pc/LICENSE.TXT new file mode 100644 index 0000000..fd662a7 --- /dev/null +++ b/app/qml/fonts/1981-ibm-pc/LICENSE.TXT @@ -0,0 +1,428 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/app/qml/fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf b/app/qml/fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf new file mode 100644 index 0000000..672aac7 Binary files /dev/null and b/app/qml/fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf differ diff --git a/app/qml/fonts/1982-commodore64/C64_Elite_Mono_v1.0-STYLE.ttf b/app/qml/fonts/1982-commodore64/C64_Elite_Mono_v1.0-STYLE.ttf deleted file mode 100644 index 69253d4..0000000 Binary files a/app/qml/fonts/1982-commodore64/C64_Elite_Mono_v1.0-STYLE.ttf and /dev/null differ diff --git a/app/qml/fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf b/app/qml/fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf new file mode 100644 index 0000000..3e1a82a Binary files /dev/null and b/app/qml/fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf differ diff --git a/app/qml/fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf b/app/qml/fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf deleted file mode 100644 index 6160a54..0000000 Binary files a/app/qml/fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf and /dev/null differ diff --git a/app/qml/fonts/1982-commodore64/C64_Pro_v1.0-STYLE.ttf b/app/qml/fonts/1982-commodore64/C64_Pro_v1.0-STYLE.ttf deleted file mode 100644 index db919c1..0000000 Binary files a/app/qml/fonts/1982-commodore64/C64_Pro_v1.0-STYLE.ttf and /dev/null differ diff --git a/app/qml/fonts/1982-commodore64/C64_User_Mono_v1.0-STYLE.ttf b/app/qml/fonts/1982-commodore64/C64_User_Mono_v1.0-STYLE.ttf deleted file mode 100644 index 137096f..0000000 Binary files a/app/qml/fonts/1982-commodore64/C64_User_Mono_v1.0-STYLE.ttf and /dev/null differ diff --git a/app/qml/fonts/1982-commodore64/C64_User_v1.0-STYLE.ttf b/app/qml/fonts/1982-commodore64/C64_User_v1.0-STYLE.ttf deleted file mode 100644 index bc274ee..0000000 Binary files a/app/qml/fonts/1982-commodore64/C64_User_v1.0-STYLE.ttf and /dev/null differ diff --git a/app/qml/fonts/1982-commodore64/license.txt b/app/qml/fonts/1982-commodore64/license.txt index acde620..5826ede 100644 --- a/app/qml/fonts/1982-commodore64/license.txt +++ b/app/qml/fonts/1982-commodore64/license.txt @@ -1,6 +1,8 @@ -Fonts in this package are (c) 2010 Style. +Fonts in this package are (c) 2010-2014 Style. -You MAY NOT: sell this font; include/redistribute this font in any font collection regardless of pricing; provide the font for direct download from any web site. You MAY: link to "http://style64.org/c64-truetype" in order for others to download and install the font; embed this font or its .eot and .woff variants without any modification and using the same filename it was provided with for display on any web site using @font-face rules; use this font in static images and vector art; include this font without any modification and using the same filename it was provided with as part of a software package but ONLY if said software package is freely provided to end users. You may also contact us to negotiate a (possibly commercial) license for your use outside of these guidelines at "http://style64.org/contact-style". +This license is applicable to each font file included in this package in all their variants (ttf, eot, woff, woff2, svg). + +You MAY NOT: sell this font; include/redistribute the font in any font collection regardless of pricing; provide the font for direct download from any web site, modify or rename the font. You MAY: link to "http://style64.org/c64-truetype" in order for others to download and install the font; embed the font (without any modification or file renaming) for display on any web site using @font-face rules; use this font in static images and vector art; include this font (without any modification or file renaming) as part of a software package but ONLY if said software package is freely provided to end users. You may also contact us to negotiate a (possibly commercial) license for your use outside of these guidelines at "http://style64.org/contact-style". At all times the most recent version of this license can be found at "http://style64.org/c64-truetype/license". diff --git a/app/qml/fonts/1985-atari-st/AtariST8x16SystemFont.ttf b/app/qml/fonts/1985-atari-st/AtariST8x16SystemFont.ttf deleted file mode 100644 index f8f4b3e..0000000 Binary files a/app/qml/fonts/1985-atari-st/AtariST8x16SystemFont.ttf and /dev/null differ diff --git a/app/qml/fonts/1985-ibm-pc-vga/LICENSE.TXT b/app/qml/fonts/1985-ibm-pc-vga/LICENSE.TXT new file mode 100644 index 0000000..fd662a7 --- /dev/null +++ b/app/qml/fonts/1985-ibm-pc-vga/LICENSE.TXT @@ -0,0 +1,428 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/app/qml/fonts/1985-ibm-pc-vga/Perfect DOS VGA 437 Win.ttf b/app/qml/fonts/1985-ibm-pc-vga/Perfect DOS VGA 437 Win.ttf deleted file mode 100644 index d03b1c5..0000000 Binary files a/app/qml/fonts/1985-ibm-pc-vga/Perfect DOS VGA 437 Win.ttf and /dev/null differ diff --git a/app/qml/fonts/1985-ibm-pc-vga/Perfect DOS VGA 437.ttf b/app/qml/fonts/1985-ibm-pc-vga/Perfect DOS VGA 437.ttf deleted file mode 100644 index f5cbfc0..0000000 Binary files a/app/qml/fonts/1985-ibm-pc-vga/Perfect DOS VGA 437.ttf and /dev/null differ diff --git a/app/qml/fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf b/app/qml/fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf new file mode 100644 index 0000000..0368d2b Binary files /dev/null and b/app/qml/fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf differ diff --git a/app/qml/fonts/1985-ibm-pc-vga/dos437.txt b/app/qml/fonts/1985-ibm-pc-vga/dos437.txt deleted file mode 100644 index b757d3d..0000000 --- a/app/qml/fonts/1985-ibm-pc-vga/dos437.txt +++ /dev/null @@ -1,72 +0,0 @@ - / -/(_____________ ____ -\ /______)\ | | -:\ | / \:| |:::::::::: : .. . : .. . . :. . - \_____| / | \| |______ -___ / ________ \... . . . -\______________ \ | | /.. . . . . . - \ |__| / ---x--x-----x----\______ |-/_____/-x--x-xx--x-- - -x -- - - -- - - - -. . . . . . . . . . . .\____|. . . . . . -------------------------------------------------------------------------------- ->> perfect dos vga 437 - general information >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -------------------------------------------------------------------------------- - - "Perfect DOS VGA 437" and "Perfect DOS VGA 437 Win" are truetype fonts - designed to emulate the MS-DOS/Text mode standard font, used on VGA monitors, - with the 437 Codepage (standard US/International). This is a "bitmap" font, - meaning it emulates a bitmap font and can only be used at a given size (8 or - multiples of it like 16, 24, 32, etc). It's optimized for Flash too, so it - won't produce antialias if used at round positions. - - There are two fonts available. "Perfect DOS VGA 437" uses the original DOS - codepage 437. It should be used, for example, if you're opening DOS ASCII - files on notepad or another windows-based editor. Since it's faithful to the - original DOS codes, it won't accent correctly in windows ("" would produce - something different, not an "e" with an acute). - - There's also "Perfect DOS VGA 437 Win" which is the exactly same font adapted - to a windows codepage. This should use accented characters correctly but won't - work if you're opening a DOS-based text file. - - UPDATE: this is a new version, updated in august/2008. It has fixed leading - metrics for Mac systems. - -------------------------------------------------------------------------------- ->> perfect dos vga 437 - creation process >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -------------------------------------------------------------------------------- - - This font was created to be used on a Flash-based ANSi viewer I'm working. To - create it, I created a small Quick Basic program to write all characters on - screen, - - CLS - FOR l = 0 TO 255 - charWrite 1 + (l MOD 20), 1 + (l \ 20) * 6 + (l MOD 2), LTRIM$(RTRIM$(STR$(l))) + CHR$(l) - NEXT - SUB charWrite (lin, col, char$) - DEF SEG = &HB800 - FOR i = 1 TO LEN(char$) - POKE ((lin - 1) * 160) + ((col - 2 + i) * 2), ASC(MID$(char$, i, 1)) - IF (i = LEN(char$)) THEN POKE ((lin - 1) * 160) + ((col - 2 + i) * 2) + 1, 113 - NEXT - END SUB - - Then captured the text screen using SCREEN THIEF (a very, very old screen - capture TSR program which converts text screens to images accurately). I then - recreated the font polygon by polygon on Fontlab, while looking at the image - on Photoshop. No conversion took place. - -------------------------------------------------------------------------------- ->> author >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -------------------------------------------------------------------------------- - - zeh fernando remembers the old days. SMASH DAH FUCKING ENTAH. - - http://www.fatorcaos.com.br - - rorshack ^ maiden brazil - -------------------------------------------------------------------------------- -^zehPULLSdahTRICK^kudosOUTtoWHOkeepsITreal^smashDAHfuckingENTAH!!!^lowres4ever^ -------------------------------------------------------------------------------- diff --git a/app/qml/fonts/modern-monaco/README b/app/qml/fonts/modern-monaco/README deleted file mode 100644 index 4b839dd..0000000 --- a/app/qml/fonts/modern-monaco/README +++ /dev/null @@ -1,13 +0,0 @@ -monaco.ttf -========== - -The original monaco.ttf improved: add some special characters (which are from "DejaVu Sans Mono") - -In my work environment, I need connect to Linux system from Windows system remotely using SecureCRT or Putty, and edit files using VIM tools. So I need one beautiful font in SecureCRT / Putty. - -In windows system, there are some original fonts are beautiful, for example "Consolas", but they can't support some special characters, for example: ▸, ↪, ⌴. Because they are original fonts in my Windows, I don't want to modify them. - -I get "Monaco" from web. It is tiny and beautiful. But it also can't support those special characters. - -So I add the characters by myself and share it. - diff --git a/app/qml/fonts/modern-monaco/monaco.ttf b/app/qml/fonts/modern-monaco/monaco.ttf deleted file mode 100644 index f33c9a7..0000000 Binary files a/app/qml/fonts/modern-monaco/monaco.ttf and /dev/null differ diff --git a/app/qml/resources.qrc b/app/qml/resources.qrc index ac36910..d9fe74c 100644 --- a/app/qml/resources.qrc +++ b/app/qml/resources.qrc @@ -28,15 +28,9 @@ main.qml SettingsTerminalTab.qml FontScanlines.qml - fonts/1982-commodore64/C64_Pro_Mono_v1.0-STYLE.ttf fonts/1977-apple2/PrintChar21.ttf fonts/1971-ibm-3278/3270Medium.ttf - fonts/1975-knight-tv/KnightTVMedium.ttf - fonts/1985-atari-st/AtariST8x16SystemFont.ttf fonts/modern-terminus/TerminusTTF-4.38.2.ttf - fonts/1977-commodore-pet/COMMODORE_PET.ttf - fonts/1979-atari-400-800/ATARI400800_original.TTF - fonts/1985-ibm-pc-vga/Perfect DOS VGA 437 Win.ttf Storage.qml CRTMainMenuBar.qml SettingsPerformanceTab.qml @@ -46,12 +40,16 @@ images/allNoise512.png fonts/modern-proggy-tiny/ProggyTiny.ttf fonts/modern-pro-font-win-tweaked/ProFontWindows.ttf - fonts/modern-monaco/monaco.ttf fonts/modern-hermit/Hermit-medium.otf fonts/modern-inconsolata/Inconsolata.otf SettingsScreenTab.qml fonts/modern-fixedsys-excelsior/FSEX301-L2.ttf ../icons/32x32/cool-retro-term.png Components/SizedLabel.qml + fonts/1979-atari-400-800/AtariClassic-Regular.ttf + fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf + fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf + fonts/1985-ibm-pc-vga/PxPlus_IBM_VGA8.ttf + fonts/1977-commodore-pet/PetMe.ttf