diffstat for xgridfit-2.2a xgridfit-2.3 ChangeLog | 7 ++++ Makefile | 4 +- debian/changelog | 6 +++ debian/control | 6 +-- docs/index.html | 2 - docs/reference.html | 80 ++++++++++++++++++++++++++++++++++++------------ lib/arithmetic.xsl | 2 - lib/delta.xsl | 2 - lib/expressions.xsl | 2 - lib/flow.xsl | 2 - lib/func-predef.xsl | 2 - lib/function.xsl | 22 ++++++++++++- lib/graphics.xsl | 2 - lib/measure.xsl | 2 - lib/messages.xsl | 2 - lib/misc.xsl | 2 - lib/move-els.xsl | 2 - lib/move-lib.xsl | 2 - lib/numbers.xsl | 2 - lib/points.xsl | 2 - lib/prep.xsl | 2 - lib/primitives.xsl | 2 - lib/xgridfit-debug.xsl | 2 - lib/xgridfit-merge.xsl | 2 - lib/xgridfit-python.xsl | 2 - lib/xgridfit.xsl | 2 - schemas/xgridfit.rnc | 4 +- schemas/xgridfit.rng | 10 ++---- schemas/xgridfit.xsd | 8 +--- version.mk | 2 - 30 files changed, 129 insertions(+), 60 deletions(-) diff -Nru xgridfit-2.2a/ChangeLog xgridfit-2.3/ChangeLog --- xgridfit-2.2a/ChangeLog 2010-03-30 16:56:00.000000000 +0000 +++ xgridfit-2.3/ChangeLog 2011-06-04 15:11:50.000000000 +0000 @@ -1,3 +1,10 @@ +2011-06-04 Peter Baker + + * Makefile: Minor message change. + + * xgridfit.rnc, xgridfit.rng, xgridfit.xsd: set-dropout-control + threshold max is 255. + 2010-03-30 Peter Baker * Makefile: added --root option to setup.py install diff -Nru xgridfit-2.2a/Makefile xgridfit-2.3/Makefile --- xgridfit-2.2a/Makefile 2010-03-30 15:58:56.000000000 +0000 +++ xgridfit-2.3/Makefile 2010-03-31 16:52:39.000000000 +0000 @@ -34,7 +34,7 @@ sed -i -e "s|@xgridfit_dir@|${MAINDIR}|g" -e "s|@version@|$(VERSION)|" -e \ "s|@python_prog@|$$PYTHONPROG|" $$file ; done ; \ else \ - echo "Python is required for getinstrs; it will not be installed." ; \ + echo "Python is required for xgridfit." ; \ rm -f $(DESTDIR)$(BINDIR)/{ttx2xgf,xgfconfig,xgfmerge,xgfupdate,xgridfit,getinstrs} ; \ fi @install -d -m 0755 $(DESTDIR)$(MAINDIR)/{lib,schemas,utils} @@ -60,7 +60,7 @@ sed -i "" -e "s|@xgridfit_dir@|${MAINDIR}|g" -e "s|@version@|$(VERSION)|" -e \ "s|@python_prog@|$$PYTHONPROG|" $$file ; done ; \ else \ - echo "Python is required for getinstrs; it will not be installed." ; \ + echo "Python is required for xgridfit." ; \ rm -f $(DESTDIR)$(BINDIR)/{ttx2xgf,xgfconfig,xgfmerge,xgfupdate,xgridfit,getinstrs} ; \ fi @install -d -m 0755 $(DESTDIR)$(MAINDIR)/{lib,schemas,utils} diff -Nru xgridfit-2.2a/debian/changelog xgridfit-2.3/debian/changelog --- xgridfit-2.2a/debian/changelog 2011-05-27 14:17:19.000000000 +0000 +++ xgridfit-2.3/debian/changelog 2012-12-31 17:42:26.000000000 +0000 @@ -1,3 +1,9 @@ +xgridfit (2.3-SprezzOS1) unstable; urgency=low + + * New upstream version 2.3 + + -- Nick Black Mon, 31 Dec 2012 12:41:14 -0500 + xgridfit (2.2a-2) unstable; urgency=low [ Sven Hoexter ] diff -Nru xgridfit-2.2a/debian/control xgridfit-2.3/debian/control --- xgridfit-2.2a/debian/control 2010-07-30 10:42:17.000000000 +0000 +++ xgridfit-2.3/debian/control 2012-12-31 17:42:26.000000000 +0000 @@ -1,13 +1,13 @@ Source: xgridfit Section: fonts Priority: optional -Maintainer: Debian Fonts Task Force -Uploaders: Kęstutis Biliūnas +Maintainer: Nick Black +XSBC-Original-Maintainer: Debian Fonts Task Force Dm-Upload-Allowed: yes XS-Python-Version: >= 2.6 Build-Depends: debhelper (>= 7.0.50~) Build-Depends-Indep: python, python-support -Standards-Version: 3.8.4 +Standards-Version: 3.9.4 Homepage: http://xgridfit.sourceforge.net/ Vcs-svn: svn://svn.debian.org/pkg-fonts/packages/xgridfit/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-fonts/packages/xgridfit/ diff -Nru xgridfit-2.2a/docs/index.html xgridfit-2.3/docs/index.html --- xgridfit-2.2a/docs/index.html 2010-03-30 16:56:49.000000000 +0000 +++ xgridfit-2.3/docs/index.html 2011-06-04 15:46:42.000000000 +0000 @@ -18,7 +18,7 @@ src="http://sflogo.sourceforge.net/sflogo.php?group_id=159705&type=4" width="125" height="37" border="0" alt="SourceForge.net Logo" /> Project Page - Download (v. 2.2a, 29 Mar. 2010) + Download (v. 2.3, 4 June 2011) CVS repository Mailing list
diff -Nru xgridfit-2.2a/docs/reference.html xgridfit-2.3/docs/reference.html --- xgridfit-2.2a/docs/reference.html 2009-12-20 14:19:04.000000000 +0000 +++ xgridfit-2.3/docs/reference.html 2010-04-02 16:25:41.000000000 +0000 @@ -3557,52 +3557,91 @@

<set-dropout-type>

Sets dropout type. The Apple + href="http://www.microsoft.com/typography/otspec/ttinst.htm">Microsoft TrueType Reference describes the action of the possible values as follows:

  • - if n=0 rules 1 and 2 are invoked (dropout control scan - conversion including stubs) + if n=0 rules 1 and 2, and 3 are invoked (dropout control + scan conversion including stubs)
  • - if n=1 rules 1 and 3 are invoked (dropout control scan + if n=1 rules 1, 2 and 4 are invoked (dropout control scan conversion excluding stubs)
  • - if n=2 rule 1 is invoked (fast scan conversion) + if n=2 rules 1 and 2 only are invoked (fast scan conversion; + dropout control turned off) +
    • +
  • + if n=3 same as n = 2 +
    • +
  • + if n = 4 rules 1, 2, and 5 are invoked (smart dropout + control scan conversion including stubs) +
    • +
  • + if n = 5 rules 1, 2, and 6 are invoked (smart dropout + control scan conversion excluding stubs) +
    • +
  • + if n = 6 same as n = 2 +
    • +
  • + if n = 7 same as n = 2

The scan conversion rules are shown here:

-
Rule 1
+
Rule 1
- If a pixel's center falls within or on the glyph outline, - that pixel is turned on and becomes part of that glyph. + If a pixel’s center falls within the glyph outline, that + pixel is turned on.
-
Rule 2
+
Rule 2
- If a scan line between two adjacent pixel centers (either + If a contour falls exactly on a pixel’s center, that pixel is turned on. +
+
Rule 3
+
+ If a scan line between two adjacent pixel centers (either vertical or horizontal) is intersected by both an on-Transition contour and an off-Transition contour and - neither of the pixels was already turned on by rule 1, turn - on the left-most pixel (horizontal scan line) or the - bottom-most pixel (vertical scan line) + neither of the pixels was already turned on by rules 1 and + 2, turn on the left-most pixel (horizontal scan line) or the + bottom-most pixel (vertical scan line). This is “Simple” + dropout control.
-
Rule 3
+
Rule 4
- Apply Rule 2 only if the two contours continue to intersect + Apply Rule 3 only if the two contours continue to intersect other scan lines in both directions. That is, do not turn on - pixels for 'stubs'. The scanline segments that form a square + pixels for ‘stubs.’ The scanline segments that form a square with the intersected scan line segment are examined to - verify that they are intersected by two contours. It is + verify that they are intersected by two contours. It is possible that these could be different contours than the - ones intersecting the dropout scan line segment. This is + ones intersecting the dropout scan line segment. This is very unlikely but may have to be controlled with - grid-fitting in some exotic glyphs. + grid-fitting in some exotic glyphs. +
+
Rule 5
+
+ If a scan line between two adjacent pixel centers (either + vertical or horizontal) is intersected by both an + on-Transition contour and an off-Transition contour and + neither of the pixels was already turned on by rules 1 and + 2, turn on the pixel which is closer to the midpoint between + the on-Transition contour and off-Transition contour. This + is “Smart” dropout control. +
+
Rule 6
+
+ Apply Rule 5 only if the two contours continue to intersect + other scan lines in both directions. That is, do not turn on + pixels for ‘stubs.’
@@ -3613,7 +3652,8 @@
value
- Required. Possible values are "0", "1" and "2". + Required. Possible values are from "0" to "7," with meanings + as described above.
diff -Nru xgridfit-2.2a/lib/arithmetic.xsl xgridfit-2.3/lib/arithmetic.xsl --- xgridfit-2.2a/lib/arithmetic.xsl 2010-03-28 17:39:05.000000000 +0000 +++ xgridfit-2.3/lib/arithmetic.xsl 2011-06-04 15:23:19.000000000 +0000 @@ -6,7 +6,7 @@ diff -Nru xgridfit-2.2a/lib/expressions.xsl xgridfit-2.3/lib/expressions.xsl --- xgridfit-2.2a/lib/expressions.xsl 2010-03-28 17:39:05.000000000 +0000 +++ xgridfit-2.3/lib/expressions.xsl 2011-06-04 15:23:19.000000000 +0000 @@ -4,7 +4,7 @@ diff -Nru xgridfit-2.2a/lib/func-predef.xsl xgridfit-2.3/lib/func-predef.xsl --- xgridfit-2.2a/lib/func-predef.xsl 2010-03-28 17:39:05.000000000 +0000 +++ xgridfit-2.3/lib/func-predef.xsl 2011-06-04 15:23:19.000000000 +0000 @@ -3,7 +3,7 @@ @@ -35,6 +35,26 @@ + + + + + + + + + + + + + + + + $$no-value$$ + + + diff -Nru xgridfit-2.2a/lib/graphics.xsl xgridfit-2.3/lib/graphics.xsl --- xgridfit-2.2a/lib/graphics.xsl 2010-03-28 17:39:05.000000000 +0000 +++ xgridfit-2.3/lib/graphics.xsl 2011-06-04 15:23:20.000000000 +0000 @@ -6,7 +6,7 @@ diff -Nru xgridfit-2.2a/lib/move-els.xsl xgridfit-2.3/lib/move-els.xsl --- xgridfit-2.2a/lib/move-els.xsl 2010-03-28 17:39:05.000000000 +0000 +++ xgridfit-2.3/lib/move-els.xsl 2011-06-04 15:23:20.000000000 +0000 @@ -5,7 +5,7 @@ diff -Nru xgridfit-2.2a/lib/move-lib.xsl xgridfit-2.3/lib/move-lib.xsl --- xgridfit-2.2a/lib/move-lib.xsl 2010-03-28 17:39:05.000000000 +0000 +++ xgridfit-2.3/lib/move-lib.xsl 2011-06-04 15:23:20.000000000 +0000 @@ -5,7 +5,7 @@ diff -Nru xgridfit-2.2a/lib/primitives.xsl xgridfit-2.3/lib/primitives.xsl --- xgridfit-2.2a/lib/primitives.xsl 2010-03-28 17:39:05.000000000 +0000 +++ xgridfit-2.3/lib/primitives.xsl 2011-06-04 15:23:20.000000000 +0000 @@ -6,7 +6,7 @@ diff -Nru xgridfit-2.2a/lib/xgridfit-debug.xsl xgridfit-2.3/lib/xgridfit-debug.xsl --- xgridfit-2.2a/lib/xgridfit-debug.xsl 2010-03-28 17:39:05.000000000 +0000 +++ xgridfit-2.3/lib/xgridfit-debug.xsl 2011-06-04 15:23:20.000000000 +0000 @@ -10,7 +10,7 @@