diff --git a/fonts/Liberation-2.00.1/AUTHORS b/fonts/Liberation-2.00.1/AUTHORS new file mode 100644 index 00000000..3bb7b6a1 --- /dev/null +++ b/fonts/Liberation-2.00.1/AUTHORS @@ -0,0 +1,12 @@ +AUTHORS + +Current Contributors (sorted alphabetically): + - Pravin Satpute + Project Owner (Current) + Red Hat, Inc. + +Previous Contributors + + - Steve Matteson + Original Designer + Ascender, Inc. diff --git a/fonts/Liberation-2.00.1/ChangeLog b/fonts/Liberation-2.00.1/ChangeLog new file mode 100644 index 00000000..cd508713 --- /dev/null +++ b/fonts/Liberation-2.00.1/ChangeLog @@ -0,0 +1,14 @@ +* Thu Oct 04 2012 Pravin Satpute +- Resolved "Glyphs with multiple unicode encodings inhibit subsetting" #851790 +- Resolved #851791, #854601 and #851825 +- Following GASP table version as per Liberation old version. (Anti-aliasing disabled) +- Added support for Serbian glyphs for wikipedia #657849 +- In Monospace fonts, isFixedPitch bit set via script for getting it recognized as Monospace in putty.exe + +* Fri Jul 06 2012 Pravin Satpute +- Initial version of Liberation fonts based on croscore fonts version 1.21.0 +- Converted TTF files into SFD files to be open source. +- Update Copyright and License file +- set fsType bit to 0, Installable Embedding is allowed. +- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility. + diff --git a/fonts/Liberation-2.00.1/LICENSE b/fonts/Liberation-2.00.1/LICENSE new file mode 100644 index 00000000..aba73e8a --- /dev/null +++ b/fonts/Liberation-2.00.1/LICENSE @@ -0,0 +1,102 @@ +Digitized data copyright (c) 2010 Google Corporation + with Reserved Font Arimo, Tinos and Cousine. +Copyright (c) 2012 Red Hat, Inc. + with Reserved Font Name Liberation. + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + +PREAMBLE The goals of the Open Font License (OFL) are to stimulate +worldwide development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to provide +a free and open framework in which fonts may be shared and improved in +partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. +The fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + + + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. +This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components +as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting ? in part or in whole ? +any of the components of the Original Version, by changing formats or +by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer +or other person who contributed to the Font Software. + + +PERMISSION & CONDITIONS + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components,in + Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the + corresponding Copyright Holder. This restriction only applies to the + primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + +5) The Font Software, modified or unmodified, in part or in whole, must + be distributed entirely under this license, and must not be distributed + under any other license. The requirement for fonts to remain under + this license does not apply to any document created using the Font + Software. + + + +TERMINATION +This license becomes null and void if any of the above conditions are not met. + + + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER +DEALINGS IN THE FONT SOFTWARE. + diff --git a/fonts/Liberation-2.00.1/README b/fonts/Liberation-2.00.1/README new file mode 100644 index 00000000..572952a6 --- /dev/null +++ b/fonts/Liberation-2.00.1/README @@ -0,0 +1,80 @@ + 1. What's this? + ================= + + The Liberation Fonts is font collection which aims to provide document + layout compatibility as usage of Times New Roman, Arial, Courier New. + + + 2. Requirements + ================= + + * fontforge is installed. + (http://fontforge.sourceforge.net) + + + 3. Install + ============ + + 3.1 Decompress tarball + + You can extract the files by following command: + + $ tar zxvf liberation-fonts-[VERSION].tar.gz + + 3.2 Build from the source + + Change into directory liberation-fonts-[VERSION]/ and build from sources by + following commands: + + $ cd liberation-fonts-[VERSION] + $ make + + The built font files will be available in 'build' directory. + + 3.3 Install to system + + For Fedora, you could manually install the fonts by copying the TTFs to + ~/.fonts for user wide usage, or to /usr/share/fonts/truetype/liberation + for system-wide availability. Then, run "fc-cache" to let that cached. + + For other distributions, please check out corresponding documentation. + + + 4. Usage + ========== + + Simply select preferred liberation font in applications and start using. + + + 5. License + ============ + + This Font Software is licensed under the SIL Open Font License, + Version 1.1. + + Please read file "LICENSE" for details. + + + 6. For Maintainers + ==================== + + Before packaging a new release based on a new source tarball, you have to + update the version suffix in the Makefile: + + VER = [VERSION] + + Make sure that the defined version corresponds to the font software metadata + which you can check with ftinfo/otfinfo or fontforge itself. It is highly + recommended that file 'ChangeLog' is updated to reflect changes. + + Create a tarball with the following command: + + $ make dist + + The new versioned tarball will be available in the dist/ folder as + 'liberation-fonts-[NEW_VERSION].tar.gz'. + + 7. Credits + ============ + + Please read file "AUTHORS" for list of contributors. diff --git a/fonts/Liberation-2.00.1/TODO b/fonts/Liberation-2.00.1/TODO new file mode 100644 index 00000000..efc01771 --- /dev/null +++ b/fonts/Liberation-2.00.1/TODO @@ -0,0 +1,5 @@ +Here are todo for next release +1) Serbian glyph for wikipedia https://bugzilla.redhat.com/show_bug.cgi?id=657849 + - Improving shape of S_BE https://bugzilla.redhat.com/show_bug.cgi?id=657849#c96 +2) Liberation Mono not recognizing as Mono in Windows application #861003 + - presently it is patch, we have to update zero width characters to fixed width diff --git a/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf b/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf new file mode 100644 index 00000000..9997cdaa Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf b/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf new file mode 100644 index 00000000..85eb01be Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf b/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf new file mode 100644 index 00000000..5302690d Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf b/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf new file mode 100644 index 00000000..1a39bc75 Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf b/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf new file mode 100644 index 00000000..4581ebf3 Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf b/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf new file mode 100644 index 00000000..bfbcd26b Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf b/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf new file mode 100644 index 00000000..fcdab885 Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf b/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf new file mode 100644 index 00000000..626dd936 Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf b/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf new file mode 100644 index 00000000..db3d6f38 Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf b/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf new file mode 100644 index 00000000..8b212775 Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf b/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf new file mode 100644 index 00000000..768b8338 Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf differ diff --git a/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf b/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf new file mode 100644 index 00000000..6fa9a59e Binary files /dev/null and b/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf differ diff --git a/scripts/installer.nsi b/scripts/installer.nsi index fea65630..96396169 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -12,6 +12,7 @@ File openscad.exe File openscad.com File /r /x mingw-cross-env examples File /r /x mingw-cross-env libraries +File /r /x mingw-cross-env fonts ${registerExtension} "$INSTDIR\openscad.exe" ".scad" "OpenSCAD_File" CreateShortCut $SMPROGRAMS\OpenSCAD.lnk $INSTDIR\openscad.exe WriteUninstaller $INSTDIR\Uninstall.exe @@ -25,6 +26,7 @@ Delete $INSTDIR\Uninstall.exe Delete $INSTDIR\MyProg.exe Delete $SMPROGRAMS\OpenSCAD.lnk DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenSCAD" +RMDir /r $INSTDIR\fonts RMDir /r $INSTDIR\examples RMDir /r $INSTDIR\libraries\mcad Delete $INSTDIR\libraries\boxes.scad diff --git a/scripts/release-common.sh b/scripts/release-common.sh index e91c79fa..4e6f6cdf 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -219,16 +219,19 @@ case $OS in MACOSX) EXAMPLESDIR=OpenSCAD.app/Contents/Resources/examples LIBRARYDIR=OpenSCAD.app/Contents/Resources/libraries + FONTDIR=OpenSCAD.app/Contents/Resources/fonts ;; UNIX_CROSS_WIN) EXAMPLESDIR=$DEPLOYDIR/openscad-$VERSION/examples/ LIBRARYDIR=$DEPLOYDIR/openscad-$VERSION/libraries/ + FONTDIR=$DEPLOYDIR/openscad-$VERSION/fonts/ rm -rf $DEPLOYDIR/openscad-$VERSION mkdir $DEPLOYDIR/openscad-$VERSION ;; *) EXAMPLESDIR=openscad-$VERSION/examples/ LIBRARYDIR=openscad-$VERSION/libraries/ + FONTDIR=openscad-$VERSION/fonts/ rm -rf openscad-$VERSION mkdir openscad-$VERSION ;; @@ -240,6 +243,11 @@ if [ -n $EXAMPLESDIR ]; then cp examples/* $EXAMPLESDIR chmod -R 644 $EXAMPLESDIR/* fi +if [ -n $FONTDIR ]; then + echo $FONTDIR + mkdir -p $FONTDIR + cp -dr fonts/* $FONTDIR +fi if [ -n $LIBRARYDIR ]; then echo $LIBRARYDIR mkdir -p $LIBRARYDIR