summaryrefslogtreecommitdiff
path: root/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2007-06-23 15:36:58 +0000
committerHiroki Sato <hrs@FreeBSD.org>2007-06-23 15:36:58 +0000
commit74c54364eea7362dea93b2b55a52417db8489bb9 (patch)
treeb54f84c8a22f9f7ed05a4ab44b80285591e4b0a4 /textproc/xmlroff/files/patch-libfo::fo-doc-gp.c
parentFix manpage location. (diff)
Update to 0.5.0. Changes include:
- Does not require PangoXSL - Uses GOption instead of popt - Defaults to using compatibility stylesheet - xmlroff manpage in DocBook XML - Cairo backend is less experimental - Added Cairo backend SVG output that is really experimental - Added handling of base for relative URIs when '--compat' is used - Handles 'auto' for page width and height - Added '--compat' option for running compatibility stylesheet - Added '-w' option for setting warning mode - Added handling empty fo:wrapper - Simplified creating FoXmlDoc and running XSLT transformations - Removed support for SGML catalogs
Diffstat (limited to 'textproc/xmlroff/files/patch-libfo::fo-doc-gp.c')
-rw-r--r--textproc/xmlroff/files/patch-libfo::fo-doc-gp.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c b/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c
index 39368fbac1e3..d22088db10ae 100644
--- a/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c
+++ b/textproc/xmlroff/files/patch-libfo::fo-doc-gp.c
@@ -1,14 +1,14 @@
---- libfo/fo-doc-gp.c.orig Thu Mar 31 16:36:10 2005
-+++ libfo/fo-doc-gp.c Tue Jun 14 21:11:30 2005
-@@ -1143,6 +1143,7 @@
- gint y)
+--- libfo/fo-doc-gp.c.orig Sun Jul 23 05:13:09 2006
++++ libfo/fo-doc-gp.c Sat Aug 19 01:26:49 2006
+@@ -1237,6 +1237,7 @@
+ gint y)
{
PangoLayoutIter *iter;
+ gint line_number = -1;
g_return_if_fail (context != NULL);
g_return_if_fail (PANGO_IS_LAYOUT (layout));
-@@ -1152,7 +1153,6 @@
+@@ -1245,7 +1246,6 @@
iter = pango_layout_get_iter (layout);
@@ -16,41 +16,41 @@
do
{
PangoRectangle logical_rect;
-@@ -1202,6 +1202,9 @@
- gfloat x,
- gfloat y)
+@@ -1296,6 +1296,9 @@
+ gdouble x,
+ gdouble y)
{
-+ gfloat x1, x2, y1, y2;
-+ gint line_first, line_last;
++ gdouble x1, x2, y1, y2;
++ guint line_first, line_last;
+
g_return_if_fail (FO_IS_DOC_GP (fo_doc));
g_return_if_fail (FO_DOC_GP (fo_doc)->context != NULL);
g_return_if_fail (FO_IS_AREA_LAYOUT (area_layout));
-@@ -1213,9 +1216,9 @@
+@@ -1307,9 +1310,9 @@
* lines that are to be rendered.
*/
-- gfloat y1 = y;
+- gdouble y1 = y;
+ y1 = y;
-- gint line_first = fo_area_layout_get_line_first (area_layout);
+- guint line_first = fo_area_layout_get_line_first (area_layout);
+ line_first = fo_area_layout_get_line_first (area_layout);
if (line_first > 0)
{
y1 =
-@@ -1223,12 +1226,12 @@
+@@ -1317,12 +1320,12 @@
line_first - 1);
}
-- gint line_last = fo_area_layout_get_line_last (area_layout);
-- gfloat y2 =
+- guint line_last = fo_area_layout_get_line_last (area_layout);
+- gdouble y2 =
+ line_last = fo_area_layout_get_line_last (area_layout);
+ y2 =
y1 - fo_area_layout_get_line_height (area_layout,
line_last);
-- gfloat x2 =
+- gdouble x2 =
+ x2 =
x + fo_area_area_get_width (area_layout);
- gnome_print_gsave (FO_DOC_GP(fo_doc)->context);
+ #if ENABLE_CLIP