cad/lepton-eda: Update to 1.9.9

PR: 241289 Submitted by: dmn <graahnul.grom@gmail.com> (maintainer)
svn path=/head/; revision=521770
2024-10-18 19:49:40 +00:00 · 2020-01-01 20:52:54 +00:00 · 2020-01-01 20:52:54 +00:00 · cb24bd26f8 · 2021-03-31 03:12:20 +00:00
commit cb24bd26f8
parent ee0e35659d
19 changed files with 852 additions and 562 deletions
--- a/cad/lepton-eda/Makefile
+++ b/cad/lepton-eda/Makefile
@ -1,9 +1,8 @@
 # $FreeBSD$

 PORTNAME=	lepton-eda
-PORTVERSION=	1.9.7
-PORTREVISION=	3
-DISTVERSIONSUFFIX=	-20181211
+PORTVERSION=	1.9.9
+DISTVERSIONSUFFIX=	-20191003
 CATEGORIES=	cad

 MAINTAINER=	graahnul.grom@gmail.com
@ -27,16 +26,12 @@ USE_LDCONFIG=	yes

 SHEBANG_FILES=	utils/scripts/lepton-tragesym \
 		utils/scripts/lepton-archive.py \
-		utils/gxyrs/lepton-xyrs.pl \
 		utils/scripts/gschupdate \
 		utils/scripts/gsymupdate \
 		utils/scripts/lepton-pcb_backannotate \
 		utils/scripts/lepton-refdes_renum \
 		utils/scripts/lepton-symfix \
-		examples/lightning_detector/bom \
-		contrib/scripts/mk_char_tab.pl \
-		contrib/scripts/pads_backannotate \
-		contrib/scripts/sarlacc_sym
+		examples/lightning_detector/bom

 PORTEXAMPLES=	examples/*

@ -53,43 +48,4 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime

-# work around for errors while running
-# build-tools/icon-theme-installer:
-#
-# Cannot find 'install -m 0644'; You probably want to pass -x ${INSTALL_DATA}
-#
-#   NOTE: in the error message above (I wanted to show it
-#   verbatim), INSTALL_DATA actually is enclosed in
-#   parenthesis, not in curly brackets.
-#   I had to change it to appease portlint(1), which does
-#   not ignore comments in makefiles.
-#
-# for 3 dirs (attrib/data, liblepton/data, schematic/data)
-# the following lines should be in the generated Makefile:
-#
-# INSTALL = /usr/bin/install -c
-# INSTALL_DATA = ${INSTALL} -m 644
-# INSTALL_PROGRAM = ${INSTALL}
-# INSTALL_SCRIPT = ${INSTALL}
-#
-# but instead you got:
-#
-# INSTALL = /usr/bin/install -c
-# INSTALL_DATA = install  -m 0644
-# INSTALL_PROGRAM = install  -s -m 555
-# INSTALL_SCRIPT = install  -m 555
-#
-# this is so only when building a port (when building from
-# git sources and install to the home folder, there are
-# no errors)
-#
-pre-build:
-	${REINPLACE_CMD} \
-		-e 's,^\(INSTALL_DATA = \)install\(.*\),\1$${INSTALL}\2,' \
-		-e 's,^\(INSTALL_PROGRAM = \)install\(.*\),\1$${INSTALL}\2,' \
-		-e 's,^\(INSTALL_SCRIPT = \)install\(.*\),\1$${INSTALL}\2,' \
-		${WRKSRC}/attrib/data/Makefile \
-		${WRKSRC}/liblepton/data/Makefile \
-		${WRKSRC}/schematic/data/Makefile
-
 .include <bsd.port.mk>
--- a/cad/lepton-eda/distinfo
+++ b/cad/lepton-eda/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1544669359
-SHA256 (lepton-eda-lepton-eda-1.9.7-20181211_GH0.tar.gz) = dd62e038e57c6223b2575da5ab68628a5df3387c2cf312eecba689536fdf41bb
-SIZE (lepton-eda-lepton-eda-1.9.7-20181211_GH0.tar.gz) = 8636846
+TIMESTAMP = 1570203233
+SHA256 (lepton-eda-lepton-eda-1.9.9-20191003_GH0.tar.gz) = 13448d91ae17ab8c5e5cbba56c5a4e6a7cc3b3cb392280cb4d218f50891469d7
+SIZE (lepton-eda-lepton-eda-1.9.9-20191003_GH0.tar.gz) = 8361951
--- a/cad/lepton-eda/files/patch-build-tools_icon-theme-installer
+++ b/cad/lepton-eda/files/patch-build-tools_icon-theme-installer
@ -0,0 +1,20 @@
+--- build-tools/icon-theme-installer.orig	2019-10-03 20:45:55 UTC
+++ build-tools/icon-theme-installer
+@@ -103,13 +103,13 @@ if test -z "$INSTALL_BASE_DIR"; then
+ 	exit 1
+ fi
+ 
+-if test ! -x `echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '`; then
+-	echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)"
+if test -z "$MKINSTALLDIRS_EXEC"; then
+	echo "\$MKINSTALLDIRS_EXEC is not set. Pass it with the -m command line option"
+ 	exit 1
+ fi
+ 
+-if test ! -x `echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '`; then
+-	echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)"
+if test -z "$INSTALL_DATA_EXEC"; then
+	echo "\$INSTALL_DATA_EXEC' is not set. Pass it with the -x command line option"
+ 	exit 1
+ fi
+ 
--- a/cad/lepton-eda/files/patch-cli_Makefile.am
+++ b/cad/lepton-eda/files/patch-cli_Makefile.am
@ -1,11 +0,0 @@
--- cli/Makefile.am.orig	2019-07-19 17:10:25 UTC
-+++ cli/Makefile.am
-@@ -28,7 +28,7 @@ lepton_cli_CPPFLAGS = \
- lepton_cli_CFLAGS = \
- 	$(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GTK_CFLAGS) \
- 	$(GDK_PIXBUF_CFLAGS) $(CAIRO_CFLAGS) $(CAIRO_PNG_CFLAGS) \
-	$(CAIRO_PDF_CLAGS) $(CAIRO_PS_CFLAGS) $(CAIRO_SVG_CFLAGS)
-+	$(CAIRO_PDF_CLAGS) $(CAIRO_PS_CFLAGS) $(CAIRO_SVG_CFLAGS) $(CFLAGS)
- lepton_cli_LDFLAGS = $(GUILE_LIBS) $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(CAIRO_LIBS) \
- 	$(CAIRO_PNG_LIBS) $(CAIRO_PDF_CLAGS) $(CAIRO_PS_LIBS) $(CAIRO_SVG_LIBS)
- lepton_cli_LDADD = \
--- a/cad/lepton-eda/files/patch-docs_scheme-api_Makefile.am
+++ b/cad/lepton-eda/files/patch-docs_scheme-api_Makefile.am
@ -0,0 +1,14 @@
+--- docs/scheme-api/Makefile.am.orig	2019-10-09 16:39:51 UTC
+++ docs/scheme-api/Makefile.am
+@@ -4,10 +4,8 @@ AM_MAKEINFOHTMLFLAGS = --css-ref=lepton-
+ 
+ EXTRA_DIST = lepton-scheme.css
+ 
+-html-local:
+all: all-am html
+ 	$(MKDIR_P) $(builddir)/lepton-scheme.html/
+ 	cp -fv $(srcdir)/lepton-scheme.css $(builddir)/lepton-scheme.html/
+ 
+-all-local: html
+-
+ install-data-local: install-html
--- a/cad/lepton-eda/files/patch-liblepton_include_liblepton_geda__list.h
+++ b/cad/lepton-eda/files/patch-liblepton_include_liblepton_geda__list.h
@ -0,0 +1,23 @@
+--- liblepton/include/liblepton/geda_list.h.orig	2019-10-03 20:45:55 UTC
+++ liblepton/include/liblepton/geda_list.h
+@@ -1,7 +1,8 @@
+-/* gEDA - GPL Electronic Design Automation
+- * libgeda - gEDA's library
+/* Lepton EDA library
+  * Copyright (C) 1998-2010 Ales Hvezda
+  * Copyright (C) 2007-2010 Peter Clifton
+ * Copyright (C) 2011-2015 gEDA Contributors
+ * Copyright (C) 2017-2019 Lepton EDA Contributors
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Library General Public
+@@ -56,6 +57,9 @@ void geda_list_add_glist( GedaList *list
+ void geda_list_remove( GedaList *list, gpointer item );
+ /*void geda_list_remove_glist( GedaList *list, GList *items ); */ /* Undemanded as yet */
+ void geda_list_remove_all( GedaList *list );
+void geda_list_move_item( GedaList* list, gpointer item, gint newpos );
+
+
+ 
+ /*const GList *geda_list_get_glist( GedaList *list ); */
+ #define geda_list_get_glist(list) (list->glist)
--- a/cad/lepton-eda/files/patch-liblepton_scheme_geda_log-rotate.scm
+++ b/cad/lepton-eda/files/patch-liblepton_scheme_geda_log-rotate.scm
@ -0,0 +1,11 @@
+--- liblepton/scheme/geda/log-rotate.scm.orig	2019-10-03 20:45:55 UTC
+++ liblepton/scheme/geda/log-rotate.scm
+@@ -44,7 +44,7 @@
+ ;; FIXME This should be obtained from the code that decides where to
+ ;; create and populate log files.
+ (define (log-directory)
+-  (string-append (user-config-dir) file-name-separator-string "logs"))
+  (string-append (user-cache-dir) file-name-separator-string "logs"))
+ 
+ ;;;; get-log-toolname path
+ ;;
--- a/cad/lepton-eda/files/patch-liblepton_scheme_geda_os.scm
+++ b/cad/lepton-eda/files/patch-liblepton_scheme_geda_os.scm
@ -0,0 +1,10 @@
+--- liblepton/scheme/geda/os.scm.orig	2019-10-03 20:45:55 UTC
+++ liblepton/scheme/geda/os.scm
+@@ -49,6 +49,7 @@
+ (define-public sys-config-dirs %sys-config-dirs)
+ (define-public user-data-dir %user-data-dir)
+ (define-public user-config-dir %user-config-dir)
+(define-public user-cache-dir %user-cache-dir)
+ 
+ (define-public expand-env-variables
+   ;; Only compile regular expression once
--- a/cad/lepton-eda/files/patch-liblepton_src_Makefile.am
+++ b/cad/lepton-eda/files/patch-liblepton_src_Makefile.am
@ -1,11 +0,0 @@
--- liblepton/src/Makefile.am.orig	2019-07-19 16:53:37 UTC
-+++ liblepton/src/Makefile.am
-@@ -99,7 +99,7 @@ liblepton_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"  
- 	-I$(srcdir)/../include -I$(srcdir)/../include/liblepton -I$(top_srcdir)
- liblepton_la_CFLAGS = \
- 	$(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GLIB_CFLAGS) \
-	$(GDK_PIXBUF_CFLAGS)
-+	$(GDK_PIXBUF_CFLAGS) $(CFLAGS)
- liblepton_la_LDFLAGS = -version-info $(LIBLEPTON_SHLIB_VERSION) \
- 	$(WINDOWS_LIBTOOL_FLAGS) $(MINGW_LDFLAGS) $(GUILE_LIBS) \
- 	$(GLIB_LIBS) $(GDK_PIXBUF_LIBS)
--- a/cad/lepton-eda/files/patch-liblepton_src_geda__list.c
+++ b/cad/lepton-eda/files/patch-liblepton_src_geda__list.c
@ -0,0 +1,36 @@
+--- liblepton/src/geda_list.c.orig	2019-10-03 20:45:55 UTC
+++ liblepton/src/geda_list.c
+@@ -1,7 +1,8 @@
+-/* gEDA - GPL Electronic Design Automation
+- * libgeda - gEDA's library
+/* Lepton EDA library
+  * Copyright (C) 1998-2000 Ales Hvezda
+  * Copyright (C) 2007-2010 Peter Clifton
+ * Copyright (C) 2011-2013 gEDA Contributors
+ * Copyright (C) 2017-2019 Lepton EDA Contributors
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -179,3 +180,22 @@ void geda_list_remove_all( GedaList *lis
+   g_signal_emit( list, geda_list_signals[ CHANGED ], 0 );
+ }
+ 
+
+/*! \brief Moves the list data \a item to a new position \a newpos.
+ */
+void geda_list_move_item( GedaList* list, gpointer item, gint newpos )
+{
+  GList* gl = list->glist;
+  GList* node = g_list_find (gl, item);
+
+  if (node != NULL)
+  {
+    gl = g_list_remove_link (gl, node);
+    gl = g_list_insert (gl, item, newpos);
+    g_list_free (node);
+    list->glist = gl;
+
+    g_signal_emit( list, geda_list_signals[ CHANGED ], 0 );
+  }
+}
+
--- a/cad/lepton-eda/files/patch-liblepton_src_scheme__os.c
+++ b/cad/lepton-eda/files/patch-liblepton_src_scheme__os.c
@ -0,0 +1,43 @@
+--- liblepton/src/scheme_os.c.orig	2019-10-03 20:45:55 UTC
+++ liblepton/src/scheme_os.c
+@@ -153,6 +153,25 @@ SCM_DEFINE (user_config_dir, "%user-conf
+   return scm_from_locale_string(eda_get_user_config_dir());
+ }
+ 
+/*! \brief Get user cache directory.
+ * \par Function Description
+ * Returns the directory where per-user cache data should be
+ * stored
+ *
+ * \note Scheme API: Implements the %user-cache-dir procedure is the
+ * (geda core os) module.
+ *
+ * \return a string.
+ */
+SCM_DEFINE (user_cache_dir, "%user-cache-dir", 0, 0, 0, (),
+            "Return the directory for user cache data.")
+{
+  /* eda_get_user_cache_dir() returns a raw environment string, so assume
+   * it's in the current locale's encoding. */
+  return scm_from_locale_string (eda_get_user_cache_dir ());
+}
+
+
+ /*!
+  * \brief Create the (geda core os) Scheme module.
+  * \par Function Description
+@@ -166,8 +185,12 @@ init_module_geda_core_os (void *unused)
+   #include "scheme_os.x"
+ 
+   /* Add them to the module's public definitions. */
+-  scm_c_export (s_platform, s_sys_data_dirs, s_sys_config_dirs,
+-                s_user_data_dir, s_user_config_dir,
+  scm_c_export (s_platform,
+                s_sys_config_dirs,
+                s_sys_data_dirs,
+                s_user_cache_dir,
+                s_user_config_dir,
+                s_user_data_dir,
+                 NULL);
+ }
+ 
--- a/cad/lepton-eda/files/patch-m4_geda-guile.m4
+++ b/cad/lepton-eda/files/patch-m4_geda-guile.m4
@ -1,26 +0,0 @@
--- m4/geda-guile.m4.orig	2018-12-11 19:24:41 UTC
-+++ m4/geda-guile.m4
-@@ -34,9 +34,20 @@ AC_DEFUN([AX_CHECK_GUILE],
-   GUILE_MIN_MINOR=`echo ${GUILE_MIN_VER} | sed -e 's;[[^\.]]*\.;;' -e 's;\..*;;g'`
-   GUILE_MIN_TEENY=`echo ${GUILE_MIN_VER} | sed -e 's;.*\.;;'`
- 
-  PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
-                           [GUILE_PKG_NAME=guile-2.0],
-                           [AC_MSG_ERROR([you need at least version ${GUILE_MIN_VER} of guile])])
-+  _found_pkg_config_guile=yes
-+  PKG_CHECK_MODULES(GUILE, [guile-2.2 >= $GUILE_MIN_VER],
-+                           [GUILE_PKG_NAME=guile-2.2], [_found_pkg_config_guile=no])
-+
-+  if test "${_found_pkg_config_guile}" = "no" ; then
-+   PKG_CHECK_MODULES(GUILE, [guile-2.0 >= $GUILE_MIN_VER],
-+                            [_found_pkg_config_guile=yes
-+                             GUILE_PKG_NAME=guile-2.0],
-+                            [_found_pkg_config_guile=no])
-+  fi
-+
-+  if test "${_found_pkg_config_guile}" = "no" ; then
-+    AC_MSG_ERROR([you need at least version ${GUILE_MIN_VER} of guile])
-+  fi
- 
-   AC_SUBST([GUILE_PKG_NAME])
- 
--- a/cad/lepton-eda/files/patch-netlist_scheme_backend_gnet-spice-sdb.scm
+++ b/cad/lepton-eda/files/patch-netlist_scheme_backend_gnet-spice-sdb.scm
@ -0,0 +1,11 @@
+--- netlist/scheme/backend/gnet-spice-sdb.scm.orig	2019-10-03 20:45:55 UTC
+++ netlist/scheme/backend/gnet-spice-sdb.scm
+@@ -209,7 +209,7 @@
+     (and (string-ci=? (gnetlist:get-package-attribute package "device")
+                       "spice-io")
+          package))
+-  (filter-map spice-io? ls))
+  (filter-map spice-io? package-list))
+ 
+ 
+ ;;; Given a list of spice-IO packages (refdeses), this function
--- a/cad/lepton-eda/files/patch-schematic_scheme_gschem_action.scm
+++ b/cad/lepton-eda/files/patch-schematic_scheme_gschem_action.scm
@ -1,102 +0,0 @@
--- schematic/scheme/gschem/action.scm.orig	2018-12-11 19:24:41 UTC
-+++ schematic/scheme/gschem/action.scm
-@@ -1,6 +1,7 @@
- ;; Lepton EDA Schematic Capture
- ;; Scheme API
- ;; Copyright (C) 2013 Peter Brett <peter@peter-b.co.uk>
-+;; Copyright (C) 2017-2019 Lepton EDA Contributors
- ;;
- ;; This program is free software; you can redistribute it and/or modify
- ;; it under the terms of the GNU General Public License as published by
-@@ -21,11 +22,10 @@
-   #:use-module (gschem core gettext)
-   #:use-module (gschem window)
-   #:use-module (gschem hook)
-+  #:use-module (geda log)
-   #:use-module (ice-9 optargs)
-   #:export-syntax (define-action))
- 
-(or (defined? 'define-syntax)
-    (use-modules (ice-9 syncase)))
- 
- (define last-action (make-fluid))
- (define current-action-position (make-fluid))
-@@ -33,18 +33,25 @@
- ;; Define an eval-in-currentmodule procedure
- (define (eval-cm expr) (eval expr (current-module)))
- 
-;; Evaluates a gschem action.  A gschem action is expected to be a
-+;; Evaluates a lepton-schematic action.  An action is expected to be a
- ;; symbol naming a thunk variable in the current module.
- ;;
- ;; The special-case symbol repeat-last-command causes the last action
- ;; executed to be repeated.
- (define-public (eval-action! action)
-   (define (invalid-action-error)
-    (error (_ "~S is not a valid gschem action.") action))
-+    (log! 'warning (_ "[~A] is not a valid lepton-schematic action.") action))
-+  (define (no-last-action-error)
-+    (log! 'message (_ "There is no last action to repeat.")))
- 
-   (define (eval-action!/recursive a)
- 
-     (cond
-+     ;; The action is #f when the user hits "." (repeat last action)
-+     ;; and there is no last action to repeat.
-+     ((eq? a #f)
-+      (no-last-action-error))
-+
-      ;; Handle repeat-last-command
-      ((equal? 'repeat-last-command a)
-       ;; N.b. must call eval-action! rather than
-@@ -107,29 +114,30 @@
-   ;; The action is a magical procedure that does nothing but call
-   ;; eval-action! *on itself*.  This allows you to invoke an action
-   ;; just by calling it like a normal function.
-  (letrec ((action (lambda () (eval-action! action))))
-+  (let ((unique-tag (list #f)))
-+    (letrec ((action (case-lambda
-+                       (() (eval-action! action))
-+                       ((x) unique-tag))))
- 
-    ;; The action data is stored in procedure properties -- most
-    ;; importantly, the actual thunk that the action wraps
-    (let ((sp! (lambda (k v) (set-procedure-property! action k v))))
-      (sp! 'gschem-cookie %cookie)
-      (sp! 'gschem-thunk thunk)
-      (sp! 'gschem-properties '()))
-+      ;; The action data is stored in procedure properties -- most
-+      ;; importantly, the actual thunk that the action wraps
-+      (let ((sp! (lambda (k v) (set-procedure-property! action k v))))
-+        (sp! 'gschem-cookie %cookie)
-+        (sp! 'gschem-thunk thunk)
-+        (sp! 'gschem-properties '()))
- 
-    ;; Deal with any properties.  props should contain arguments in
-    ;; pairs, where the first element of each pair is a keyword naming
-    ;; a procedure property (e.g. #:icon) and the second element in
-    ;; the corresponding value (e.g. "insert-text").
-    (let loop ((lst props))
-      (and (< 1 (length lst))
-           (set-action-property! action
-                                 (keyword->symbol (list-ref lst 0))
-                                 (list-ref lst 1))
-           (loop (list-tail lst 2))))
-          
-          
-+      ;; Deal with any properties.  props should contain arguments in
-+      ;; pairs, where the first element of each pair is a keyword naming
-+      ;; a procedure property (e.g. #:icon) and the second element in
-+      ;; the corresponding value (e.g. "insert-text").
-+      (let loop ((lst props))
-+        (and (< 1 (length lst))
-+             (set-action-property! action
-+                                   (keyword->symbol (list-ref lst 0))
-+                                   (list-ref lst 1))
-+             (loop (list-tail lst 2))))
- 
-    action))
-+      action)))
- 
- (define (action-thunk action)
-   (procedure-property action 'gschem-thunk))
--- a/cad/lepton-eda/files/patch-schematic_src_Makefile.am
+++ b/cad/lepton-eda/files/patch-schematic_src_Makefile.am
@ -1,11 +0,0 @@
--- schematic/src/Makefile.am.orig	2019-07-19 17:20:29 UTC
-+++ schematic/src/Makefile.am
-@@ -128,7 +128,7 @@ lepton_schematic_CPPFLAGS = -I$(top_srcdir)/liblepton/
- 	-I$(top_srcdir) -I$(includedir)
- lepton_schematic_CFLAGS = $(GCC_CFLAGS) $(LIBSTROKE_CFLAGS) \
- 	$(MINGW_CFLAGS) \
-	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS)
-+	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS) $(CFLAGS)
- lepton_schematic_LDFLAGS = $(LIBSTROKE_LDFLAGS) $(GLIB_LIBS) $(GTK_LIBS) \
- 	$(GTHREAD_LIBS) $(GUILE_LIBS) $(MINGW_GUI_LDFLAGS)
- lepton_schematic_LDADD = \
--- a/cad/lepton-eda/files/patch-schematic_src_x__tabs.c
+++ b/cad/lepton-eda/files/patch-schematic_src_x__tabs.c
@ -0,0 +1,275 @@
+--- schematic/src/x_tabs.c.orig	2019-10-03 20:45:55 UTC
+++ schematic/src/x_tabs.c
+@@ -53,7 +53,7 @@
+  * key:         use-tabs
+  * group:       schematic.gui
+  * type:        boolean
+- * default val: false
+ * default val: true
+  *
+  * 2) Whether to show "close" button on tabs:
+  * key:         show-close-button
+@@ -75,7 +75,7 @@
+ 
+ 
+ static gboolean
+-g_x_tabs_enabled = FALSE;
+g_x_tabs_enabled = TRUE;
+ 
+ static gboolean
+ g_x_tabs_show_close_button = TRUE;
+@@ -284,6 +284,28 @@ x_tabs_page_on_sel (GtkNotebook* nbook,
+                     guint        ndx,
+                     gpointer     data);
+ 
+static void
+x_tabs_page_on_reordered (GtkNotebook* nbook,
+                          GtkWidget*   wtab,
+                          guint        newindex,
+                          gpointer     data);
+
+
+static gboolean
+x_tabs_hdr_on_mouse_click (GtkWidget* hdr, GdkEvent* e, gpointer data);
+static GtkMenu*
+x_tabs_menu_create (TabInfo* nfo);
+static void
+x_tabs_menu_create_item (GschemToplevel* toplevel,
+                         GtkWidget*      menu,
+                         const gchar*    action_name,
+                         const gchar*    action_label,
+                         const gchar*    icon_name);
+static void
+x_tabs_menu_create_item_separ (GtkWidget* menu);
+static void
+x_tabs_menu_item_on_activate (GtkAction* action, gpointer data);
+
+ 
+ 
+ /* page view: */
+@@ -409,7 +431,24 @@ x_tabs_dbg_pages_dump (GschemToplevel* w
+   printf( " ^^^^^^^^^^^^^^ pages ^^^^^^^^^^^^^^^^^^\n\n" );
+ }
+ 
+-#endif
+static void
+x_tabs_dbg_pages_dump_simple (GschemToplevel* w_current)
+{
+  printf( " >> pages:\n" );
+  g_return_if_fail( w_current != NULL );
+
+  for ( GList* node = w_current->toplevel->pages->glist;
+        node != NULL;
+        node = g_list_next( node ) )
+  {
+    PAGE* p = node->data;
+    printf( "    p: [%s]\n", g_path_get_basename( s_page_get_filename(p) ) );
+  }
+
+  printf( "\n" );
+}
+
+#endif /* DEBUG */
+ 
+ 
+ 
+@@ -661,6 +700,11 @@ x_tabs_nbook_create (GschemToplevel* w_c
+   g_signal_connect (nbook, "switch-page",
+                     G_CALLBACK (&x_tabs_page_on_sel), w_current);
+ 
+  g_signal_connect (nbook,
+                    "page-reordered",
+                    G_CALLBACK (&x_tabs_page_on_reordered),
+                    w_current);
+
+ } /* x_tabs_nbook_create() */
+ 
+ 
+@@ -913,7 +957,18 @@ x_tabs_hdr_set (GtkNotebook* nbook, TabI
+   g_return_if_fail (nfo != NULL);
+ 
+   GtkWidget* hdr = x_tabs_hdr_create (nfo);
+-  gtk_notebook_set_tab_label (nbook, nfo->wtab_, hdr);
+
+  GtkWidget* ebox = gtk_event_box_new();
+  gtk_event_box_set_visible_window (GTK_EVENT_BOX (ebox), FALSE);
+  gtk_container_add (GTK_CONTAINER (ebox), hdr);
+  gtk_widget_show_all (ebox);
+
+  g_signal_connect (ebox,
+                    "button-press-event",
+                    G_CALLBACK (&x_tabs_hdr_on_mouse_click),
+                    nfo);
+
+  gtk_notebook_set_tab_label (nbook, nfo->wtab_, ebox);
+ }
+ 
+ 
+@@ -1160,6 +1215,8 @@ x_tabs_page_new (GschemToplevel* w_curre
+   x_tabs_tl_pview_cur_set (w_current, pview);
+   gint ndx = x_tabs_nbook_page_add (w_current, page, pview, wtab);
+ 
+  gtk_notebook_set_tab_reorderable (w_current->xtabs_nbook, wtab, TRUE);
+
+   return x_tabs_info_add (w_current, ndx, page, pview, wtab);
+ 
+ } /* x_tabs_page_new() */
+@@ -1485,3 +1542,158 @@ x_tabs_page_on_sel (GtkNotebook* nbook,
+ 
+ } /* x_tabs_page_on_sel() */
+ 
+
+
+/*! \brief GtkNotebook "page-reordered" signal handler.
+ */
+static void
+x_tabs_page_on_reordered (GtkNotebook* nbook,
+                          GtkWidget*   wtab,
+                          guint        newindex,
+                          gpointer     data)
+{
+  GschemToplevel* w_current = (GschemToplevel*) data;
+  g_return_if_fail (w_current != NULL);
+  g_return_if_fail (w_current->toplevel != NULL);
+  g_return_if_fail (w_current->toplevel->pages != NULL);
+
+  TabInfo* nfo = x_tabs_info_find_by_wtab (w_current->xtabs_info_list, wtab);
+  g_return_if_fail (nfo != NULL);
+
+  GedaPageList* pages = w_current->toplevel->pages;
+  geda_list_move_item (pages, nfo->page_, newindex);
+
+  gtk_widget_grab_focus (GTK_WIDGET (nfo->pview_));
+  page_select_widget_update (w_current);
+
+#ifdef DEBUG
+  x_tabs_dbg_pages_dump_simple( w_current );
+#endif
+
+} /* x_tabs_page_on_reordered() */
+
+
+
+/*! \brief Create popup menu for tab's header.
+ */
+static GtkMenu*
+x_tabs_menu_create (TabInfo* nfo)
+{
+  g_return_val_if_fail (nfo != NULL, NULL);
+
+  GschemToplevel* tl = nfo->tl_;
+  g_return_val_if_fail (tl != NULL, NULL);
+
+  GtkWidget* menu = gtk_menu_new();
+  x_tabs_menu_create_item (tl, menu, "file-new", _("_New"), GTK_STOCK_NEW);
+  x_tabs_menu_create_item (tl, menu, "file-open", _("_Open"), GTK_STOCK_OPEN);
+  x_tabs_menu_create_item_separ (menu);
+  x_tabs_menu_create_item (tl, menu, "file-save", _("_Save"), GTK_STOCK_SAVE);
+  x_tabs_menu_create_item (tl, menu, "file-save-as", _("Save _As..."), GTK_STOCK_SAVE_AS);
+  x_tabs_menu_create_item_separ (menu);
+  x_tabs_menu_create_item (tl, menu, "page-manager", _("Page _Manager..."), NULL);
+  x_tabs_menu_create_item_separ (menu);
+  x_tabs_menu_create_item (tl, menu, "page-close", _("_Close"), GTK_STOCK_CLOSE);
+
+  gtk_widget_show_all (menu);
+  return GTK_MENU (menu);
+
+} /* x_tabs_menu_create() */
+
+
+
+/*! \brief Tab's header widget "button-press-event" signal handler.
+ *  \todo  Consider switching to clicked tab
+ */
+static gboolean
+x_tabs_hdr_on_mouse_click (GtkWidget* hdr, GdkEvent* e, gpointer data)
+{
+  g_return_val_if_fail (data != NULL, FALSE);
+  GdkEventButton* ebtn = (GdkEventButton*) e;
+
+  TabInfo* nfo    = (TabInfo*) data;
+  TabInfo* nfocur = x_tabs_info_cur (nfo->tl_);
+
+  /* show menu for current tab only:
+  */
+  if (nfo != nfocur)
+    return FALSE;
+
+#ifdef DEBUG
+  printf( "p: [%s]\n",   g_path_get_basename( s_page_get_filename(nfo->page_) ) );
+  printf( "C: [%s]\n\n", g_path_get_basename( s_page_get_filename(nfocur->page_) ) );
+#endif
+
+  if (ebtn->type == GDK_BUTTON_PRESS && ebtn->button == 3)
+  {
+    GtkMenu* menu = x_tabs_menu_create (nfo);
+
+    int btn = 0;
+    int etime = 0;
+    if (ebtn != NULL)
+    {
+      btn = ebtn->button;
+      etime = gtk_get_current_event_time();
+    }
+
+    gtk_menu_attach_to_widget (menu, hdr, NULL);
+    gtk_menu_popup (menu, NULL, NULL, NULL, NULL, btn, etime);
+
+    return TRUE;
+  }
+
+  return FALSE;
+
+} /* x_tabs_page_on_mouse_click() */
+
+
+
+/*! \brief "activate" signal handler for context menu item action.
+ */
+static void
+x_tabs_menu_item_on_activate (GtkAction* action, gpointer data)
+{
+  GschemToplevel* toplevel    = (GschemToplevel*) data;
+  const gchar*    action_name = gtk_action_get_name (action);
+
+  g_action_eval_by_name (toplevel, action_name);
+}
+
+
+
+/*! \brief Create and add popup menu item separator.
+ */
+static void
+x_tabs_menu_create_item_separ (GtkWidget* menu)
+{
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+                         gtk_separator_menu_item_new());
+}
+
+
+
+/*! \brief Create and add popup menu item.
+ */
+static void
+x_tabs_menu_create_item (GschemToplevel* toplevel,
+                         GtkWidget*      menu,
+                         const gchar*    action_name,
+                         const gchar*    action_label,
+                         const gchar*    icon_name)
+{
+  GschemAction* action = gschem_action_new (action_name,  /* name */
+                                            action_label, /* label */
+                                            NULL,         /* tooltip */
+                                            icon_name,    /* stock_id */
+                                            NULL);        /* multikey_accel */
+
+  GtkWidget* item = gtk_action_create_menu_item (GTK_ACTION (action));
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  g_signal_connect (action,
+                    "activate",
+                    G_CALLBACK (&x_tabs_menu_item_on_activate),
+                    toplevel);
+
+} /* x_tabs_menu_create_item() */
+
--- a/cad/lepton-eda/files/patch-utils_gschlas_Makefile.am
+++ b/cad/lepton-eda/files/patch-utils_gschlas_Makefile.am
@ -1,11 +0,0 @@
--- utils/gschlas/Makefile.am.orig	2018-12-11 19:24:41 UTC
-+++ utils/gschlas/Makefile.am
-@@ -16,7 +16,7 @@ lepton_schlas_CPPFLAGS = -I$(top_srcdir)
- 	-I$(top_srcdir) -I$(includedir)
- lepton_schlas_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLAGS) $(GLIB_CFLAGS) \
- 	$(GUILE_CFLAGS) $(GDK_PIXBUF_CFLAGS)
-lepton_schlas_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS)
-+lepton_schlas_LDFLAGS = $(GLIB_LIBS) $(GUILE_LIBS) $(GDK_PIXBUF_LIBS) $(GIO_LIBS)
- lepton_schlas_LDADD = $(top_builddir)/liblepton/src/liblepton.la
- 
- MOSTLYCLEANFILES = *.log *.ps core FILE *~
--- a/cad/lepton-eda/files/patch-version.h
+++ b/cad/lepton-eda/files/patch-version.h
@ -1,11 +1,11 @@
--- version.h.orig	2018-12-13 02:49:55 UTC
+--- version.h.orig	2019-10-04 15:45:44 UTC
 +++ version.h
@@ -0,0 +1,8 @@
 +/* Date part of package version string. */
-+#define PACKAGE_DATE_VERSION "20181211"
+#define PACKAGE_DATE_VERSION "20191003"
 +
 +/* Dotted part of package version string. */
-+#define PACKAGE_DOTTED_VERSION "1.9.7"
+#define PACKAGE_DOTTED_VERSION "1.9.9"
 +
 +/* Current git commit. */
-+#define PACKAGE_GIT_COMMIT "f3a8714fdfd6dae491ebfff69f0fd9aa4899f9a6"
+#define PACKAGE_GIT_COMMIT "3139e7782564ff4bf76963984a735fbe638e43a0"
--- a/cad/lepton-eda/pkg-plist
+++ b/cad/lepton-eda/pkg-plist
@ -12,7 +12,7 @@ bin/lepton-schlas
 bin/lepton-symcheck
 bin/lepton-symfix
 bin/lepton-tragesym
-bin/lepton-xyrs
+bin/lepton-upcfg
 include/liblepton/defines.h
 include/liblepton/edaconfig.h
 include/liblepton/edaerrors.h
@ -68,11 +68,11 @@ include/libleptonrenderer/edacairo.h
 include/libleptonrenderer/edarenderer.h
 include/libleptonrenderer/libleptonrenderer.h
 lib/liblepton.so
-lib/liblepton.so.3
-lib/liblepton.so.3.0.0
+lib/liblepton.so.4
+lib/liblepton.so.4.0.0
 lib/libleptonrenderer.so
 lib/libleptonrenderer.so.1
-lib/libleptonrenderer.so.1.0.1
+lib/libleptonrenderer.so.1.0.2
 libdata/pkgconfig/liblepton.pc
 libdata/pkgconfig/libleptonrenderer.pc
 man/man1/lepton-archive.1.gz
@ -89,74 +89,58 @@ man/man1/lepton-schlas.1.gz
 man/man1/lepton-symcheck.1.gz
 man/man1/lepton-symfix.1.gz
 man/man1/lepton-tragesym.1.gz
-man/man1/lepton-xyrs.1.gz
 share/applications/lepton-attrib.desktop
 share/applications/lepton-schematic.desktop
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/5980-2396E.pdf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/MSA-2643.cir
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/MSA-2643.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q1.cir
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q1.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q2.cir
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q2.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Simulation.cmd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/gafrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/BJTM1_Q1.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/BJTM1_Q2.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM1_Q1.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM1_Q2.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM2_Q1.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM2_Q2.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM3_Q1.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM3_Q2.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/BJT_Model.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/Q_Model.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/spice-subcircuit-IO-1.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/spice-subcircuit-LL-1.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/Simulation.cmd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/TwoStageAmp.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/gafrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/models/2N3904.mod
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/spice.netlist
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/transistor.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/7414-1.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/attribs
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/copyleft.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/crdist.sh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/cy7c64603-52nc.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.ps
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.ps
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-pcb.net
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.ps
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.ps
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.bom
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.ps
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gafrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gnetlistrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/max882.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sn75240pw.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/bom
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/bom.readme
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/gafrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.net
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.pcb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.sch
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.sch.bom
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/2N4401.sym
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/2N4403.sym
 %%PORTDOCS%%%%DOCSDIR%%/gedadocs.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton-scheme.css
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Actions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Arcs.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Boxes.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Circles.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Component-objects.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Components.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Concept-Index.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Configuration-contexts.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Configuration-errors.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Configuration-events.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Configuration-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Configuration-parameters.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Coordinate-system.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Core-API-Reference.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Core-attribute-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Core-object-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Core-page-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Core-source-library-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Files-and-pages.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Function-Index.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/General-object-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Hooks.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Key-mapping.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton_002dnetlist-API-Reference.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/lepton_002dschematic-API-Reference.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Lines.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Logging-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Miscellanous-lepton_002dschematic-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Nets-and-buses.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-bounds.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-color.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-fill-and-stroke.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Objects.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-sub_002dtypes.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Object-transformations.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Pages.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Paths.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Pictures.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Pins.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Schematic-Document-Model.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Selections.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/System-information.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Text.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Variable-Index.html
+%%PORTDOCS%%%%DOCSDIR%%/lepton-scheme.html/Windows-and-views.html
 %%PORTDOCS%%%%DOCSDIR%%/man/lepton-archive.html
 %%PORTDOCS%%%%DOCSDIR%%/man/lepton-attrib.html
 %%PORTDOCS%%%%DOCSDIR%%/man/lepton-cli.html
@ -171,7 +155,6 @@ share/applications/lepton-schematic.desktop
 %%PORTDOCS%%%%DOCSDIR%%/man/lepton-symcheck.html
 %%PORTDOCS%%%%DOCSDIR%%/man/lepton-symfix.html
 %%PORTDOCS%%%%DOCSDIR%%/man/lepton-tragesym.html
-%%PORTDOCS%%%%DOCSDIR%%/man/lepton-xyrs.html
 %%PORTDOCS%%%%DOCSDIR%%/nc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/readmes/README.bom
 %%PORTDOCS%%%%DOCSDIR%%/readmes/README.eagle
@ -631,6 +614,70 @@ share/applications/lepton-schematic.desktop
 %%PORTDOCS%%%%DOCSDIR%%/wiki/wiki-dokuvimki.ru.html
 %%PORTDOCS%%%%DOCSDIR%%/wiki/wiki-dokuwiki.html
 %%PORTDOCS%%%%DOCSDIR%%/wiki/wiki-syntax.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/5980-2396E.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/MSA-2643.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/MSA-2643.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q1.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q1.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q2.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Q2.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/Simulation.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/gafrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/BJTM1_Q1.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/BJTM1_Q2.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM1_Q1.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM1_Q2.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM2_Q1.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM2_Q2.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM3_Q1.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/model/DiodeM3_Q2.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/BJT_Model.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/Q_Model.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/spice-subcircuit-IO-1.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RF_Amp/sym/spice-subcircuit-LL-1.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/Simulation.cmd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/TwoStageAmp.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/gafrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/models/2N3904.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/spice.netlist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TwoStageAmp/sym/transistor.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/7414-1.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/attribs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/copyleft.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/crdist.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/cy7c64603-52nc.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-consio.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-jtagio.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-pcb.net
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-psu.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG-ucont.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.bom
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gTAG.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gafrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/gnetlistrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/max882.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gTAG/sn75240pw.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/bom
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/bom.readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/gafrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.net
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.pcb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.sch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/lightning.sch.bom
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/2N4401.sym
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lightning_detector/sym/2N4403.sym
 share/icons/hicolor/16x16/mimetypes/application-x-lepton-sch2pcb-project.png
 share/icons/hicolor/16x16/mimetypes/application-x-lepton-schematic.png
 share/icons/hicolor/16x16/mimetypes/application-x-lepton-symbol.png
@ -691,8 +738,9 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%DATADIR%%/bitmap/gschem-top2bottom.png
 %%DATADIR%%/bitmap/gschem-undo.xpm
 %%DATADIR%%/bitmap/gschem-warning.png
+%%DATADIR%%/gafrc.d/config-netlist.scm
 %%DATADIR%%/gafrc.d/geda-clib.scm
-%%DATADIR%%/gattrib-menus.xml
+%%DATADIR%%/geda-system.conf
 %%DATADIR%%/gschem-colormap-bw
 %%DATADIR%%/gschem-colormap-darkbg
 %%DATADIR%%/gschem-colormap-lightbg
@ -723,14 +771,58 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%DATADIR%%/icons/hicolor/22x22/actions/insert-symbol.png
 %%DATADIR%%/icons/hicolor/22x22/actions/insert-text.png
 %%DATADIR%%/icons/hicolor/22x22/actions/select.png
-%%DATADIR%%/perl/lib/xyrs.pm
+%%DATADIR%%/lepton-system.conf
 %%DATADIR%%/print-colormap-darkbg
 %%DATADIR%%/print-colormap-lightbg
 %%DATADIR%%/scheme/auto-place-attribs.scm
 %%DATADIR%%/scheme/auto-place-netname.scm
 %%DATADIR%%/scheme/auto-refdes.scm
 %%DATADIR%%/scheme/auto-uref.scm
+%%DATADIR%%/scheme/backend/gnet-PCB.scm
+%%DATADIR%%/scheme/backend/gnet-allegro.scm
+%%DATADIR%%/scheme/backend/gnet-bae.scm
+%%DATADIR%%/scheme/backend/gnet-bom.scm
+%%DATADIR%%/scheme/backend/gnet-bom2.scm
+%%DATADIR%%/scheme/backend/gnet-calay.scm
+%%DATADIR%%/scheme/backend/gnet-cascade.scm
+%%DATADIR%%/scheme/backend/gnet-drc.scm
+%%DATADIR%%/scheme/backend/gnet-drc2.scm
+%%DATADIR%%/scheme/backend/gnet-eagle.scm
+%%DATADIR%%/scheme/backend/gnet-ewnet.scm
+%%DATADIR%%/scheme/backend/gnet-futurenet2.scm
+%%DATADIR%%/scheme/backend/gnet-geda.scm
+%%DATADIR%%/scheme/backend/gnet-gossip.scm
+%%DATADIR%%/scheme/backend/gnet-gsch2pcb.scm
+%%DATADIR%%/scheme/backend/gnet-liquidpcb.scm
+%%DATADIR%%/scheme/backend/gnet-makedepend.scm
+%%DATADIR%%/scheme/backend/gnet-mathematica.scm
+%%DATADIR%%/scheme/backend/gnet-maxascii.scm
+%%DATADIR%%/scheme/backend/gnet-osmond.scm
+%%DATADIR%%/scheme/backend/gnet-pads.scm
+%%DATADIR%%/scheme/backend/gnet-partslist1.scm
+%%DATADIR%%/scheme/backend/gnet-partslist2.scm
+%%DATADIR%%/scheme/backend/gnet-partslist3.scm
+%%DATADIR%%/scheme/backend/gnet-pcbpins.scm
+%%DATADIR%%/scheme/backend/gnet-protelII.scm
+%%DATADIR%%/scheme/backend/gnet-redac.scm
+%%DATADIR%%/scheme/backend/gnet-spice-sdb.scm
+%%DATADIR%%/scheme/backend/gnet-spice.scm
+%%DATADIR%%/scheme/backend/gnet-switcap.scm
+%%DATADIR%%/scheme/backend/gnet-systemc.scm
+%%DATADIR%%/scheme/backend/gnet-tEDAx.scm
+%%DATADIR%%/scheme/backend/gnet-tango.scm
+%%DATADIR%%/scheme/backend/gnet-vams.scm
+%%DATADIR%%/scheme/backend/gnet-verilog.scm
+%%DATADIR%%/scheme/backend/gnet-vhdl.scm
+%%DATADIR%%/scheme/backend/gnet-vipec.scm
+%%DATADIR%%/scheme/backend/spice/common.scm
 %%DATADIR%%/scheme/color-map.scm
+%%DATADIR%%/scheme/conf/schematic/attribs.scm
+%%DATADIR%%/scheme/conf/schematic/deprecated.scm
+%%DATADIR%%/scheme/conf/schematic/keys.scm
+%%DATADIR%%/scheme/conf/schematic/menu.scm
+%%DATADIR%%/scheme/conf/schematic/options.scm
+%%DATADIR%%/scheme/conf/schematic/stroke.scm
 %%DATADIR%%/scheme/default-attrib-positions.scm
 %%DATADIR%%/scheme/geda-deprecated-config.scm
 %%DATADIR%%/scheme/geda.scm
@ -745,66 +837,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%DATADIR%%/scheme/geda/os.scm
 %%DATADIR%%/scheme/geda/page.scm
 %%DATADIR%%/scheme/geda/repl.scm
-%%DATADIR%%/scheme/generate_netlist.scm
-%%DATADIR%%/scheme/gnet-PCB.scm
-%%DATADIR%%/scheme/gnet-allegro.scm
-%%DATADIR%%/scheme/gnet-bae.scm
-%%DATADIR%%/scheme/gnet-bom.scm
-%%DATADIR%%/scheme/gnet-bom2.scm
-%%DATADIR%%/scheme/gnet-calay.scm
-%%DATADIR%%/scheme/gnet-cascade.scm
-%%DATADIR%%/scheme/gnet-drc.scm
-%%DATADIR%%/scheme/gnet-drc2.scm
-%%DATADIR%%/scheme/gnet-eagle.scm
-%%DATADIR%%/scheme/gnet-ewnet.scm
-%%DATADIR%%/scheme/gnet-futurenet2.scm
-%%DATADIR%%/scheme/gnet-geda.scm
-%%DATADIR%%/scheme/gnet-gossip.scm
-%%DATADIR%%/scheme/gnet-gsch2pcb.scm
-%%DATADIR%%/scheme/gnet-liquidpcb.scm
-%%DATADIR%%/scheme/gnet-makedepend.scm
-%%DATADIR%%/scheme/gnet-mathematica.scm
-%%DATADIR%%/scheme/gnet-maxascii.scm
-%%DATADIR%%/scheme/gnet-osmond.scm
-%%DATADIR%%/scheme/gnet-pads.scm
-%%DATADIR%%/scheme/gnet-partslist1.scm
-%%DATADIR%%/scheme/gnet-partslist2.scm
-%%DATADIR%%/scheme/gnet-partslist3.scm
-%%DATADIR%%/scheme/gnet-pcbpins.scm
-%%DATADIR%%/scheme/gnet-protelII.scm
-%%DATADIR%%/scheme/gnet-redac.scm
-%%DATADIR%%/scheme/gnet-spice-sdb.scm
-%%DATADIR%%/scheme/gnet-spice.scm
-%%DATADIR%%/scheme/gnet-switcap.scm
-%%DATADIR%%/scheme/gnet-systemc.scm
-%%DATADIR%%/scheme/gnet-tEDAx.scm
-%%DATADIR%%/scheme/gnet-tango.scm
-%%DATADIR%%/scheme/gnet-vams.scm
-%%DATADIR%%/scheme/gnet-verilog.scm
-%%DATADIR%%/scheme/gnet-vhdl.scm
-%%DATADIR%%/scheme/gnet-vipec.scm
-%%DATADIR%%/scheme/netlist.scm
-%%DATADIR%%/scheme/netlist/attrib/compare.scm
-%%DATADIR%%/scheme/netlist/backend-getopt.scm
-%%DATADIR%%/scheme/netlist/config.scm
-%%DATADIR%%/scheme/netlist/error.scm
-%%DATADIR%%/scheme/netlist/core/gettext.scm
-%%DATADIR%%/scheme/netlist/hierarchy.scm
-%%DATADIR%%/scheme/netlist/net.scm
-%%DATADIR%%/scheme/netlist/option.scm
-%%DATADIR%%/scheme/netlist/package-pin.scm
-%%DATADIR%%/scheme/netlist/package.scm
-%%DATADIR%%/scheme/netlist/partlist.scm
-%%DATADIR%%/scheme/netlist/partlist/common.scm
-%%DATADIR%%/scheme/netlist/pin-net.scm
-%%DATADIR%%/scheme/netlist/port.scm
-%%DATADIR%%/scheme/netlist/rename.scm
-%%DATADIR%%/scheme/netlist/repl.scm
-%%DATADIR%%/scheme/netlist/schematic.scm
-%%DATADIR%%/scheme/netlist/sort.scm
-%%DATADIR%%/scheme/netlist/traverse.scm
-%%DATADIR%%/scheme/netlist/verbose.scm
-%%DATADIR%%/scheme/gschem.scm
 %%DATADIR%%/scheme/gschem/action.scm
 %%DATADIR%%/scheme/gschem/attrib.scm
 %%DATADIR%%/scheme/gschem/builtins.scm
@ -818,14 +850,47 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%DATADIR%%/scheme/gschem/symbol/check.scm
 %%DATADIR%%/scheme/gschem/util.scm
 %%DATADIR%%/scheme/gschem/window.scm
-%%DATADIR%%/scheme/image.scm
+%%DATADIR%%/scheme/lepton/file-system.scm
+%%DATADIR%%/scheme/lepton/legacy-config.scm
+%%DATADIR%%/scheme/lepton/legacy-config/keylist.scm
+%%DATADIR%%/scheme/lepton/library.scm
+%%DATADIR%%/scheme/lepton/library/component.scm
+%%DATADIR%%/scheme/lepton/rc.scm
 %%DATADIR%%/scheme/lepton/version.scm
 %%DATADIR%%/scheme/list-keys.scm
+%%DATADIR%%/scheme/netlist.scm
+%%DATADIR%%/scheme/netlist/attrib/compare.scm
+%%DATADIR%%/scheme/netlist/backend-getopt.scm
+%%DATADIR%%/scheme/netlist/config.scm
+%%DATADIR%%/scheme/netlist/core/gettext.scm
+%%DATADIR%%/scheme/netlist/deprecated.scm
+%%DATADIR%%/scheme/netlist/error.scm
+%%DATADIR%%/scheme/netlist/hierarchy.scm
+%%DATADIR%%/scheme/netlist/net.scm
+%%DATADIR%%/scheme/netlist/option.scm
+%%DATADIR%%/scheme/netlist/package-pin.scm
+%%DATADIR%%/scheme/netlist/package.scm
+%%DATADIR%%/scheme/netlist/page.scm
+%%DATADIR%%/scheme/netlist/partlist.scm
+%%DATADIR%%/scheme/netlist/partlist/common.scm
+%%DATADIR%%/scheme/netlist/pin-net.scm
+%%DATADIR%%/scheme/netlist/port.scm
+%%DATADIR%%/scheme/netlist/rename.scm
+%%DATADIR%%/scheme/netlist/repl.scm
+%%DATADIR%%/scheme/netlist/schematic-component.scm
+%%DATADIR%%/scheme/netlist/schematic-connection.scm
+%%DATADIR%%/scheme/netlist/schematic.scm
+%%DATADIR%%/scheme/netlist/schematic/toplevel.scm
+%%DATADIR%%/scheme/netlist/sort.scm
+%%DATADIR%%/scheme/netlist/traverse.scm
+%%DATADIR%%/scheme/netlist/verbose.scm
 %%DATADIR%%/scheme/pcb.scm
 %%DATADIR%%/scheme/print-NB-attribs.scm
-%%DATADIR%%/scheme/print.scm
+%%DATADIR%%/scheme/schematic/gui/keymap.scm
+%%DATADIR%%/scheme/schematic/gui/stroke.scm
+%%DATADIR%%/scheme/schematic/netlist.scm
+%%DATADIR%%/scheme/schematic/precompile.scm
 %%DATADIR%%/scheme/schematic/undo.scm
-%%DATADIR%%/scheme/spice-common.scm
 %%DATADIR%%/scheme/symbol/blame.scm
 %%DATADIR%%/scheme/symbol/check.scm
 %%DATADIR%%/scheme/symbol/check/alignment.scm
@ -855,6 +920,184 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%DATADIR%%/scheme/symcheck/check.scm
 %%DATADIR%%/scheme/symcheck/option.scm
 %%DATADIR%%/scheme/symcheck/report.scm
+%%DATADIR%%/sym-gnetman/capacitor-1.sym
+%%DATADIR%%/sym-gnetman/ccvs-1.sym
+%%DATADIR%%/sym-gnetman/clkinv.sym
+%%DATADIR%%/sym-gnetman/cvstitle.sym
+%%DATADIR%%/sym-gnetman/dffr.sym
+%%DATADIR%%/sym-gnetman/idc-1.sym
+%%DATADIR%%/sym-gnetman/in.sym
+%%DATADIR%%/sym-gnetman/inductor-1.sym
+%%DATADIR%%/sym-gnetman/inv.sym
+%%DATADIR%%/sym-gnetman/io.sym
+%%DATADIR%%/sym-gnetman/lat.sym
+%%DATADIR%%/sym-gnetman/latr.sym
+%%DATADIR%%/sym-gnetman/nand2.sym
+%%DATADIR%%/sym-gnetman/nand3.sym
+%%DATADIR%%/sym-gnetman/nmos.sym
+%%DATADIR%%/sym-gnetman/nmos4.sym
+%%DATADIR%%/sym-gnetman/nor2.sym
+%%DATADIR%%/sym-gnetman/out.sym
+%%DATADIR%%/sym-gnetman/passtrans.sym
+%%DATADIR%%/sym-gnetman/pmos.sym
+%%DATADIR%%/sym-gnetman/pmos4.sym
+%%DATADIR%%/sym-gnetman/resistor-1.sym
+%%DATADIR%%/sym-gnetman/vccs-1.sym
+%%DATADIR%%/sym-gnetman/vcvs-1.sym
+%%DATADIR%%/sym-gnetman/vdc-1.sym
+%%DATADIR%%/sym-gnetman/vdd.sym
+%%DATADIR%%/sym-gnetman/vpulse-1.sym
+%%DATADIR%%/sym-gnetman/vpwl-1.sym
+%%DATADIR%%/sym-gnetman/vss.sym
+%%DATADIR%%/sym-verilog/and2-1.sym
+%%DATADIR%%/sym-verilog/and2-2.sym
+%%DATADIR%%/sym-verilog/and3-1.sym
+%%DATADIR%%/sym-verilog/and3-2.sym
+%%DATADIR%%/sym-verilog/and4-1.sym
+%%DATADIR%%/sym-verilog/and4-2.sym
+%%DATADIR%%/sym-verilog/and5-1.sym
+%%DATADIR%%/sym-verilog/and5-2.sym
+%%DATADIR%%/sym-verilog/and6-1.sym
+%%DATADIR%%/sym-verilog/and6-2.sym
+%%DATADIR%%/sym-verilog/and7-1.sym
+%%DATADIR%%/sym-verilog/and7-2.sym
+%%DATADIR%%/sym-verilog/and8-1.sym
+%%DATADIR%%/sym-verilog/and8-2.sym
+%%DATADIR%%/sym-verilog/and9-1.sym
+%%DATADIR%%/sym-verilog/and9-2.sym
+%%DATADIR%%/sym-verilog/block-1.sym
+%%DATADIR%%/sym-verilog/block_pos-1.sym
+%%DATADIR%%/sym-verilog/buf-1.sym
+%%DATADIR%%/sym-verilog/bufif0-1.sym
+%%DATADIR%%/sym-verilog/bufif1-1.sym
+%%DATADIR%%/sym-verilog/high-1.sym
+%%DATADIR%%/sym-verilog/iopad-1.sym
+%%DATADIR%%/sym-verilog/ipad-1.sym
+%%DATADIR%%/sym-verilog/low-1.sym
+%%DATADIR%%/sym-verilog/nand2-1.sym
+%%DATADIR%%/sym-verilog/nand2-2.sym
+%%DATADIR%%/sym-verilog/nand3-1.sym
+%%DATADIR%%/sym-verilog/nand3-2.sym
+%%DATADIR%%/sym-verilog/nand4-1.sym
+%%DATADIR%%/sym-verilog/nand4-2.sym
+%%DATADIR%%/sym-verilog/nand5-1.sym
+%%DATADIR%%/sym-verilog/nand5-2.sym
+%%DATADIR%%/sym-verilog/nand6-1.sym
+%%DATADIR%%/sym-verilog/nand6-2.sym
+%%DATADIR%%/sym-verilog/nand7-1.sym
+%%DATADIR%%/sym-verilog/nand7-2.sym
+%%DATADIR%%/sym-verilog/nand8-1.sym
+%%DATADIR%%/sym-verilog/nand8-2.sym
+%%DATADIR%%/sym-verilog/nand9-1.sym
+%%DATADIR%%/sym-verilog/nand9-2.sym
+%%DATADIR%%/sym-verilog/nor2-1.sym
+%%DATADIR%%/sym-verilog/nor2-2.sym
+%%DATADIR%%/sym-verilog/nor3-1.sym
+%%DATADIR%%/sym-verilog/nor3-2.sym
+%%DATADIR%%/sym-verilog/nor4-1.sym
+%%DATADIR%%/sym-verilog/nor4-2.sym
+%%DATADIR%%/sym-verilog/nor5-1.sym
+%%DATADIR%%/sym-verilog/nor5-2.sym
+%%DATADIR%%/sym-verilog/nor6-1.sym
+%%DATADIR%%/sym-verilog/nor6-2.sym
+%%DATADIR%%/sym-verilog/nor7-1.sym
+%%DATADIR%%/sym-verilog/nor7-2.sym
+%%DATADIR%%/sym-verilog/nor8-1.sym
+%%DATADIR%%/sym-verilog/nor8-2.sym
+%%DATADIR%%/sym-verilog/nor9-1.sym
+%%DATADIR%%/sym-verilog/nor9-2.sym
+%%DATADIR%%/sym-verilog/not-1.sym
+%%DATADIR%%/sym-verilog/notif0-1.sym
+%%DATADIR%%/sym-verilog/notif1-1.sym
+%%DATADIR%%/sym-verilog/opad-1.sym
+%%DATADIR%%/sym-verilog/or2-1.sym
+%%DATADIR%%/sym-verilog/or2-2.sym
+%%DATADIR%%/sym-verilog/or3-1.sym
+%%DATADIR%%/sym-verilog/or3-2.sym
+%%DATADIR%%/sym-verilog/or4-1.sym
+%%DATADIR%%/sym-verilog/or4-2.sym
+%%DATADIR%%/sym-verilog/or5-1.sym
+%%DATADIR%%/sym-verilog/or5-2.sym
+%%DATADIR%%/sym-verilog/or6-1.sym
+%%DATADIR%%/sym-verilog/or6-2.sym
+%%DATADIR%%/sym-verilog/or7-1.sym
+%%DATADIR%%/sym-verilog/or7-2.sym
+%%DATADIR%%/sym-verilog/or8-1.sym
+%%DATADIR%%/sym-verilog/or8-2.sym
+%%DATADIR%%/sym-verilog/or9-1.sym
+%%DATADIR%%/sym-verilog/or9-2.sym
+%%DATADIR%%/sym-verilog/pulldown-1.sym
+%%DATADIR%%/sym-verilog/pullup-1.sym
+%%DATADIR%%/sym-verilog/test_verilog.sym
+%%DATADIR%%/sym-verilog/xnor2-1.sym
+%%DATADIR%%/sym-verilog/xnor3-1.sym
+%%DATADIR%%/sym-verilog/xnor4-1.sym
+%%DATADIR%%/sym-verilog/xnor5-1.sym
+%%DATADIR%%/sym-verilog/xnor6-1.sym
+%%DATADIR%%/sym-verilog/xnor7-1.sym
+%%DATADIR%%/sym-verilog/xnor8-1.sym
+%%DATADIR%%/sym-verilog/xnor9-1.sym
+%%DATADIR%%/sym-verilog/xor2-1.sym
+%%DATADIR%%/sym-verilog/xor3-1.sym
+%%DATADIR%%/sym-verilog/xor4-1.sym
+%%DATADIR%%/sym-verilog/xor5-1.sym
+%%DATADIR%%/sym-verilog/xor6-1.sym
+%%DATADIR%%/sym-verilog/xor7-1.sym
+%%DATADIR%%/sym-verilog/xor8-1.sym
+%%DATADIR%%/sym-verilog/xor9-1.sym
+%%DATADIR%%/sym-vhdl/and2-1.sym
+%%DATADIR%%/sym-vhdl/and3-1.sym
+%%DATADIR%%/sym-vhdl/and4-1.sym
+%%DATADIR%%/sym-vhdl/and5-1.sym
+%%DATADIR%%/sym-vhdl/and6-1.sym
+%%DATADIR%%/sym-vhdl/and7-1.sym
+%%DATADIR%%/sym-vhdl/and8-1.sym
+%%DATADIR%%/sym-vhdl/and9-1.sym
+%%DATADIR%%/sym-vhdl/iopad-1.sym
+%%DATADIR%%/sym-vhdl/ipad-1.sym
+%%DATADIR%%/sym-vhdl/nand2-1.sym
+%%DATADIR%%/sym-vhdl/nand3-1.sym
+%%DATADIR%%/sym-vhdl/nand4-1.sym
+%%DATADIR%%/sym-vhdl/nand5-1.sym
+%%DATADIR%%/sym-vhdl/nand6-1.sym
+%%DATADIR%%/sym-vhdl/nand7-1.sym
+%%DATADIR%%/sym-vhdl/nand8-1.sym
+%%DATADIR%%/sym-vhdl/nand9-1.sym
+%%DATADIR%%/sym-vhdl/nor2-1.sym
+%%DATADIR%%/sym-vhdl/nor3-1.sym
+%%DATADIR%%/sym-vhdl/nor4-1.sym
+%%DATADIR%%/sym-vhdl/nor5-1.sym
+%%DATADIR%%/sym-vhdl/nor6-1.sym
+%%DATADIR%%/sym-vhdl/nor7-1.sym
+%%DATADIR%%/sym-vhdl/nor8-1.sym
+%%DATADIR%%/sym-vhdl/nor9-1.sym
+%%DATADIR%%/sym-vhdl/not-1.sym
+%%DATADIR%%/sym-vhdl/opad-1.sym
+%%DATADIR%%/sym-vhdl/opad6-1.sym
+%%DATADIR%%/sym-vhdl/or2-1.sym
+%%DATADIR%%/sym-vhdl/or3-1.sym
+%%DATADIR%%/sym-vhdl/or4-1.sym
+%%DATADIR%%/sym-vhdl/or5-1.sym
+%%DATADIR%%/sym-vhdl/or6-1.sym
+%%DATADIR%%/sym-vhdl/or7-1.sym
+%%DATADIR%%/sym-vhdl/or8-1.sym
+%%DATADIR%%/sym-vhdl/or9-1.sym
+%%DATADIR%%/sym-vhdl/xnor2-1.sym
+%%DATADIR%%/sym-vhdl/xnor3-1.sym
+%%DATADIR%%/sym-vhdl/xnor4-1.sym
+%%DATADIR%%/sym-vhdl/xnor5-1.sym
+%%DATADIR%%/sym-vhdl/xnor6-1.sym
+%%DATADIR%%/sym-vhdl/xnor7-1.sym
+%%DATADIR%%/sym-vhdl/xnor8-1.sym
+%%DATADIR%%/sym-vhdl/xnor9-1.sym
+%%DATADIR%%/sym-vhdl/xor2-1.sym
+%%DATADIR%%/sym-vhdl/xor3-1.sym
+%%DATADIR%%/sym-vhdl/xor4-1.sym
+%%DATADIR%%/sym-vhdl/xor5-1.sym
+%%DATADIR%%/sym-vhdl/xor6-1.sym
+%%DATADIR%%/sym-vhdl/xor7-1.sym
+%%DATADIR%%/sym-vhdl/xor8-1.sym
+%%DATADIR%%/sym-vhdl/xor9-1.sym
 %%DATADIR%%/sym/4000/4000-1.sym
 %%DATADIR%%/sym/4000/4000-2.sym
 %%DATADIR%%/sym/4000/4001-1.sym
@ -1604,35 +1847,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%DATADIR%%/sym/ecl/MC10E137-1.sym
 %%DATADIR%%/sym/ecl/MC10E137-2.sym
 %%DATADIR%%/sym/ecl/MC12429-1.sym
-%%DATADIR%%/sym/gnetman/capacitor-1.sym
-%%DATADIR%%/sym/gnetman/ccvs-1.sym
-%%DATADIR%%/sym/gnetman/clkinv.sym
-%%DATADIR%%/sym/gnetman/cvstitle.sym
-%%DATADIR%%/sym/gnetman/dffr.sym
-%%DATADIR%%/sym/gnetman/idc-1.sym
-%%DATADIR%%/sym/gnetman/in.sym
-%%DATADIR%%/sym/gnetman/inductor-1.sym
-%%DATADIR%%/sym/gnetman/inv.sym
-%%DATADIR%%/sym/gnetman/io.sym
-%%DATADIR%%/sym/gnetman/lat.sym
-%%DATADIR%%/sym/gnetman/latr.sym
-%%DATADIR%%/sym/gnetman/nand2.sym
-%%DATADIR%%/sym/gnetman/nand3.sym
-%%DATADIR%%/sym/gnetman/nmos.sym
-%%DATADIR%%/sym/gnetman/nmos4.sym
-%%DATADIR%%/sym/gnetman/nor2.sym
-%%DATADIR%%/sym/gnetman/out.sym
-%%DATADIR%%/sym/gnetman/passtrans.sym
-%%DATADIR%%/sym/gnetman/pmos.sym
-%%DATADIR%%/sym/gnetman/pmos4.sym
-%%DATADIR%%/sym/gnetman/resistor-1.sym
-%%DATADIR%%/sym/gnetman/vccs-1.sym
-%%DATADIR%%/sym/gnetman/vcvs-1.sym
-%%DATADIR%%/sym/gnetman/vdc-1.sym
-%%DATADIR%%/sym/gnetman/vdd.sym
-%%DATADIR%%/sym/gnetman/vpulse-1.sym
-%%DATADIR%%/sym/gnetman/vpwl-1.sym
-%%DATADIR%%/sym/gnetman/vss.sym
 %%DATADIR%%/sym/idt/idt7204-1.sym
 %%DATADIR%%/sym/io/LCD-1.sym
 %%DATADIR%%/sym/io/TEC4x3-1.sym
@ -2178,155 +2392,6 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%DATADIR%%/sym/tube/12SQ7-1.sym
 %%DATADIR%%/sym/tube/35Z5GT-1.sym
 %%DATADIR%%/sym/tube/50L6GT-1.sym
-%%DATADIR%%/sym/verilog/and2-1.sym
-%%DATADIR%%/sym/verilog/and2-2.sym
-%%DATADIR%%/sym/verilog/and3-1.sym
-%%DATADIR%%/sym/verilog/and3-2.sym
-%%DATADIR%%/sym/verilog/and4-1.sym
-%%DATADIR%%/sym/verilog/and4-2.sym
-%%DATADIR%%/sym/verilog/and5-1.sym
-%%DATADIR%%/sym/verilog/and5-2.sym
-%%DATADIR%%/sym/verilog/and6-1.sym
-%%DATADIR%%/sym/verilog/and6-2.sym
-%%DATADIR%%/sym/verilog/and7-1.sym
-%%DATADIR%%/sym/verilog/and7-2.sym
-%%DATADIR%%/sym/verilog/and8-1.sym
-%%DATADIR%%/sym/verilog/and8-2.sym
-%%DATADIR%%/sym/verilog/and9-1.sym
-%%DATADIR%%/sym/verilog/and9-2.sym
-%%DATADIR%%/sym/verilog/block-1.sym
-%%DATADIR%%/sym/verilog/block_pos-1.sym
-%%DATADIR%%/sym/verilog/buf-1.sym
-%%DATADIR%%/sym/verilog/bufif0-1.sym
-%%DATADIR%%/sym/verilog/bufif1-1.sym
-%%DATADIR%%/sym/verilog/high-1.sym
-%%DATADIR%%/sym/verilog/iopad-1.sym
-%%DATADIR%%/sym/verilog/ipad-1.sym
-%%DATADIR%%/sym/verilog/low-1.sym
-%%DATADIR%%/sym/verilog/nand2-1.sym
-%%DATADIR%%/sym/verilog/nand2-2.sym
-%%DATADIR%%/sym/verilog/nand3-1.sym
-%%DATADIR%%/sym/verilog/nand3-2.sym
-%%DATADIR%%/sym/verilog/nand4-1.sym
-%%DATADIR%%/sym/verilog/nand4-2.sym
-%%DATADIR%%/sym/verilog/nand5-1.sym
-%%DATADIR%%/sym/verilog/nand5-2.sym
-%%DATADIR%%/sym/verilog/nand6-1.sym
-%%DATADIR%%/sym/verilog/nand6-2.sym
-%%DATADIR%%/sym/verilog/nand7-1.sym
-%%DATADIR%%/sym/verilog/nand7-2.sym
-%%DATADIR%%/sym/verilog/nand8-1.sym
-%%DATADIR%%/sym/verilog/nand8-2.sym
-%%DATADIR%%/sym/verilog/nand9-1.sym
-%%DATADIR%%/sym/verilog/nand9-2.sym
-%%DATADIR%%/sym/verilog/nor2-1.sym
-%%DATADIR%%/sym/verilog/nor2-2.sym
-%%DATADIR%%/sym/verilog/nor3-1.sym
-%%DATADIR%%/sym/verilog/nor3-2.sym
-%%DATADIR%%/sym/verilog/nor4-1.sym
-%%DATADIR%%/sym/verilog/nor4-2.sym
-%%DATADIR%%/sym/verilog/nor5-1.sym
-%%DATADIR%%/sym/verilog/nor5-2.sym
-%%DATADIR%%/sym/verilog/nor6-1.sym
-%%DATADIR%%/sym/verilog/nor6-2.sym
-%%DATADIR%%/sym/verilog/nor7-1.sym
-%%DATADIR%%/sym/verilog/nor7-2.sym
-%%DATADIR%%/sym/verilog/nor8-1.sym
-%%DATADIR%%/sym/verilog/nor8-2.sym
-%%DATADIR%%/sym/verilog/nor9-1.sym
-%%DATADIR%%/sym/verilog/nor9-2.sym
-%%DATADIR%%/sym/verilog/not-1.sym
-%%DATADIR%%/sym/verilog/notif0-1.sym
-%%DATADIR%%/sym/verilog/notif1-1.sym
-%%DATADIR%%/sym/verilog/opad-1.sym
-%%DATADIR%%/sym/verilog/or2-1.sym
-%%DATADIR%%/sym/verilog/or2-2.sym
-%%DATADIR%%/sym/verilog/or3-1.sym
-%%DATADIR%%/sym/verilog/or3-2.sym
-%%DATADIR%%/sym/verilog/or4-1.sym
-%%DATADIR%%/sym/verilog/or4-2.sym
-%%DATADIR%%/sym/verilog/or5-1.sym
-%%DATADIR%%/sym/verilog/or5-2.sym
-%%DATADIR%%/sym/verilog/or6-1.sym
-%%DATADIR%%/sym/verilog/or6-2.sym
-%%DATADIR%%/sym/verilog/or7-1.sym
-%%DATADIR%%/sym/verilog/or7-2.sym
-%%DATADIR%%/sym/verilog/or8-1.sym
-%%DATADIR%%/sym/verilog/or8-2.sym
-%%DATADIR%%/sym/verilog/or9-1.sym
-%%DATADIR%%/sym/verilog/or9-2.sym
-%%DATADIR%%/sym/verilog/pulldown-1.sym
-%%DATADIR%%/sym/verilog/pullup-1.sym
-%%DATADIR%%/sym/verilog/test_verilog.sym
-%%DATADIR%%/sym/verilog/xnor2-1.sym
-%%DATADIR%%/sym/verilog/xnor3-1.sym
-%%DATADIR%%/sym/verilog/xnor4-1.sym
-%%DATADIR%%/sym/verilog/xnor5-1.sym
-%%DATADIR%%/sym/verilog/xnor6-1.sym
-%%DATADIR%%/sym/verilog/xnor7-1.sym
-%%DATADIR%%/sym/verilog/xnor8-1.sym
-%%DATADIR%%/sym/verilog/xnor9-1.sym
-%%DATADIR%%/sym/verilog/xor2-1.sym
-%%DATADIR%%/sym/verilog/xor3-1.sym
-%%DATADIR%%/sym/verilog/xor4-1.sym
-%%DATADIR%%/sym/verilog/xor5-1.sym
-%%DATADIR%%/sym/verilog/xor6-1.sym
-%%DATADIR%%/sym/verilog/xor7-1.sym
-%%DATADIR%%/sym/verilog/xor8-1.sym
-%%DATADIR%%/sym/verilog/xor9-1.sym
-%%DATADIR%%/sym/vhdl/and2-1.sym
-%%DATADIR%%/sym/vhdl/and3-1.sym
-%%DATADIR%%/sym/vhdl/and4-1.sym
-%%DATADIR%%/sym/vhdl/and5-1.sym
-%%DATADIR%%/sym/vhdl/and6-1.sym
-%%DATADIR%%/sym/vhdl/and7-1.sym
-%%DATADIR%%/sym/vhdl/and8-1.sym
-%%DATADIR%%/sym/vhdl/and9-1.sym
-%%DATADIR%%/sym/vhdl/iopad-1.sym
-%%DATADIR%%/sym/vhdl/ipad-1.sym
-%%DATADIR%%/sym/vhdl/nand2-1.sym
-%%DATADIR%%/sym/vhdl/nand3-1.sym
-%%DATADIR%%/sym/vhdl/nand4-1.sym
-%%DATADIR%%/sym/vhdl/nand5-1.sym
-%%DATADIR%%/sym/vhdl/nand6-1.sym
-%%DATADIR%%/sym/vhdl/nand7-1.sym
-%%DATADIR%%/sym/vhdl/nand8-1.sym
-%%DATADIR%%/sym/vhdl/nand9-1.sym
-%%DATADIR%%/sym/vhdl/nor2-1.sym
-%%DATADIR%%/sym/vhdl/nor3-1.sym
-%%DATADIR%%/sym/vhdl/nor4-1.sym
-%%DATADIR%%/sym/vhdl/nor5-1.sym
-%%DATADIR%%/sym/vhdl/nor6-1.sym
-%%DATADIR%%/sym/vhdl/nor7-1.sym
-%%DATADIR%%/sym/vhdl/nor8-1.sym
-%%DATADIR%%/sym/vhdl/nor9-1.sym
-%%DATADIR%%/sym/vhdl/not-1.sym
-%%DATADIR%%/sym/vhdl/opad-1.sym
-%%DATADIR%%/sym/vhdl/opad6-1.sym
-%%DATADIR%%/sym/vhdl/or2-1.sym
-%%DATADIR%%/sym/vhdl/or3-1.sym
-%%DATADIR%%/sym/vhdl/or4-1.sym
-%%DATADIR%%/sym/vhdl/or5-1.sym
-%%DATADIR%%/sym/vhdl/or6-1.sym
-%%DATADIR%%/sym/vhdl/or7-1.sym
-%%DATADIR%%/sym/vhdl/or8-1.sym
-%%DATADIR%%/sym/vhdl/or9-1.sym
-%%DATADIR%%/sym/vhdl/xnor2-1.sym
-%%DATADIR%%/sym/vhdl/xnor3-1.sym
-%%DATADIR%%/sym/vhdl/xnor4-1.sym
-%%DATADIR%%/sym/vhdl/xnor5-1.sym
-%%DATADIR%%/sym/vhdl/xnor6-1.sym
-%%DATADIR%%/sym/vhdl/xnor7-1.sym
-%%DATADIR%%/sym/vhdl/xnor8-1.sym
-%%DATADIR%%/sym/vhdl/xnor9-1.sym
-%%DATADIR%%/sym/vhdl/xor2-1.sym
-%%DATADIR%%/sym/vhdl/xor3-1.sym
-%%DATADIR%%/sym/vhdl/xor4-1.sym
-%%DATADIR%%/sym/vhdl/xor5-1.sym
-%%DATADIR%%/sym/vhdl/xor6-1.sym
-%%DATADIR%%/sym/vhdl/xor7-1.sym
-%%DATADIR%%/sym/vhdl/xor8-1.sym
-%%DATADIR%%/sym/vhdl/xor9-1.sym
 %%DATADIR%%/sym/xilinx/XC2S100-5PQ208C.sym
 %%DATADIR%%/sym/xilinx/XC2S100-5PQ208I.sym
 %%DATADIR%%/sym/xilinx/XC2S100-6PQ208C.sym
@ -2344,50 +2409,48 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%DATADIR%%/sym/xilinx/XC2S50-6PQ208C.sym
 %%DATADIR%%/sym/xilinx/XC95108-PC84.sym
 %%DATADIR%%/system-gafrc
-%%DATADIR%%/system-gattribrc
 %%DATADIR%%/system-gschemrc
-%%DATADIR%%/system-gschlasrc
 %%NLS%%share/locale/af/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/af/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/lepton-attrib.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/da/LC_MESSAGES/lepton-attrib.mo
-%%NLS%%share/locale/da/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/da/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/de/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/de/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/el/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/el/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/el/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/el/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/es/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/es/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/es/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/es/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/he/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lepton-cli.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lepton-symcheck.mo
-%%NLS%%share/locale/it/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/it/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/ml/LC_MESSAGES/lepton-attrib.mo
@ -2398,40 +2461,40 @@ share/icons/hicolor/scalable/mimetypes/application-x-lepton-symbol.svg
 %%NLS%%share/locale/nl/LC_MESSAGES/lepton-netlist.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/lepton-symcheck.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/oc/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/lepton-cli.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/lepton-netlist.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/lepton-schematic.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/lepton-attrib.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/lepton-attrib.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/liblepton.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lepton-attrib.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lepton-schematic.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/liblepton3.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/liblepton.mo
 share/mime/application/x-lepton-sch2pcb-project.xml
 share/mime/application/x-lepton-schematic.xml
 share/mime/application/x-lepton-symbol.xml