.gear/rules | 2 + .../tags/938fc6dd9b132b4223f4bfe6969e57281fd3675b | 6 ++ .gear/tags/list | 1 + libfontenc.spec | 98 ++++++++++++++++++++++ src/fontenc.c | 30 ++++++- 5 files changed, 136 insertions(+), 1 deletion(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..f78a96e --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @name@-@version@:. +diff: @name@-@version@:. . diff --git a/.gear/tags/938fc6dd9b132b4223f4bfe6969e57281fd3675b b/.gear/tags/938fc6dd9b132b4223f4bfe6969e57281fd3675b new file mode 100644 index 0000000..8ee96db --- /dev/null +++ b/.gear/tags/938fc6dd9b132b4223f4bfe6969e57281fd3675b @@ -0,0 +1,6 @@ +object 3acba630d8b57084f7e92c15732408711ed5137a +type commit +tag libfontenc-1.1.2 +tagger Alan Coopersmith 1366948747 -0700 + +libfontenc-1.1.2 diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..bb3fcd8 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +938fc6dd9b132b4223f4bfe6969e57281fd3675b libfontenc-1.1.2 diff --git a/libfontenc.spec b/libfontenc.spec new file mode 100644 index 0000000..ed7a468 --- /dev/null +++ b/libfontenc.spec @@ -0,0 +1,98 @@ +Name: libfontenc +Version: 1.1.2 +Release: alt1 +Summary: The fontenc Library +License: MIT/X11 +Group: System/Libraries +Url: http://xorg.freedesktop.org +Packager: Valery Inozemtsev + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: xorg-font-utils xorg-util-macros xorg-xproto-devel zlib-devel + +%description +The fontenc Library + +%package devel +Summary: The fontenc Library and Header Files +Group: Development/C +Requires: %name = %version-%release +Conflicts: XFree86-devel < 4.4 xorg-x11-devel <= 6.9.0 + +%description devel +%name-devel contains the libraries and header files needed to +develop programs which make use of %name + +%prep +%setup -q +%patch -p1 + +%build +%autoreconf +%configure \ + --with-encodingsdir=%_datadir/X11/fonts/encodings \ + --disable-static +%make_build + +%install +%make DESTDIR=%buildroot install + +%files +%_libdir/*.so.* + +%files devel +%_includedir/X11/fonts +%_libdir/*.so +%_pkgconfigdir/*.pc + +%changelog +* Tue Jul 16 2013 Valery Inozemtsev 1.1.2-alt1 +- 1.1.2 + +* Sun Mar 04 2012 Valery Inozemtsev 1.1.1-alt1 +- 1.1.1 + +* Wed Apr 20 2011 Valery Inozemtsev 1.1.0-alt2 +- rebuild for debuginfo + +* Thu Oct 21 2010 Valery Inozemtsev 1.1.0-alt1 +- 1.1.0 + +* Fri Aug 28 2009 Valery Inozemtsev 1.0.5-alt1 +- 1.0.5 + +* Sun Nov 23 2008 Valery Inozemtsev 1.0.4-alt2 +- removed obsolete %%post_ldconfig/%%postun_ldconfig calls + +* Sat Dec 16 2006 Valery Inozemtsev 1.0.4-alt1 +- 1.0.4 + +* Sat Oct 14 2006 Valery Inozemtsev 1.0.3-alt1 +- 1.0.3 + +* Thu Apr 27 2006 Valery Inozemtsev 1.0.2-alt1 +- 1.0.2 + +* Fri Apr 21 2006 Valery Inozemtsev 1.0.1-alt5 +- CVS snapshot 2006-04-10 + +* Mon Jan 23 2006 Valery Inozemtsev 1.0.1-alt4 +- added requires to %name-devel from buildrequires + +* Fri Jan 20 2006 Valery Inozemtsev 1.0.1-alt3 +- fixed requires for %name-devel + +* Mon Jan 09 2006 Valery Inozemtsev 1.0.1-alt2 +- added cp1251 patch + +* Mon Dec 26 2005 Valery Inozemtsev 1.0.1-alt1 +- Xorg-7.0 + +* Sun Dec 04 2005 Valery Inozemtsev 0.99.3-alt1 +- Xorg-7.0RC3 + +* Mon Nov 21 2005 Valery Inozemtsev 0.99.2-alt0.1 +- initial build + diff --git a/src/fontenc.c b/src/fontenc.c index 4cfa1e5..0fb956e 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -401,7 +401,6 @@ static const unsigned short koi8_r_tophalf[]= static FontEncSimpleMapRec koi8_r_to_unicode_map= { 0x80, 0, 0x80, koi8_r_tophalf }; - static FontMapRec koi8_r[]= { {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,NULL, @@ -409,6 +408,34 @@ static FontMapRec koi8_r[]= {0,0,0,NULL,NULL,NULL,NULL,NULL} }; +static unsigned short cp1251_tophalf[]= +{ 0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021, + 0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F, + 0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0x0000, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F, + 0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7, + 0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407, + 0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7, + 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, + 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F}; + +static FontEncSimpleMapRec cp1251_to_unicode_map= +{ 0x80, 0, 0x80, cp1251_tophalf }; + +static FontMapRec cp1251[]= +{ + {FONT_ENCODING_UNICODE,0,0,FontEncSimpleRecode,0, + &cp1251_to_unicode_map,0}, + {0,0,0,0,0,0,0} +}; + static unsigned koi8_ru_to_unicode(unsigned koicode, void *client_data) { @@ -558,6 +585,7 @@ static FontEncRec initial_encodings[]= {"koi8-uni",NULL,256,0,koi8_uni,NULL,0,0}, /* Russian/Ukrainian/Bielorussian */ {"koi8-e",NULL,256,0,koi8_e,NULL,0,0}, /* ``European'' */ {"koi8-u",NULL,256,0,koi8_u,NULL,0,0}, /* Ukrainian too */ + {"microsoft-cp1251",0,256,0,cp1251,0,0,0}, /* MS Cyrillic */ {"microsoft-symbol",NULL,256,0,microsoft_symbol,NULL,0,0}, {"apple-roman",NULL,256,0,apple_roman,NULL,0,0}, {NULL,NULL,0,0,NULL,NULL,0,0}