From 0bab86b3e25de6a7fd454127e21a7074346e96d3 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 29 Jun 2020 03:03:16 +0000 Subject: CTAN sync 202006290303 --- fonts/libertinus-fonts/CONTRIBUTING.md | 86 + fonts/libertinus-fonts/CONTRIBUTING.txt | 21 - fonts/libertinus-fonts/FONTLOG.txt | 21 +- .../LibertinusKeyboard-Regular.otf | Bin 181064 -> 53956 bytes fonts/libertinus-fonts/LibertinusMath-Regular.otf | Bin 841272 -> 512780 bytes fonts/libertinus-fonts/LibertinusMono-Regular.otf | Bin 106592 -> 58296 bytes fonts/libertinus-fonts/LibertinusSans-Bold.otf | Bin 519552 -> 272824 bytes fonts/libertinus-fonts/LibertinusSans-Italic.otf | Bin 509484 -> 286132 bytes fonts/libertinus-fonts/LibertinusSans-Regular.otf | Bin 496504 -> 254428 bytes fonts/libertinus-fonts/LibertinusSerif-Bold.otf | Bin 544712 -> 279816 bytes .../LibertinusSerif-BoldItalic.otf | Bin 419320 -> 237260 bytes fonts/libertinus-fonts/LibertinusSerif-Italic.otf | Bin 563644 -> 315896 bytes fonts/libertinus-fonts/LibertinusSerif-Regular.otf | Bin 588156 -> 298224 bytes .../libertinus-fonts/LibertinusSerif-Semibold.otf | Bin 543700 -> 274692 bytes .../LibertinusSerif-SemiboldItalic.otf | Bin 592780 -> 328124 bytes .../LibertinusSerifDisplay-Regular.otf | Bin 520644 -> 254740 bytes .../LibertinusSerifInitials-Regular.otf | Bin 153708 -> 84312 bytes fonts/libertinus-fonts/OFL.txt | 2 +- fonts/libertinus-fonts/README.md | 35 + fonts/libertinus-fonts/README.txt | 45 - .../libertinus-fonts/documentation/Math-Sample.pdf | Bin 161982 -> 160836 bytes .../documentation/Opentype-Features.pdf | Bin 128345 -> 91660 bytes fonts/libertinus-fonts/documentation/preview.svg | 2774 ++++++++++---------- 23 files changed, 1526 insertions(+), 1458 deletions(-) create mode 100644 fonts/libertinus-fonts/CONTRIBUTING.md delete mode 100644 fonts/libertinus-fonts/CONTRIBUTING.txt create mode 100644 fonts/libertinus-fonts/README.md delete mode 100644 fonts/libertinus-fonts/README.txt (limited to 'fonts/libertinus-fonts') diff --git a/fonts/libertinus-fonts/CONTRIBUTING.md b/fonts/libertinus-fonts/CONTRIBUTING.md new file mode 100644 index 0000000000..976cdf9d30 --- /dev/null +++ b/fonts/libertinus-fonts/CONTRIBUTING.md @@ -0,0 +1,86 @@ +Contributing +------------ + +To build the fonts, you need [GNU Make][make] and [Python 3.6+][python], as well +as [a few Python packages](requirements.txt). The cleanest way to install the +Python dependencies is to use a [virtual environment][venv]: + + python3 -m venv libertinus-env + . libertinus-env/bin/activate + pip install -r requirements.txt + +(There are also [optional dependencies](#optional-dependencies) which are not +required for the basic contribution flow.) + +The source files are under the `sources` subdirectory. The `.sfd` files are +FontForge source font format and should be edited with [FontForge][fontforge]. +The `.fea` files are [OpenType feature files][fea] and should be edited by a +plain text editor. + +After modifying the `.sfd` files, and before committing the changes, they must +be normalized with: + + make normalize + +We keep the generated fonts under version control, so the last step is to run: + + make + +Which will build the `.otf` font files that should be committed as well. + +Fonts must be generated for each commit that changes the source files. The +build tools are smart enough to not change the binary fonts if the sources were +not changed. + +### Optional dependencies + +The build process, besides generating the `.otf` font files, also updates the +SVG and PDF preview documents. For that, additional tools are needed: `xelatex` +from [xetex][], and `mutool` from [mupdf][] (version 1.15.0 or above). The +`make` command will emit errors if these are not present, but as long as the +font generation stages finish correctly, these errors can be ignored. However, +if you do wish to update the preview files, these tools must also be installed. + +#### Linux + +On most Linux distros, the `xelatex` binary is provided by the +[`texlive-xetex` package][repology-xetex], and the `mutool` binary by +[`mupdf-tools` or `mupdf`][repology-mupdf]. +In Ubuntu, for example, these packages can be installed with: + + sudo apt install texlive-xetex mupdf-tools + +**Note:** the command example above installs an unsupported version of +`mupdf-tools` in Ubuntu versions older than 19.10 (Eoan Ermine), which is the +first one that [included][ubuntu-mupdf] the 1.15.0 release of `mupdf-tools`. +If your distro has an older version, you may consider using the [Linuxbrew][] +package manager instead to install `mupdf-tools`: + + brew install mupdf-tools + +#### macOS + +On macOS, [Homebrew][] can be used to install `mupdf-tools`: + + brew install mupdf-tools + +On the other hand, `xelatex` is not provided as a stand-alone formula. The +simplest way to obtain it is to install the [basictex][] cask, and then link +the `xelatex` binary within it from a location accessible in the `PATH`: + + brew cask install basictex + ln -s /usr/local/texlive/*/bin/x86_64-darwin/xelatex /usr/local/bin/xelatex + +[make]: https://www.gnu.org/software/make/ +[python]: https://www.python.org +[venv]: https://packaging.python.org/guides/installing-using-pip-and-virtual-environments/ +[fontforge]: https://fontforge.org +[fea]: https://adobe-type-tools.github.io/afdko/OpenTypeFeatureFileSpecification.html +[xetex]: http://xetex.sourceforge.net +[mupdf]: https://mupdf.com +[repology-xetex]: https://repology.org/project/texlive:xetex/versions +[repology-mupdf]: https://repology.org/project/mupdf/versions +[ubuntu-mupdf]: https://packages.ubuntu.com/eoan/mupdf-tools +[linuxbrew]: https://docs.brew.sh/Homebrew-on-Linux +[homebrew]: https://brew.sh +[basictex]: https://formulae.brew.sh/cask/basictex diff --git a/fonts/libertinus-fonts/CONTRIBUTING.txt b/fonts/libertinus-fonts/CONTRIBUTING.txt deleted file mode 100644 index dbdaf099bf..0000000000 --- a/fonts/libertinus-fonts/CONTRIBUTING.txt +++ /dev/null @@ -1,21 +0,0 @@ -Contributing ------------- - -The source files are under the `sources` subdirectory. The `.sfd` files are -FontForge source font format and should be edited with FontForge. The `.fea` -files are Adobe feature files and should be edited by a plain text editor. - -After modifying the SFD files, they must be normalized with: - - make normalize - -(Make sure to save a copy of the SFD files before running this tool. The -simplest way is to commit the SFD files, normalize, check the diffs and verify -they are OK, then `git commit --amend` the changes). - -We keep the generated fonts under version control, so the last step is to run -`make` and commit the modified sources and the generated fonts. - -Fonts must be generated for each commit that changes the source files. The -build tools are smart enough to not change the binary fonts if the sources were -not changed. diff --git a/fonts/libertinus-fonts/FONTLOG.txt b/fonts/libertinus-fonts/FONTLOG.txt index f736f01c5a..8baa8fe050 100644 --- a/fonts/libertinus-fonts/FONTLOG.txt +++ b/fonts/libertinus-fonts/FONTLOG.txt @@ -38,13 +38,26 @@ and OFL-FAQ.txt files. The OFL-FAQ also gives a very general rationale and various recommendations regarding why you would want to contribute to the project or make your own version of the font. -See the project website for the current master and the various branches: +See the project website for the current development version: https://github.com/alif-type/libertinus ChangeLog --------- +28 June 2020 (Khaled Hosny) Version 6.12 +- Increase right side bearing of math italic R’s (#304). +- Add glyph variants for floor and ceiling, to make their sizing consistent + with other delimiters. +- Remove kerning and other glyph positioning features, combining marks and + other non-keycap glyphs from Libertinus Keyboard font. +- Fix size and shape of U+2639, U+263A and U+263B (frowning & smiling faces). +- Add “smcp”/“c2sc” variants for letters with macron (#303). +- Make U+2223-2226 the same hight as bar (#324). +- Drop “sinf” feature, it just duplicates “subs” feature. +- Improve sizing and spacing of math over accents. +- Building the fonts no longer use FontForge. + 8 March 2020 (Khaled Hosny) Version 6.11 - Added turned capital F (U+2132) to Libertinus Serif Regular. - Fix advance width for Serbian alternate U+0431 in Libertinus Serif Semibold. @@ -56,7 +69,7 @@ ChangeLog - Various cleanups to Libertinus Mono font, removing erroneous glyphs and unsuitable features. - Improve the metrics of math italic v, w, and y. -- Work around a bug in old versions of FreeType when rendering Linertinus Sans +- Work around a bug in old versions of FreeType when rendering Libertinus Sans Italic m. - Fix alignment of multiplication sign in Libertinus Serif and Mono Regular fonts. @@ -71,7 +84,7 @@ ChangeLog FontForge's own OpenType layout support. - Various internal cleanups. - Drop "case", "frac", "tnum" and "pnum" features from the Libertinus Mono - font, they either were broken or not appropriate for a monospace font. + font, they either were broken or not appropriate for a monospace font. 27 May 2019 (Khaled Hosny) Version 6.9 - Many mathematical operator in Libertinus Math were scaled up and redesigned @@ -232,7 +245,7 @@ ChangeLog First release of the forked Libertine fonts, changes since the fork include: - New Libertine Math font. - Dropped the use of Unicode PUA for alternate glyphs in favour of making them - encoded. + encoded. - Dropped the TrueType versions of the fonts. - Dropped the Romanian-specific cedilla/comma substitution, it is no longer recommended to do this at font feature level. diff --git a/fonts/libertinus-fonts/LibertinusKeyboard-Regular.otf b/fonts/libertinus-fonts/LibertinusKeyboard-Regular.otf index e37966b9c9..d551e6ad6c 100644 Binary files a/fonts/libertinus-fonts/LibertinusKeyboard-Regular.otf and b/fonts/libertinus-fonts/LibertinusKeyboard-Regular.otf differ diff --git a/fonts/libertinus-fonts/LibertinusMath-Regular.otf b/fonts/libertinus-fonts/LibertinusMath-Regular.otf index 5c1a761c65..4e3c668fe9 100644 Binary files a/fonts/libertinus-fonts/LibertinusMath-Regular.otf and b/fonts/libertinus-fonts/LibertinusMath-Regular.otf differ diff --git a/fonts/libertinus-fonts/LibertinusMono-Regular.otf b/fonts/libertinus-fonts/LibertinusMono-Regular.otf index de91ad2e74..5cf805fe5d 100644 Binary files a/fonts/libertinus-fonts/LibertinusMono-Regular.otf and b/fonts/libertinus-fonts/LibertinusMono-Regular.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSans-Bold.otf b/fonts/libertinus-fonts/LibertinusSans-Bold.otf index 62678a9072..cae08b8654 100644 Binary files a/fonts/libertinus-fonts/LibertinusSans-Bold.otf and b/fonts/libertinus-fonts/LibertinusSans-Bold.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSans-Italic.otf b/fonts/libertinus-fonts/LibertinusSans-Italic.otf index 20c2ce5431..5131cf2bf9 100644 Binary files a/fonts/libertinus-fonts/LibertinusSans-Italic.otf and b/fonts/libertinus-fonts/LibertinusSans-Italic.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSans-Regular.otf b/fonts/libertinus-fonts/LibertinusSans-Regular.otf index 83a8a2edc9..d88c11379b 100644 Binary files a/fonts/libertinus-fonts/LibertinusSans-Regular.otf and b/fonts/libertinus-fonts/LibertinusSans-Regular.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSerif-Bold.otf b/fonts/libertinus-fonts/LibertinusSerif-Bold.otf index 7acd519775..39a8ee5e1f 100644 Binary files a/fonts/libertinus-fonts/LibertinusSerif-Bold.otf and b/fonts/libertinus-fonts/LibertinusSerif-Bold.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSerif-BoldItalic.otf b/fonts/libertinus-fonts/LibertinusSerif-BoldItalic.otf index a7465fad8a..d63f36e2e9 100644 Binary files a/fonts/libertinus-fonts/LibertinusSerif-BoldItalic.otf and b/fonts/libertinus-fonts/LibertinusSerif-BoldItalic.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSerif-Italic.otf b/fonts/libertinus-fonts/LibertinusSerif-Italic.otf index 812abff7e5..ddf1996b4a 100644 Binary files a/fonts/libertinus-fonts/LibertinusSerif-Italic.otf and b/fonts/libertinus-fonts/LibertinusSerif-Italic.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSerif-Regular.otf b/fonts/libertinus-fonts/LibertinusSerif-Regular.otf index 8b8895fb11..e42f25c544 100644 Binary files a/fonts/libertinus-fonts/LibertinusSerif-Regular.otf and b/fonts/libertinus-fonts/LibertinusSerif-Regular.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSerif-Semibold.otf b/fonts/libertinus-fonts/LibertinusSerif-Semibold.otf index 1180c668e6..4d3a0268b4 100644 Binary files a/fonts/libertinus-fonts/LibertinusSerif-Semibold.otf and b/fonts/libertinus-fonts/LibertinusSerif-Semibold.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf b/fonts/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf index eb5490dee2..df0e632794 100644 Binary files a/fonts/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf and b/fonts/libertinus-fonts/LibertinusSerif-SemiboldItalic.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSerifDisplay-Regular.otf b/fonts/libertinus-fonts/LibertinusSerifDisplay-Regular.otf index deb0dd430f..9972f95394 100644 Binary files a/fonts/libertinus-fonts/LibertinusSerifDisplay-Regular.otf and b/fonts/libertinus-fonts/LibertinusSerifDisplay-Regular.otf differ diff --git a/fonts/libertinus-fonts/LibertinusSerifInitials-Regular.otf b/fonts/libertinus-fonts/LibertinusSerifInitials-Regular.otf index 5c3cf725c8..7c1fc436bc 100644 Binary files a/fonts/libertinus-fonts/LibertinusSerifInitials-Regular.otf and b/fonts/libertinus-fonts/LibertinusSerifInitials-Regular.otf differ diff --git a/fonts/libertinus-fonts/OFL.txt b/fonts/libertinus-fonts/OFL.txt index 499c48b950..5da2f5c078 100644 --- a/fonts/libertinus-fonts/OFL.txt +++ b/fonts/libertinus-fonts/OFL.txt @@ -19,7 +19,7 @@ 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, +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 diff --git a/fonts/libertinus-fonts/README.md b/fonts/libertinus-fonts/README.md new file mode 100644 index 0000000000..2cec8ddcee --- /dev/null +++ b/fonts/libertinus-fonts/README.md @@ -0,0 +1,35 @@ +[![Build Status](https://travis-ci.com/alif-type/libertinus.svg?branch=main)](https://travis-ci.com/alif-type/libertinus) + +Libertinus fonts +================ + +![Sample of Libertinus fonts](preview.svg) + +The Libertinus fonts project is a fork of the [Linux Libertine][1] and Linux +Biolinum fonts. It started as an OpenType math companion of the Libertine font +family, and has grown to a full fork to address some of the bugs in the fonts. +Thanks to Frédéric Wang for coming up with the name Libertinus. + +Libertinus was forked from the [5.3.0 (2012-07-02) release][2] of Linux +Libertine fonts. + +The family consists of: + +* Libertinus Serif: forked from *Linux Libertine*. +* Libertinus Sans: forked from *Linux Biolinum*. +* Libertinus Mono: forked from *Linux Libertine Mono*. +* Libertinus Math: an OpenType math font for use in OpenType math-capable + applications (like LuaTeX, XeTeX or MS Word 2007+). + +Libertinus fonts are available under the terms of the Open Font License version +1.1. + +A zip file containing the font files can be downloaded from the “[Releases][3]” +page of the project on GitHub. + +See the [`CONTRIBUTING.md`](CONTRIBUTING.md) file +for instructions on how to build the fonts and contribute any changes. + +[1]: https://en.wikipedia.org/wiki/Linux_Libertine +[2]: https://sourceforge.net/projects/linuxlibertine/files/linuxlibertine/ +[3]: https://github.com/alif-type/libertinus/releases diff --git a/fonts/libertinus-fonts/README.txt b/fonts/libertinus-fonts/README.txt deleted file mode 100644 index ee23aef51f..0000000000 --- a/fonts/libertinus-fonts/README.txt +++ /dev/null @@ -1,45 +0,0 @@ -[![Build Status](https://travis-ci.org/alif-type/libertinus.svg?branch=master)](https://travis-ci.org/alif-type/libertinus) - -Libertinus fonts -================ - -![Sample of Libertinus fonts](documentation/preview.svg) - -***This project is in maintenance mode. Only bug reports will be considered, or -feature requests accompanied by pull requests.*** - -Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts that -started as an OpenType math companion of the Libertine font family. It has grown -to a full fork to address some of the bugs in the fonts. Thanks to Frédéric -Wang for coming up with the name Libertinus. - -Libertinus was forked from the 5.3.0 (2012-07-02) release of Linux Libertine fonts. - -The family consists of: - -* Libertinus Serif: forked from *Linux Libertine*. -* Libertinus Sans: forked from *Linux Biolinum*. -* Libertinus Mono: forked from *Linux Libertine Mono*. -* Libertinus Math: an OpenType math font for use in OpenType math-capable - applications (like LuaTeX, XeTeX or MS Word 2007+). - -Libertinus fonts are available under the terms of the Open Font License version -1.1. - -A zip file containing the font files can be downloaded from the -“[Releases](https://github.com/alif-type/libertinus/releases)” page -of the project on GitHub. - -Building --------- -To build the fonts, you need GNU Make, [FontForge][1] with Python support, the -[FontTools][2] Python module, and the [pcpp][3] Python module. The latest -versions of FontForge and FontTools are preferred. - -To build the fonts: - - make - -[1]: https://fontforge.github.io -[2]: https://github.com/fonttools/fonttools -[3]: https://github.com/ned14/pcpp diff --git a/fonts/libertinus-fonts/documentation/Math-Sample.pdf b/fonts/libertinus-fonts/documentation/Math-Sample.pdf index 9b5a1d4a5c..a2aa14e871 100644 Binary files a/fonts/libertinus-fonts/documentation/Math-Sample.pdf and b/fonts/libertinus-fonts/documentation/Math-Sample.pdf differ diff --git a/fonts/libertinus-fonts/documentation/Opentype-Features.pdf b/fonts/libertinus-fonts/documentation/Opentype-Features.pdf index db83ed8fa2..1102ad6d27 100644 Binary files a/fonts/libertinus-fonts/documentation/Opentype-Features.pdf and b/fonts/libertinus-fonts/documentation/Opentype-Features.pdf differ diff --git a/fonts/libertinus-fonts/documentation/preview.svg b/fonts/libertinus-fonts/documentation/preview.svg index 582a5d5d67..d070c7c121 100644 --- a/fonts/libertinus-fonts/documentation/preview.svg +++ b/fonts/libertinus-fonts/documentation/preview.svg @@ -2,699 +2,699 @@ - + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - + - - + + - + - + - - + + - - + + - + - - + + - + - + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - + - + - - + + - - + + - - + + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -706,7 +706,7 @@ - + @@ -726,876 +726,876 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - - + + - + - + - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - + - - + + - + - - + + - + - + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1621,294 +1621,294 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - + - - - - - - + + + + + + - - - + + + - - - + + + - - - + + + - - + + - - - - + + + + - + - - - - - - - - + + + + + + + + - - - - + + + + - + - - + + - + - - + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - - - - + + + + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - + + + + + + + - + - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - + + - - - - + + + + - + -- cgit v1.2.3