Stuart, Edd,
On 16/02/2019 20:31, Alessandro DE LAURENZIS wrote:
[...]
While there:
- yet another tabs tweak;
- added IPEDOCDIR to MAKE_FLAGS (it was already in FAKE_FLAGS),
otherwise the "Ipe manual" item in the help menu doesn't work.
Following Stuart's suggestion not to mix port's update and style tiding,
I'm attaching an updated diff with no whitespace changes which I hope is
more easy to read.
Please let me know if it is ok.
All the best
--
Alessandro DE LAURENZIS
[mailto:jus...@atlantide.t28.net]
Web: http://www.atlantide.t28.net
LinkedIn: https://www.linkedin.com/in/delaurenzis/
? sysclean.sh
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ipe/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile 24 Oct 2018 14:28:05 -0000 1.16
+++ Makefile 24 Feb 2019 09:07:00 -0000
@@ -2,11 +2,10 @@
COMMENT = extensible drawing editor
-V = 7.1.2
+V = 7.2.9
SUBST_VARS += V
DISTNAME = ipe-${V}-src
PKGNAME = ipe-${V}
-REVISION = 9
# their libraries would be installed as libxxx.so.${V}, overide this.
SHLIB_VERSION = 0.0
@@ -18,26 +17,28 @@ SHARED_LIBS += ipelua ${SHLIB_VERSION}
SHARED_LIBS += ipeui ${SHLIB_VERSION}
CATEGORIES = graphics math
-HOMEPAGE = http://ipe7.sourceforge.net/
-MAINTAINER = Edd Barrett <e...@openbsd.org>
+HOMEPAGE = http://ipe.otfried.org/
+MAINTAINER = Alessandro De Laurenzis <jus...@atlantide.t28.net>
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL QtGui X11 Xrender c cairo expat fontconfig freetype
-WANTLIB += glib-2.0 gobject-2.0 ${MODLUA_WANTLIB} iconv intl m pixman-1 png
-WANTLIB += pthread ${COMPILER_LIBCXX} xcb xcb-render xcb-shm
-WANTLIB += z
+WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} Qt5Core Qt5Gui
+WANTLIB += Qt5Widgets c cairo freetype iconv jpeg m png16 pthread z
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ipe7/}
+MASTER_SITES = https://dl.bintray.com/otfried/generic/ipe/${V:R}/
# Dependencies
MODULES = lang/lua \
- x11/qt4
+ x11/qt5
+
+MODLUA_VERSION = 5.3
+MODLUA_SA = Yes
+
LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \
- ${MODQT4_LIB_DEPENDS}
+ ${MODQT5_LIB_DEPENDS}
RUN_DEPENDS = print/texlive/base \
x11/xvkbd
@@ -46,8 +47,11 @@ MAKE_FLAGS += CXX="${CXX}" \
IPE_USE_ICONV=-DIPE_USE_ICONV \
ICONV_CFLAGS=-I${LOCALBASE}/include \
ICONV_LIBS="-L${LOCALBASE}/lib -liconv" \
- SHLIB_VERSION=${SHLIB_VERSION}
-MAKE_ENV += PKG_CONFIG_PATH=${LOCALBASE}/lib/qt4/pkgconfig
+ SHLIB_VERSION=${SHLIB_VERSION} \
+ JPEG_CFLAGS=-I${LOCALBASE}/include \
+ IPEDOCDIR=${PREFIX}/share/doc/ipe \
+ DL_LIBS=""
+MAKE_ENV += PKG_CONFIG_PATH=${LOCALBASE}/lib/qt5/pkgconfig
FAKE_FLAGS += INSTALL_ROOT=${WRKINST} \
SHLIB_VERSION=${SHLIB_VERSION} \
IPEMANDIR=${PREFIX}/man/man1 \
@@ -55,14 +59,12 @@ FAKE_FLAGS += INSTALL_ROOT=${WRKINST} \
USE_GMAKE = Yes
NO_TEST = Yes
+UPDATE_PLIST_ARGS += -i MODLUA_DEP_VERSION
WRKDIST = ${WRKDIR}/${PKGNAME}
WRKSRC = ${WRKDIST}/src
-post-install:
- sed -i "s,/usr/share/,${LOCALBASE}/share/," \
- ${WRKDIST}/fontmaps/texlive-fontmap.xml
- ${INSTALL_DATA} -c ${WRKDIST}/fontmaps/texlive-fontmap.xml \
- ${PREFIX}/share/ipe/7.1.2/fontmap.xml
+pre-build:
+ ${SUBST_CMD} ${WRKSRC}/config.mak
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ipe/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:14:10 -0000 1.2
+++ distinfo 24 Feb 2019 09:07:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (ipe-7.1.2-src.tar.gz) = M5DeZ+4ist50rPqy6fspvP1v4YBogIb+u3WNyKgu2hE=
-SIZE (ipe-7.1.2-src.tar.gz) = 1416404
+SHA256 (ipe-7.2.9-src.tar.gz) = toeseM8KfYMQ5/+VL5yEBXBluzTHOeFHA2vtLgYGEMQ=
+SIZE (ipe-7.2.9-src.tar.gz) = 1848781
Index: patches/patch-src_common_mak
===================================================================
RCS file: /cvs/ports/graphics/ipe/patches/patch-src_common_mak,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_common_mak
--- patches/patch-src_common_mak 9 Jul 2012 15:56:35 -0000 1.1.1.1
+++ patches/patch-src_common_mak 24 Feb 2019 09:07:00 -0000
@@ -1,22 +1,20 @@
$OpenBSD: patch-src_common_mak,v 1.1.1.1 2012/07/09 15:56:35 edd Exp $
---- src/common.mak.orig Sun Jan 15 12:19:25 2012
-+++ src/common.mak Sat Jul 7 15:20:05 2012
-@@ -137,13 +137,13 @@ else
- soname = -Wl,-dylib_install_name,$(IPELIBDIRINFO)/lib$1.so.$(IPEVERS)
- else
- DLL_LDFLAGS += -shared
-- soname = -Wl,-soname,lib$1.so.$(IPEVERS)
-+ soname = -Wl,-soname,lib$1.so.${SHLIB_VERSION}
- endif
- buildlib = $(BUILDDIR)/lib
-- dll_target = $(buildlib)/lib$1.so.$(IPEVERS)
-- dll_symlinks = ln -sf lib$1.so.$(IPEVERS) $(buildlib)/lib$1.so
-- install_symlinks = ln -sf lib$1.so.$(IPEVERS) \
-- $(INSTALL_ROOT)$(IPELIBDIR)/lib$1.so
-+ dll_target = $(buildlib)/lib$1.so.${SHLIB_VERSION}
-+ dll_symlinks = true #ln -sf lib$1.so.$(IPEVERS) $(buildlib)/lib$1.so
-+ install_symlinks = true# ln -sf lib$1.so.$(IPEVERS) \
-+ #$(INSTALL_ROOT)$(IPELIBDIR)/lib$1.so
- ipelet_target = $(BUILDDIR)/ipelets/$1.so
- exe_target = $(BUILDDIR)/bin/$1
- endif
+Index: src/common.mak
+--- src/common.mak.orig
++++ src/common.mak
+@@ -212,11 +212,10 @@ else
+ CXXFLAGS += -g -O2
+ DLL_LDFLAGS += -shared
+ PLUGIN_LDFLAGS += -shared
+- soname = -Wl,-soname,lib$1.so.$(IPEVERS)
+- dll_target = $(buildlib)/lib$1.so.$(IPEVERS)
+- dll_symlinks = ln -sf lib$1.so.$(IPEVERS) $(buildlib)/lib$1.so
+- install_symlinks = ln -sf lib$1.so.$(IPEVERS) \
+- $(INSTALL_ROOT)$(IPELIBDIR)/lib$1.so
++ soname = -Wl,-soname,lib$1.so.${SHLIB_VERSION}
++ dll_target = $(buildlib)/lib$1.so.${SHLIB_VERSION}
++ dll_symlinks = true
++ install_symlinks = true
+ buildlib = $(BUILDDIR)/lib
+ buildbin = $(BUILDDIR)/bin
+ buildipelets = $(BUILDDIR)/ipelets
Index: patches/patch-src_config_mak
===================================================================
RCS file: /cvs/ports/graphics/ipe/patches/patch-src_config_mak,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_config_mak
--- patches/patch-src_config_mak 18 Aug 2012 18:57:38 -0000 1.2
+++ patches/patch-src_config_mak 24 Feb 2019 09:07:00 -0000
@@ -1,23 +1,13 @@
$OpenBSD: patch-src_config_mak,v 1.2 2012/08/18 18:57:38 edd Exp $
---- src/config.mak.orig Sun Jan 15 07:19:25 2012
-+++ src/config.mak Fri Aug 10 06:52:53 2012
-@@ -51,8 +51,8 @@ ifneq "$(luatest)" ""
- LUA_CFLAGS ?= $(shell pkg-config --cflags lua)
- LUA_LIBS ?= $(shell pkg-config --libs lua)
- else
-- LUA_CFLAGS ?= $(shell pkg-config --cflags lua5.1)
-- LUA_LIBS ?= $(shell pkg-config --libs lua5.1)
-+ LUA_CFLAGS ?= $(shell pkg-config --cflags lua51)
-+ LUA_LIBS ?= $(shell pkg-config --libs lua51)
- endif
- GTK_CFLAGS ?= $(shell pkg-config --cflags gtk+-2.0)
- GTK_LIBS ?= $(shell pkg-config --libs gtk+-2.0)
-@@ -101,7 +101,7 @@ CXX = g++
- # position independent code
- # (it doesn't hurt much on 32bit Linux, although you could comment it
- # out for slightly faster code)
--DLL_CFLAGS = -fpic
-+DLL_CFLAGS = -fPIC
+Index: src/config.mak
+--- src/config.mak.orig
++++ src/config.mak
+@@ -16,7 +16,7 @@
+ # The name of the Lua package (it could be "lua", "lua52", or "lua5.2")
+ # Lua 5.3 works as well.
#
- # --------------------------------------------------------------------
+-LUA_PACKAGE ?= lua5.3
++LUA_PACKAGE ?= lua${MODLUA_DEP_VERSION}
#
+ ZLIB_CFLAGS ?=
+ ZLIB_LIBS ?= -lz
Index: patches/patch-src_ipe6upgrade_ipe6upgrade_cpp
===================================================================
RCS file: /cvs/ports/graphics/ipe/patches/patch-src_ipe6upgrade_ipe6upgrade_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_ipe6upgrade_ipe6upgrade_cpp
--- patches/patch-src_ipe6upgrade_ipe6upgrade_cpp 7 May 2017 20:35:07 -0000 1.1
+++ patches/patch-src_ipe6upgrade_ipe6upgrade_cpp 24 Feb 2019 09:07:00 -0000
@@ -3,12 +3,11 @@ $OpenBSD: patch-src_ipe6upgrade_ipe6upgr
Index: src/ipe6upgrade/ipe6upgrade.cpp
--- src/ipe6upgrade/ipe6upgrade.cpp.orig
+++ src/ipe6upgrade/ipe6upgrade.cpp
-@@ -30,6 +30,8 @@
-
- #include "ipexml.h"
+@@ -32,6 +32,7 @@
#include "ipeattributes.h"
-+#include <cstdlib>
-+using std::exit;
+ #include <cstdlib>
++using std::exit;
using namespace ipe;
+ // --------------------------------------------------------------------
Index: patches/patch-src_ipe_lua_prefs_lua
===================================================================
RCS file: /cvs/ports/graphics/ipe/patches/patch-src_ipe_lua_prefs_lua,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_ipe_lua_prefs_lua
--- patches/patch-src_ipe_lua_prefs_lua 9 Jul 2012 15:56:35 -0000 1.1.1.1
+++ patches/patch-src_ipe_lua_prefs_lua 24 Feb 2019 09:07:00 -0000
@@ -2,14 +2,15 @@ $OpenBSD: patch-src_ipe_lua_prefs_lua,v
Swapped out the default on-screen keyboard for something lightweight.
---- src/ipe/lua/prefs.lua.orig Sat Jul 7 19:37:46 2012
-+++ src/ipe/lua/prefs.lua Sat Jul 7 19:37:52 2012
-@@ -132,7 +132,7 @@ end
-
- -- How to start onscreen keyboard
- if config.platform == "unix" then
-- prefs.keyboard = "onboard &"
-+ prefs.keyboard = "xvkbd &"
+Index: src/ipe/lua/prefs.lua
+--- src/ipe/lua/prefs.lua.orig
++++ src/ipe/lua/prefs.lua
+@@ -257,7 +257,7 @@ elseif config.platform == "apple" then
+ prefs.keyboard = "open -a KeyboardViewer -n"
else
- prefs.keyboard = nil
+ -- On Linux, you could use: prefs.keyboard = "onboard &"
+- prefs.keyboard = nil
++ prefs.keyboard = "xvkbd &"
end
+
+ -- Disable all snap modes in "ink" drawing mode?
Index: patches/patch-src_ipeextract_ipeextract_cpp
===================================================================
RCS file: /cvs/ports/graphics/ipe/patches/patch-src_ipeextract_ipeextract_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_ipeextract_ipeextract_cpp
--- patches/patch-src_ipeextract_ipeextract_cpp 7 May 2017 20:35:07 -0000 1.1
+++ patches/patch-src_ipeextract_ipeextract_cpp 24 Feb 2019 09:07:00 -0000
@@ -3,12 +3,11 @@ $OpenBSD: patch-src_ipeextract_ipeextrac
Index: src/ipeextract/ipeextract.cpp
--- src/ipeextract/ipeextract.cpp.orig
+++ src/ipeextract/ipeextract.cpp
-@@ -31,6 +31,8 @@
- #include "ipexml.h"
- #include "ipeutils.h"
+@@ -33,6 +33,7 @@
#include "ipepdfparser.h"
-+#include <cstdlib>
-+using std::exit;
+ #include <cstdlib>
++using std::exit;
using namespace ipe;
+ // ---------------------------------------------------------------------
Index: patches/patch-src_ipelib_ipebase_cpp
===================================================================
RCS file: patches/patch-src_ipelib_ipebase_cpp
diff -N patches/patch-src_ipelib_ipebase_cpp
--- patches/patch-src_ipelib_ipebase_cpp 7 May 2017 20:35:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_ipelib_ipebase_cpp,v 1.1 2017/05/07 20:35:07 espie Exp $
-
-Index: src/ipelib/ipebase.cpp
---- src/ipelib/ipebase.cpp.orig
-+++ src/ipelib/ipebase.cpp
-@@ -30,6 +30,7 @@
-
- #include "ipebase.h"
- #include <cmath>
-+#include <cstdlib>
-
- using namespace ipe;
-
Index: patches/patch-src_ipelib_ipelatex_cpp
===================================================================
RCS file: /cvs/ports/graphics/ipe/patches/patch-src_ipelib_ipelatex_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_ipelib_ipelatex_cpp
--- patches/patch-src_ipelib_ipelatex_cpp 7 May 2017 20:35:07 -0000 1.1
+++ patches/patch-src_ipelib_ipelatex_cpp 24 Feb 2019 09:07:00 -0000
@@ -3,20 +3,12 @@ $OpenBSD: patch-src_ipelib_ipelatex_cpp,
Index: src/ipelib/ipelatex.cpp
--- src/ipelib/ipelatex.cpp.orig
+++ src/ipelib/ipelatex.cpp
-@@ -34,6 +34,7 @@
-
- #include "ipefontpool.h"
- #include "ipelatex.h"
-+#include <cstdlib>
-
- using namespace ipe;
-
-@@ -149,7 +150,7 @@ int Latex::scanPage(Page *page)
+@@ -181,7 +181,7 @@ void Latex::addPageNumber(int pno, int vno, int npages
*/
int Latex::createLatexSource(Stream &stream, String preamble)
{
- bool ancient = (getenv("IPEANCIENTPDFTEX") != 0);
+ bool ancient = (std::getenv("IPEANCIENTPDFTEX") != 0);
int count = 0;
- stream << "\\pdfcompresslevel0\n"
- << "\\nonstopmode\n"
+ stream << "\\nonstopmode\n";
+ if (!iXetex) {
Index: patches/patch-src_ipelib_ipepdfparser_cpp
===================================================================
RCS file: patches/patch-src_ipelib_ipepdfparser_cpp
diff -N patches/patch-src_ipelib_ipepdfparser_cpp
--- patches/patch-src_ipelib_ipepdfparser_cpp 7 May 2017 20:35:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_ipelib_ipepdfparser_cpp,v 1.1 2017/05/07 20:35:07 espie Exp $
-
-Index: src/ipelib/ipepdfparser.cpp
---- src/ipelib/ipepdfparser.cpp.orig
-+++ src/ipelib/ipepdfparser.cpp
-@@ -30,6 +30,7 @@
-
- #include "ipepdfparser.h"
- #include "ipeutils.h"
-+#include <cstdlib>
-
- using namespace ipe;
-
Index: patches/patch-src_ipelib_ipeplatform_cpp
===================================================================
RCS file: patches/patch-src_ipelib_ipeplatform_cpp
diff -N patches/patch-src_ipelib_ipeplatform_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ipelib_ipeplatform_cpp 24 Feb 2019 09:07:00 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: src/ipelib/ipeplatform.cpp
+--- src/ipelib/ipeplatform.cpp.orig
++++ src/ipelib/ipeplatform.cpp
+@@ -587,7 +587,11 @@ double Platform::toDouble(String s)
+ else
+ return strtod(s.z(), 0);
+ #else
++#ifdef __OpenBSD__
++ return strtod(s.z(), 0);
++#else
+ return strtod_l(s.z(), 0, ipeLocale);
++#endif
+ #endif
+ }
+
Index: patches/patch-src_ipetoipe_ipetoipe_cpp
===================================================================
RCS file: /cvs/ports/graphics/ipe/patches/patch-src_ipetoipe_ipetoipe_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_ipetoipe_ipetoipe_cpp
--- patches/patch-src_ipetoipe_ipetoipe_cpp 7 May 2017 20:35:07 -0000 1.1
+++ patches/patch-src_ipetoipe_ipetoipe_cpp 24 Feb 2019 09:07:00 -0000
@@ -3,12 +3,11 @@ $OpenBSD: patch-src_ipetoipe_ipetoipe_cp
Index: src/ipetoipe/ipetoipe.cpp
--- src/ipetoipe/ipetoipe.cpp.orig
+++ src/ipetoipe/ipetoipe.cpp
-@@ -29,6 +29,8 @@
- */
-
+@@ -31,6 +31,7 @@
#include "ipedoc.h"
-+#include <cstdlib>
-+using std::exit;
+ #include <cstdlib>
++using std::exit;
using ipe::Document;
using ipe::String;
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ipe/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 4 Apr 2016 22:57:45 -0000 1.2
+++ pkg/PLIST 24 Feb 2019 09:07:00 -0000
@@ -1,21 +1,20 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/04/04 22:57:45 naddy Exp $
+@comment $OpenBSD: PLIST,v$
@bin bin/ipe
@bin bin/ipe6upgrade
@bin bin/ipeextract
@bin bin/iperender
@bin bin/ipescript
@bin bin/ipetoipe
-@bin bin/ipeview
include/ipeattributes.h
include/ipebase.h
include/ipebitmap.h
include/ipecanvas.h
+include/ipecanvas_cocoa.h
include/ipecanvas_gtk.h
include/ipecanvas_qt.h
include/ipecanvas_win.h
include/ipedoc.h
include/ipefactory.h
-include/ipefontpool.h
include/ipegeo.h
include/ipegroup.h
include/ipeimage.h
@@ -24,6 +23,7 @@ include/ipelatex.h
include/ipelet.h
include/ipelib.h
include/ipeobject.h
+include/ipeosx.h
include/ipepage.h
include/ipepainter.h
include/ipepath.h
@@ -31,12 +31,15 @@ include/ipepdfparser.h
include/ipepdfwriter.h
include/ipepswriter.h
include/ipereference.h
+include/iperesources.h
+include/ipeselector_cocoa.h
include/ipeselector_qt.h
include/ipeshape.h
include/ipesnap.h
include/ipestyle.h
include/ipetext.h
include/ipetool.h
+include/ipetoolbase.h
include/ipeutils.h
include/ipexml.h
lib/ipe/
@@ -45,8 +48,6 @@ lib/ipe/${V}/ipelets/
lib/ipe/${V}/ipelets/align.lua
lib/ipe/${V}/ipelets/euclid.lua
lib/ipe/${V}/ipelets/goodies.lua
-lib/ipe/${V}/ipelets/image.lua
-lib/ipe/${V}/ipelets/image.so
lib/ipe/${V}/ipelets/move.lua
lib/ipe/${V}/ipelets/search-replace.lua
lib/ipe/${V}/ipelets/symbols.lua
@@ -64,9 +65,10 @@ lib/ipe/${V}/ipelets/symbols.lua
share/doc/ipe/
share/doc/ipe/annotated.html
share/doc/ipe/bc_s.png
+share/doc/ipe/bdwn.png
share/doc/ipe/blank.png
-share/doc/ipe/class_ipe_auto_ptr-members.html
-share/doc/ipe/class_ipe_auto_ptr.html
+share/doc/ipe/class_canvas-members.html
+share/doc/ipe/class_canvas.html
share/doc/ipe/classes.html
share/doc/ipe/classipe_1_1_a85_source-members.html
share/doc/ipe/classipe_1_1_a85_source.html
@@ -122,7 +124,6 @@ share/doc/ipe/classipe_1_1_deflate_strea
share/doc/ipe/classipe_1_1_deflate_stream.html
share/doc/ipe/classipe_1_1_document-members.html
share/doc/ipe/classipe_1_1_document.html
-share/doc/ipe/classipe_1_1_effect-members.html
share/doc/ipe/classipe_1_1_ellipse-members.html
share/doc/ipe/classipe_1_1_ellipse.html
share/doc/ipe/classipe_1_1_face-members.html
@@ -193,6 +194,8 @@ share/doc/ipe/classipe_1_1_pdf_parser-me
share/doc/ipe/classipe_1_1_pdf_parser.html
share/doc/ipe/classipe_1_1_pdf_ref-members.html
share/doc/ipe/classipe_1_1_pdf_ref.html
+share/doc/ipe/classipe_1_1_pdf_resources-members.html
+share/doc/ipe/classipe_1_1_pdf_resources.html
share/doc/ipe/classipe_1_1_pdf_string-members.html
share/doc/ipe/classipe_1_1_pdf_string.html
share/doc/ipe/classipe_1_1_pdf_writer-members.html
@@ -227,7 +230,6 @@ share/doc/ipe/classipe_1_1_style_sheet-m
share/doc/ipe/classipe_1_1_style_sheet.html
share/doc/ipe/classipe_1_1_sub_path-members.html
share/doc/ipe/classipe_1_1_sub_path.html
-share/doc/ipe/classipe_1_1_symbol-members.html
share/doc/ipe/classipe_1_1_tell_stream-members.html
share/doc/ipe/classipe_1_1_tell_stream.html
share/doc/ipe/classipe_1_1_text-members.html
@@ -248,6 +250,10 @@ share/doc/ipe/classipe_1_1_xml_parser-me
share/doc/ipe/classipe_1_1_xml_parser.html
share/doc/ipe/closed.png
share/doc/ipe/cpp-ipelets.html
+share/doc/ipe/dir_7b54d492694b293bf8b54c70d2fe7f56.html
+share/doc/ipe/dir_91a90e6e897462a7bb8a7a0fc103953b.html
+share/doc/ipe/dir_d44c64559bbebec7f509842c48db8b23.html
+share/doc/ipe/doc.png
share/doc/ipe/doxygen.css
share/doc/ipe/doxygen.png
share/doc/ipe/example1.svg
@@ -256,64 +262,78 @@ share/doc/ipe/example3.svg
share/doc/ipe/example4.svg
share/doc/ipe/example5.svg
share/doc/ipe/example6.svg
+share/doc/ipe/folderclosed.png
+share/doc/ipe/folderopen.png
share/doc/ipe/fontbbox.svg
share/doc/ipe/fontbbox2.svg
share/doc/ipe/functions.html
-share/doc/ipe/functions_0x62.html
-share/doc/ipe/functions_0x63.html
-share/doc/ipe/functions_0x64.html
-share/doc/ipe/functions_0x65.html
-share/doc/ipe/functions_0x66.html
-share/doc/ipe/functions_0x67.html
-share/doc/ipe/functions_0x68.html
-share/doc/ipe/functions_0x69.html
-share/doc/ipe/functions_0x6b.html
-share/doc/ipe/functions_0x6c.html
-share/doc/ipe/functions_0x6d.html
-share/doc/ipe/functions_0x6e.html
-share/doc/ipe/functions_0x6f.html
-share/doc/ipe/functions_0x70.html
-share/doc/ipe/functions_0x71.html
-share/doc/ipe/functions_0x72.html
-share/doc/ipe/functions_0x73.html
-share/doc/ipe/functions_0x74.html
-share/doc/ipe/functions_0x75.html
-share/doc/ipe/functions_0x76.html
-share/doc/ipe/functions_0x77.html
-share/doc/ipe/functions_0x78.html
-share/doc/ipe/functions_0x79.html
-share/doc/ipe/functions_0x7a.html
share/doc/ipe/functions_0x7e.html
+share/doc/ipe/functions_b.html
+share/doc/ipe/functions_c.html
+share/doc/ipe/functions_d.html
+share/doc/ipe/functions_e.html
share/doc/ipe/functions_enum.html
share/doc/ipe/functions_eval.html
+share/doc/ipe/functions_f.html
share/doc/ipe/functions_func.html
-share/doc/ipe/functions_func_0x62.html
-share/doc/ipe/functions_func_0x63.html
-share/doc/ipe/functions_func_0x64.html
-share/doc/ipe/functions_func_0x65.html
-share/doc/ipe/functions_func_0x66.html
-share/doc/ipe/functions_func_0x67.html
-share/doc/ipe/functions_func_0x68.html
-share/doc/ipe/functions_func_0x69.html
-share/doc/ipe/functions_func_0x6b.html
-share/doc/ipe/functions_func_0x6c.html
-share/doc/ipe/functions_func_0x6d.html
-share/doc/ipe/functions_func_0x6e.html
-share/doc/ipe/functions_func_0x6f.html
-share/doc/ipe/functions_func_0x70.html
-share/doc/ipe/functions_func_0x71.html
-share/doc/ipe/functions_func_0x72.html
-share/doc/ipe/functions_func_0x73.html
-share/doc/ipe/functions_func_0x74.html
-share/doc/ipe/functions_func_0x75.html
-share/doc/ipe/functions_func_0x76.html
-share/doc/ipe/functions_func_0x77.html
-share/doc/ipe/functions_func_0x78.html
-share/doc/ipe/functions_func_0x7a.html
share/doc/ipe/functions_func_0x7e.html
+share/doc/ipe/functions_func_b.html
+share/doc/ipe/functions_func_c.html
+share/doc/ipe/functions_func_d.html
+share/doc/ipe/functions_func_e.html
+share/doc/ipe/functions_func_f.html
+share/doc/ipe/functions_func_g.html
+share/doc/ipe/functions_func_h.html
+share/doc/ipe/functions_func_i.html
+share/doc/ipe/functions_func_k.html
+share/doc/ipe/functions_func_l.html
+share/doc/ipe/functions_func_m.html
+share/doc/ipe/functions_func_n.html
+share/doc/ipe/functions_func_o.html
+share/doc/ipe/functions_func_p.html
+share/doc/ipe/functions_func_q.html
+share/doc/ipe/functions_func_r.html
+share/doc/ipe/functions_func_s.html
+share/doc/ipe/functions_func_t.html
+share/doc/ipe/functions_func_u.html
+share/doc/ipe/functions_func_v.html
+share/doc/ipe/functions_func_w.html
+share/doc/ipe/functions_func_x.html
+share/doc/ipe/functions_func_z.html
+share/doc/ipe/functions_g.html
+share/doc/ipe/functions_h.html
+share/doc/ipe/functions_i.html
+share/doc/ipe/functions_k.html
+share/doc/ipe/functions_l.html
+share/doc/ipe/functions_m.html
+share/doc/ipe/functions_n.html
+share/doc/ipe/functions_o.html
+share/doc/ipe/functions_p.html
+share/doc/ipe/functions_q.html
+share/doc/ipe/functions_r.html
share/doc/ipe/functions_rela.html
+share/doc/ipe/functions_s.html
+share/doc/ipe/functions_t.html
share/doc/ipe/functions_type.html
+share/doc/ipe/functions_u.html
+share/doc/ipe/functions_v.html
share/doc/ipe/functions_vars.html
+share/doc/ipe/functions_vars_c.html
+share/doc/ipe/functions_vars_d.html
+share/doc/ipe/functions_vars_i.html
+share/doc/ipe/functions_vars_n.html
+share/doc/ipe/functions_vars_o.html
+share/doc/ipe/functions_vars_p.html
+share/doc/ipe/functions_vars_s.html
+share/doc/ipe/functions_vars_t.html
+share/doc/ipe/functions_vars_v.html
+share/doc/ipe/functions_vars_x.html
+share/doc/ipe/functions_vars_y.html
+share/doc/ipe/functions_vars_z.html
+share/doc/ipe/functions_w.html
+share/doc/ipe/functions_x.html
+share/doc/ipe/functions_y.html
+share/doc/ipe/functions_z.html
share/doc/ipe/group__attr.html
share/doc/ipe/group__base.html
share/doc/ipe/group__cairo.html
@@ -328,6 +348,7 @@ share/doc/ipe/index.html
share/doc/ipe/intersection.svg
share/doc/ipe/ipe.dtd
share/doc/ipe/ipelets.html
+share/doc/ipe/jquery.js
share/doc/ipe/lingrad1.svg
share/doc/ipe/lua-ipelets.html
share/doc/ipe/lua.html
@@ -338,7 +359,6 @@ share/doc/ipe/luaobj.html
share/doc/ipe/luapage.html
share/doc/ipe/manual.css
share/doc/ipe/manual.html
-share/doc/ipe/manual.pdf
share/doc/ipe/manual_1.html
share/doc/ipe/manual_10.html
share/doc/ipe/manual_11.html
@@ -379,46 +399,55 @@ share/doc/ipe/manual_42.html
share/doc/ipe/manual_43.html
share/doc/ipe/manual_44.html
share/doc/ipe/manual_45.html
+share/doc/ipe/manual_46.html
share/doc/ipe/manual_47.html
share/doc/ipe/manual_48.html
share/doc/ipe/manual_49.html
share/doc/ipe/manual_5.html
share/doc/ipe/manual_50.html
share/doc/ipe/manual_51.html
+share/doc/ipe/manual_52.html
share/doc/ipe/manual_53.html
share/doc/ipe/manual_54.html
+share/doc/ipe/manual_55.html
+share/doc/ipe/manual_56.html
+share/doc/ipe/manual_57.html
+share/doc/ipe/manual_58.html
share/doc/ipe/manual_6.html
+share/doc/ipe/manual_60.html
+share/doc/ipe/manual_61.html
share/doc/ipe/manual_7.html
share/doc/ipe/manual_8.html
share/doc/ipe/manual_9.html
-share/doc/ipe/manual_ipe6_to_ipe7.html
share/doc/ipe/manual_ipe_copyright.html
+share/doc/ipe/menu.js
+share/doc/ipe/menudata.js
share/doc/ipe/modules.html
share/doc/ipe/namespaceipe.html
-share/doc/ipe/namespaceipeqt.html
share/doc/ipe/namespacemembers.html
share/doc/ipe/namespacemembers_enum.html
share/doc/ipe/namespacemembers_eval.html
share/doc/ipe/namespacemembers_func.html
share/doc/ipe/namespacemembers_type.html
share/doc/ipe/namespacemembers_vars.html
-share/doc/ipe/namespaces.html
share/doc/ipe/nav_f.png
+share/doc/ipe/nav_g.png
share/doc/ipe/nav_h.png
share/doc/ipe/next.png
share/doc/ipe/open.png
+share/doc/ipe/pages.html
share/doc/ipe/polygon.pdf
share/doc/ipe/previous.png
share/doc/ipe/radgrad1.svg
share/doc/ipe/radgrad2.svg
share/doc/ipe/snaplines.svg
+share/doc/ipe/splitbar.png
share/doc/ipe/structipe_1_1_canvas_base_1_1_style-members.html
share/doc/ipe/structipe_1_1_canvas_base_1_1_style.html
share/doc/ipe/structipe_1_1_document_1_1_s_properties-members.html
share/doc/ipe/structipe_1_1_document_1_1_s_properties.html
+share/doc/ipe/structipe_1_1_effect-members.html
share/doc/ipe/structipe_1_1_effect.html
-share/doc/ipe/structipe_1_1_font-members.html
-share/doc/ipe/structipe_1_1_font.html
share/doc/ipe/structipe_1_1_gradient-members.html
share/doc/ipe/structipe_1_1_gradient.html
share/doc/ipe/structipe_1_1_gradient_1_1_stop-members.html
@@ -429,6 +458,8 @@ share/doc/ipe/structipe_1_1_layout-membe
share/doc/ipe/structipe_1_1_layout.html
share/doc/ipe/structipe_1_1_painter_1_1_state-members.html
share/doc/ipe/structipe_1_1_painter_1_1_state.html
+share/doc/ipe/structipe_1_1_pdf_resources_1_1_s_page_number-members.html
+share/doc/ipe/structipe_1_1_pdf_resources_1_1_s_page_number.html
share/doc/ipe/structipe_1_1_pdf_token-members.html
share/doc/ipe/structipe_1_1_pdf_token.html
share/doc/ipe/structipe_1_1_select_tool_1_1_s_obj-members.html
@@ -437,6 +468,7 @@ share/doc/ipe/structipe_1_1_style_sheet_
share/doc/ipe/structipe_1_1_style_sheet_1_1_page_number_style.html
share/doc/ipe/structipe_1_1_style_sheet_1_1_title_style-members.html
share/doc/ipe/structipe_1_1_style_sheet_1_1_title_style.html
+share/doc/ipe/structipe_1_1_symbol-members.html
share/doc/ipe/structipe_1_1_symbol.html
share/doc/ipe/structipe_1_1_text_1_1_x_form-members.html
share/doc/ipe/structipe_1_1_text_1_1_x_form.html
@@ -444,6 +476,8 @@ share/doc/ipe/structipe_1_1_text_padding
share/doc/ipe/structipe_1_1_text_padding.html
share/doc/ipe/structipe_1_1_tiling-members.html
share/doc/ipe/structipe_1_1_tiling.html
+share/doc/ipe/sync_off.png
+share/doc/ipe/sync_on.png
share/doc/ipe/tab_a.png
share/doc/ipe/tab_b.png
share/doc/ipe/tab_h.png
@@ -452,51 +486,125 @@ share/doc/ipe/tabs.css
share/doc/ipe/up.png
share/ipe/
share/ipe/${V}/
-share/ipe/${V}/fontmap.xml
share/ipe/${V}/icons/
share/ipe/${V}/icons/copy.png
+share/ipe/${V}/icons/c...@2x.png
+share/ipe/${V}/icons/copy_32x32.png
+share/ipe/${V}/icons/copy_32...@2x.png
share/ipe/${V}/icons/cut.png
+share/ipe/${V}/icons/c...@2x.png
+share/ipe/${V}/icons/cut_32x32.png
+share/ipe/${V}/icons/cut_32...@2x.png
share/ipe/${V}/icons/delete.png
+share/ipe/${V}/icons/del...@2x.png
+share/ipe/${V}/icons/delete_32x32.png
+share/ipe/${V}/icons/delete_32...@2x.png
share/ipe/${V}/icons/fit_objects.png
+share/ipe/${V}/icons/fit_obje...@2x.png
+share/ipe/${V}/icons/fit_objects_32x32.png
+share/ipe/${V}/icons/fit_objects_32...@2x.png
share/ipe/${V}/icons/fit_page.png
+share/ipe/${V}/icons/fit_p...@2x.png
+share/ipe/${V}/icons/fit_page_32x32.png
+share/ipe/${V}/icons/fit_page_32...@2x.png
share/ipe/${V}/icons/fit_width.png
+share/ipe/${V}/icons/grid_visible.png
share/ipe/${V}/icons/ipe.png
+share/ipe/${V}/icons/ipe128.png
+share/ipe/${V}/icons/ipe512.png
share/ipe/${V}/icons/keyboard.png
+share/ipe/${V}/icons/keybo...@2x.png
+share/ipe/${V}/icons/keyboard_32x32.png
share/ipe/${V}/icons/mode_arc1.png
share/ipe/${V}/icons/mode_arc2.png
share/ipe/${V}/icons/mode_arc3.png
share/ipe/${V}/icons/mode_circle1.png
share/ipe/${V}/icons/mode_circle2.png
share/ipe/${V}/icons/mode_circle3.png
+share/ipe/${V}/icons/mode_graph.png
+share/ipe/${V}/icons/mode_gr...@2x.png
+share/ipe/${V}/icons/mode_graph_32x32.png
+share/ipe/${V}/icons/mode_graph_32...@2x.png
share/ipe/${V}/icons/mode_ink.png
+share/ipe/${V}/icons/mode_...@2x.png
+share/ipe/${V}/icons/mode_ink_32x32.png
+share/ipe/${V}/icons/mode_ink_32...@2x.png
share/ipe/${V}/icons/mode_label.png
+share/ipe/${V}/icons/mode_la...@2x.png
+share/ipe/${V}/icons/mode_label_32x32.png
+share/ipe/${V}/icons/mode_label_32...@2x.png
share/ipe/${V}/icons/mode_lines.png
share/ipe/${V}/icons/mode_marks.png
+share/ipe/${V}/icons/mode_ma...@2x.png
+share/ipe/${V}/icons/mode_marks_32x32.png
+share/ipe/${V}/icons/mode_marks_32...@2x.png
share/ipe/${V}/icons/mode_math.png
+share/ipe/${V}/icons/mode_m...@2x.png
+share/ipe/${V}/icons/mode_math_32x32.png
+share/ipe/${V}/icons/mode_math_32...@2x.png
share/ipe/${V}/icons/mode_pan.png
share/ipe/${V}/icons/mode_paragraph.png
+share/ipe/${V}/icons/mode_parallelogram.png
+share/ipe/${V}/icons/mode_parallelog...@2x.png
+share/ipe/${V}/icons/mode_parallelogram_32x32.png
+share/ipe/${V}/icons/mode_parallelogram_32...@2x.png
share/ipe/${V}/icons/mode_polygons.png
-share/ipe/${V}/icons/mode_rectangles.png
+share/ipe/${V}/icons/mode_rectangles1.png
+share/ipe/${V}/icons/mode_rectangl...@2x.png
+share/ipe/${V}/icons/mode_rectangles1_32x32.png
+share/ipe/${V}/icons/mode_rectangles1_32...@2x.png
+share/ipe/${V}/icons/mode_rectangles2.png
+share/ipe/${V}/icons/mode_rectangl...@2x.png
+share/ipe/${V}/icons/mode_rectangles2_32x32.png
+share/ipe/${V}/icons/mode_rectangles2_32...@2x.png
+share/ipe/${V}/icons/mode_rectangles3.png
+share/ipe/${V}/icons/mode_rectangl...@2x.png
+share/ipe/${V}/icons/mode_rectangles3_32x32.png
+share/ipe/${V}/icons/mode_rectangles3_32...@2x.png
share/ipe/${V}/icons/mode_rotate.png
share/ipe/${V}/icons/mode_select.png
+share/ipe/${V}/icons/mode_shear.png
+share/ipe/${V}/icons/mode_sh...@2x.png
+share/ipe/${V}/icons/mode_shear_32x32.png
+share/ipe/${V}/icons/mode_shear_32...@2x.png
share/ipe/${V}/icons/mode_shredder.png
share/ipe/${V}/icons/mode_splinegons.png
share/ipe/${V}/icons/mode_splines.png
share/ipe/${V}/icons/mode_stretch.png
share/ipe/${V}/icons/mode_translate.png
share/ipe/${V}/icons/paste.png
+share/ipe/${V}/icons/pa...@2x.png
+share/ipe/${V}/icons/paste_32x32.png
+share/ipe/${V}/icons/paste_32...@2x.png
share/ipe/${V}/icons/pen.png
share/ipe/${V}/icons/redo.png
+share/ipe/${V}/icons/r...@2x.png
+share/ipe/${V}/icons/redo_32x32.png
+share/ipe/${V}/icons/redo_32...@2x.png
share/ipe/${V}/icons/shift_key.png
share/ipe/${V}/icons/snapangle.png
share/ipe/${V}/icons/snapauto.png
share/ipe/${V}/icons/snapbd.png
+share/ipe/${V}/icons/snapctl.png
share/ipe/${V}/icons/snapgrid.png
share/ipe/${V}/icons/snapint.png
share/ipe/${V}/icons/snapvtx.png
+share/ipe/${V}/icons/stop.png
+share/ipe/${V}/icons/s...@2x.png
+share/ipe/${V}/icons/stop_32x32.png
+share/ipe/${V}/icons/stop_32...@2x.png
share/ipe/${V}/icons/undo.png
+share/ipe/${V}/icons/u...@2x.png
+share/ipe/${V}/icons/undo_32x32.png
+share/ipe/${V}/icons/undo_32...@2x.png
share/ipe/${V}/icons/zoom_in.png
+share/ipe/${V}/icons/zoom...@2x.png
+share/ipe/${V}/icons/zoom_in_32x32.png
+share/ipe/${V}/icons/zoom_in_32...@2x.png
share/ipe/${V}/icons/zoom_out.png
+share/ipe/${V}/icons/zoom_...@2x.png
+share/ipe/${V}/icons/zoom_out_32x32.png
+share/ipe/${V}/icons/zoom_out_32...@2x.png
share/ipe/${V}/lua/
share/ipe/${V}/lua/actions.lua
share/ipe/${V}/lua/editpath.lua
@@ -515,4 +623,7 @@ share/ipe/${V}/styles/
share/ipe/${V}/styles/basic.isy
share/ipe/${V}/styles/beamer.isy
share/ipe/${V}/styles/colors.isy
+share/ipe/${V}/styles/decorations.isy
+share/ipe/${V}/styles/note-paper.isy
share/ipe/${V}/styles/presentation.isy
+share/ipe/${V}/styles/tikz-shapes.isy
