[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (rel_20070526-39-g9dde023)
The branch, master has been updated
via 9dde0233ebed32065511b567445f9f34d4b3bea1 (commit)
via 041fa3eedf71df34cdd04bad4c2cd5b08cff7232 (commit)
via 10f0c8203b1fa9c87d09f1aeb4da28a0e5599ea8 (commit)
from 460afb7f9193cca180acb0ac5f35ff1702a8f2ba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=================
Commit Messages
=================
commit 9dde0233ebed32065511b567445f9f34d4b3bea1
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Jun 15 09:06:56 2007 +0100
Refactor system RC files
Moved system-gafrc into the libgeda package, where it belongs.
Removed all environment and configure substitutions. Created separate
font and component library setup scripts in the symbols package,
automatically loaded by system-gafrc if they exist. Updated
system-gschemrc to use new infrastructure.
:100644 100644 97706db... 2098a24... M gschem/lib/system-gschemrc.in
:100644 100644 3a282e8... 6f8d4f8... M libgeda/lib/Makefile.am
:000000 100644 0000000... 9a655a2... A libgeda/lib/system-gafrc
:100644 100644 6a12a3f... b93b25f... M symbols/Makefile.am
:100644 100644 881bd0f... 3101c2d... M symbols/configure.ac
:000000 100644 0000000... e3b33a5... A symbols/geda-clib.scm
:000000 100644 0000000... 6bcef71... A symbols/geda-font.scm
:100644 000000 e00755c... 0000000... D symbols/system-gafrc.in
commit 041fa3eedf71df34cdd04bad4c2cd5b08cff7232
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Jun 15 09:06:55 2007 +0100
Add infrastructure for installing Scheme files with libgeda.
:100644 100644 77fa989... 1484d22... M libgeda/Makefile.am
:100644 100644 7f16c3c... 4ce879f... M libgeda/configure.ac
:000000 100644 0000000... 282522d... A libgeda/lib/.cvsignore
:000000 100644 0000000... 3a282e8... A libgeda/lib/Makefile.am
:000000 100644 0000000... 282522d... A libgeda/scheme/.cvsignore
:000000 100644 0000000... dafee28... A libgeda/scheme/Makefile.am
:000000 100644 0000000... 5a0b1b3... A libgeda/scheme/geda.scm
commit 10f0c8203b1fa9c87d09f1aeb4da28a0e5599ea8
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Jun 15 09:06:55 2007 +0100
Make libgeda define Guile variables for the gEDA data paths.
Add three variables from libgeda to the Guile environment:
geda-rc-path, geda-data-path, and path-sep.
:100644 100644 1bc0daa... 0fb0497... M libgeda/src/g_register.c
=========
Changes
=========
commit 9dde0233ebed32065511b567445f9f34d4b3bea1
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Jun 15 09:06:56 2007 +0100
Refactor system RC files
Moved system-gafrc into the libgeda package, where it belongs.
Removed all environment and configure substitutions. Created separate
font and component library setup scripts in the symbols package,
automatically loaded by system-gafrc if they exist. Updated
system-gschemrc to use new infrastructure.
diff --git a/gschem/lib/system-gschemrc.in b/gschem/lib/system-gschemrc.in
index 97706db..2098a24 100644
--- a/gschem/lib/system-gschemrc.in
+++ b/gschem/lib/system-gschemrc.in
@@ -1,4 +1,4 @@
-
+; -*-Scheme-*-
;
; Init file for gschem
;
@@ -9,7 +9,6 @@
; colors are not case sensitive
;
-
; gschem-version string
;
; Specifies the version of this file. This number is used to make sure
@@ -18,12 +17,6 @@
;
(gschem-version "@VERSION@")
-; Setup data path variables.
-;
-; Contains paths needed for all gaf programs
-(define gedadata (getenv "GEDADATA"))
-(define gedadatarc (getenv "GEDADATARC"))
-
;
; Start of color section
;
@@ -31,8 +24,8 @@
; Comment out the first line and comment in the second line for a
; dark (black) background. The dark background is the original look.
;
-(load (string-append gedadatarc "@PATHSEP@gschem-darkbg")) ; dark background
-;(load (string-append gedadatarc "@PATHSEP@gschem-lightbg")) ; light background
+(load (build-path geda-rc-path "gschem-darkbg")) ; dark background
+;(load (build-path geda-rc-path "gschem-lightbg")) ; light background
;
; End of color section
@@ -827,7 +820,7 @@
; Comment in this scheme code if you want automatic numbering when
; placing new component and copying components
;
-;(load (string-append gedadata "/scheme/auto-uref.scm"))
+;(load-from-path "auto-uref.scm")
;(add-hook! add-component-hook auto-uref)
;(add-hook! copy-component-hook auto-uref)
@@ -1098,7 +1091,7 @@
; Comment in this to load the functions to place the attributes automatically.
-(load (string-append gedadata "/scheme/auto-place-attribs.scm"))
+(load-from-path "auto-place-attribs.scm")
; Autoplace pin text attributes hook.
; Comment in these if you want the pin attributes to be automatically placed.
@@ -1780,5 +1773,5 @@
;; and there are known (and easy) ways to crash pcb and/or gschem with this code.
;; The short answer is neither program likes a pipe to break.
;;
-; (load (string-append gedadata "/scheme/pcb.scm"))
+; (load-from-path "pcb.scm")
diff --git a/libgeda/lib/Makefile.am b/libgeda/lib/Makefile.am
index 3a282e8..6f8d4f8 100644
--- a/libgeda/lib/Makefile.am
+++ b/libgeda/lib/Makefile.am
@@ -1,6 +1,6 @@
rcdatadir = @GEDARCDIR@
-rcdata_DATA =
+rcdata_DATA = system-gafrc
MOSTLYCLEANFILES = *.log *~
CLEANFILES = *.log *~
diff --git a/libgeda/lib/system-gafrc b/libgeda/lib/system-gafrc
new file mode 100644
index 0000000..9a655a2
--- /dev/null
+++ b/libgeda/lib/system-gafrc
@@ -0,0 +1,50 @@
+; -*-Scheme-*-
+;;;
+;;; Common init file for gaf
+;;;
+
+; The following global variables are defined by libgeda:
+;
+; path-sep -- system path separator
+; geda-data-path -- path to gEDA system-wide data directory
+; geda-rc-path -- path to gEDA system-wide config directory
+
+
+;; The directory containing gaf Scheme code.
+(define geda-scheme-path (string-append geda-data-path path-sep "scheme"))
+; We need to add gaf's scheme library to the Guile load path.
+(set! %load-path (append (list geda-scheme-path) %load-path))
+; This is used in some places for error messages/listing gnetlist
+; backends
+(scheme-directory geda-scheme-path)
+
+; The libgeda Scheme library provides a number of useful functions for
+; writing Scheme code for embedding in gaf.
+(load-from-path "geda.scm")
+
+
+;; The directory containing various bitmaps (e.g. icons)
+(bitmap-directory (build-path geda-data-path "bitmap"))
+
+
+; Load the default component libraries
+(let ((clib-def-file (%search-load-path "geda-clib")))
+ (if clib-def-file
+ (load clib-def-file)
+ (display "Failed to load default component libraries.\n")))
+
+; Load the default font
+(let ((font-def-file (%search-load-path "geda-font")))
+ (if font-def-file
+ (load font-def-file)
+ (display "Failed to load default font.\n")))
+
+
+; Set the name of the postscript prolog file that will be
+; pasted into the postscript output after the DSC comments, but
+; before the main script.
+(postscript-prolog (build-path geda-data-path "prolog.ps"))
+
+; Set the list of attributes that are always promoted regardless of
+; their visibility.
+(always-promote-attributes "footprint device value model-name")
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 6a12a3f..b93b25f 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -6,8 +6,8 @@ SUBDIRS = \
opto diode relay vhdl power philips transistor switcap cascade \
asic asicpads gnetman minicircuits st apex allegro irf documentation
-rcdatadir = @GEDARCDIR@
-rcdata_DATA = system-gafrc
+scmdatadir = @GEDADATADIR@@PATHSEP@scheme
+scmdata_DATA = geda-clib.scm geda-font.scm
EXTRA_DIST = autogen.sh
diff --git a/symbols/configure.ac b/symbols/configure.ac
index 881bd0f..3101c2d 100644
--- a/symbols/configure.ac
+++ b/symbols/configure.ac
@@ -231,8 +231,7 @@ AC_CONFIG_FILES([
apex/Makefile
allegro/Makefile
irf/Makefile
- documentation/Makefile
- system-gafrc ])
+ documentation/Makefile ])
AC_OUTPUT
diff --git a/symbols/geda-clib.scm b/symbols/geda-clib.scm
new file mode 100644
index 0000000..e3b33a5
--- /dev/null
+++ b/symbols/geda-clib.scm
@@ -0,0 +1,62 @@
+; -*-Scheme-*-
+;;;
+;;; Add the default component libraries
+;;;
+
+(define geda-sym-path (build-path geda-data-path "sym"))
+
+; NOTE: Some of the below component libraries below are commented out.
+; This was done because there are conflicting filenames within these
+; libraries.
+(for-each
+ (lambda (dir)
+ (component-library (build-path geda-sym-path dir)))
+'(
+ "74"
+ "4000"
+ "IEC417"
+ "amphenol"
+ "analog"
+ "linear"
+ "altera"
+ "lattice"
+ "xilinx"
+ "idt"
+ "misc"
+ "power"
+ "philips"
+ "minicircuits"
+ "st"
+ "apex"
+ "allegro"
+ "irf"
+ "transistor"
+ "io"
+ "titleblock"
+ "memory"
+ "micro"
+ "maxim"
+ "national"
+ "radio"
+ "tube"
+ "connector"
+ "switch"
+ "switcap"
+ ;"verilog"
+ ;"vhdl"
+ "spice"
+ "rf"
+ "bus"
+ "pla"
+ "ecl"
+ "dec"
+ "supervisor"
+ "opto"
+ "diode"
+ "relay"
+ "cascade"
+ "asic"
+ "asicpads"
+ ;"gnetman"
+ "local"
+ ))
diff --git a/symbols/geda-font.scm b/symbols/geda-font.scm
new file mode 100644
index 0000000..6bcef71
--- /dev/null
+++ b/symbols/geda-font.scm
@@ -0,0 +1,130 @@
+; -*-Scheme-*-
+;;;
+;;; Define the default gaf font
+;;;
+
+(define geda-font-path (build-path geda-data-path "sym" "font"))
+(font-directory geda-font-path)
+
+(for-each
+ (lambda (fontmap)
+ (map-font-character-to-file
+ (car fontmap)
+ (build-path geda-font-path (cdr fontmap))))
+ '(
+ (" " . "space.sym")
+ ("\n" . "newline.sym")
+ ("!" . "excl.sym")
+ ("," . "comma.sym")
+ ("(" . "lparen.sym")
+ (")" . "lparen.sym")
+ ("-" . "minus.sym")
+ ("+" . "plus.sym")
+ ("#" . "pound.sym")
+ ("?" . "quest.sym")
+ ("\"" . "quote.sym")
+ (":" . "colon.sym")
+ ("@" . "at.sym")
+ ("=" . "equal.sym")
+ (">" . "more.sym")
+ ("<" . "less.sym")
+ ("/" . "slash.sym")
+ ("$" . "dollar.sym")
+ (";" . "semi.sym")
+ ("&" . "amper.sym")
+ ("\\" . "backslash.sym")
+ ("{" . "lbrace.sym")
+ ("}" . "rbrace.sym")
+ ("'" . "apost.sym")
+ ("`" . "backtick.sym")
+ ("^" . "caret.sym")
+ ("%" . "percent.sym")
+ ("[" . "lbrack.sym")
+ ("]" . "rbrack.sym")
+ ("*" . "astericks.sym")
+ (". " . "period.sym")
+ ("_" . "under.sym")
+ ("~" . "tilde.sym")
+ ("|" . "vbar.sym")
+
+ ;; A-umlaut finnish/swedish/german
+ ("Ã?" . "A-diaeresis.sym")
+ ;; A-ring finnish/swedish/danish/norwegian
+ ("Ã?" . "A-ring.sym")
+ ;; AE-diphtong danish/norwegian
+ ("Ã?" . "AE-lig.sym")
+ ;; O-umlaut finnish/swedish/german
+ ("Ã?" . "O-diaeresis.sym")
+ ;; O-double_acute_accent hungarian
+ ("Å?" . "O-double-acute-accent.sym")
+ ;; O-slash danish/norwegian
+ ("Ã?" . "O-slash.sym")
+ ;; U-umlaut german
+ ("Ã?" . "U-diaeresis.sym")
+ ;; U-double_acute_accent hungarian
+ ("Å°" . "U-double-acute-accent.sym")
+ ;; a-umlaut finnish/swedish/german
+ ("ä" . "a_-diaeresis.sym")
+ ;; a-ring finnish/swedish/danish/norwegian
+ ("Ã¥" . "a_-ring.sym")
+ ;; ae-diphtong danish/norwegian
+ ("æ" . "ae_-lig.sym")
+ ;; o-umlaut finnish/swedish/german
+ ("ö" . "o_-diaeresis.sym")
+ ;; o-double_acute_accent hungarian
+ ("Å?" . "o_-double-acute-accent.sym")
+ ;; o-slash danish/norwegian
+ ("ø" . "o_-slash.sym")
+ ;; u-umlaut german
+ ("ü" . "u_-diaeresis.sym")
+ ;; u-double_acute_accent hungarian
+ ("ű" . "u_-double-acute-accent.sym")
+ ;; a-acute_accent spanish
+ ("á" . "a_-acute-accent.sym")
+ ;; e-acute_accent spanish
+ ("é" . "e_-acute-accent.sym")
+ ;; i-acute_accent spanish
+ ("Ã" . "i_-acute-accent.sym")
+ ;; o-acute_accent spanish
+ ("ó" . "o_-acute-accent.sym")
+ ;; u-acute_accent spanish
+ ("ú" . "u_-acute-accent.sym")
+ ;; A-acute_accent spanish
+ ("Ã?" . "A-acute-accent.sym")
+ ;; E-acute_accent spanish
+ ("Ã?" . "E-acute-accent.sym")
+ ;; I-acute_accent spanish
+ ("Ã?" . "I-acute-accent.sym")
+ ;; O-acute_accent spanish
+ ("Ã?" . "O-acute-accent.sym")
+ ;; U-acute_accent spanish
+ ("Ã?" . "U-acute-accent.sym")
+ ;; n-tilde spanish
+ ("ñ" . "n_-tilde.sym")
+ ;; N-tilde spanish
+ ("Ã?" . "N-tilde.sym")
+ ;; open exclamation spanish
+ ("¡" . "excl-open.sym")
+ ;; open question spanish
+ ("¿" . "quest-open.sym")
+ ;;
+ ("Ä?" . "a_-ogonek.sym")
+ ("Ä?" . "A-ogonek.sym")
+ ("Ä?" . "c_-acute-accent.sym")
+ ("Ä?" . "C-acute-accent.sym")
+ ("Ä?" . "e_-ogonek.sym")
+ ("Ä?" . "E-ogonek.sym")
+ ("Å?" . "l_-slash.sym")
+ ("Å?" . "L-slash.sym")
+ ("Å?" . "n_-acute-accent.sym")
+ ("Å?" . "N-acute-accent.sym")
+ ("Å?" . "s_-acute-accent.sym")
+ ("Å?" . "S-acute-accent.sym")
+ ("ź" . "z_-acute-accent.sym")
+ ("Ź" . "Z-acute-accent.sym")
+ ("ż" . "z_-dot.sym")
+ ("Å»" . "Z-dot.sym")
+ ;; small mu character greek
+ ("µ" . "mu_.sym")
+ ("Ω" . "Omega.sym")
+ ))
diff --git a/symbols/system-gafrc.in b/symbols/system-gafrc.in
deleted file mode 100644
index e00755c..0000000
--- a/symbols/system-gafrc.in
+++ /dev/null
@@ -1,337 +0,0 @@
-
-;
-; Common init file for gEDA
-;
-
-;
-; Start of path related keywords
-;
-
-; component-library string
-; Specify where components exist.
-; The string after this keyword should be a valid directory name.
-; You should have read access to this directory and all the files inside
-; the directory.
-; The order of the component-library keywords determines the order they
-; are displayed, but they are searched *backwards*, ie last one in this list
-; is searched *first*.
-; All environment variables *MUST* be in the form ${variable_name}
-;
-; NOTE: Some of the below component libraries below are commented out.
-; This was done because there are conflicting filenames within these
-; libraries. Please see Jitterbug #9 on this gEDA/gaf limitation.
-; It will be fixed soon. AVH 01/04/2004
-;
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@74")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@4000")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@IEC417")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@amphenol")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@analog")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@linear")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@altera")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@lattice")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@xilinx")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@idt")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@misc")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@power")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@philips")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@minicircuits")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@st")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@apex")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@allegro")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@irf")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@transistor")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@io")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@titleblock")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@memory")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@micro")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@maxim")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@national")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@radio")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@tube")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@connector")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@switch")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@switcap")
-;(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@verilog")
-;(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@vhdl")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@spice")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@rf")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@bus")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@pla")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@ecl")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@dec")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@supervisor")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@opto")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@diode")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@relay")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@cascade")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@asic")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@asicpads")
-;(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@gnetman")
-(component-library "${GEDADATA}@PATHSEP@sym@PATHSEP@local")
-
-; component-library-search atring
-;
-; Specifies the directory where other component libraries can be found
-; The string after this keyword should be a valid directory name.
-; You should have read access to this directory and all the files inside
-; the directory.
-; The order of the component libraries found within the specified directory
-; is in inode order. The libraries found using this keyword will be searched
-; *before* the component libraries specified above.
-; All environment variables *MUST* be in the form ${variable_name}
-;
-; This is commented out since it will add in the above commented out
-; component libraries automatically and this will most certainly cause
-; schematics to break. AVH 01/04/2004
-;
-;(component-library-search "${GEDADATA}@PATHSEP@sym")
-
-; source-library string
-; Specify where source entities exist.
-; The string after this keyword should be a valid directory name.
-; You should have read access to this directory and all the files inside
-; the directory.
-; The order of the source-library keywords determines the order they
-; are displayed, but they are searched *backwards*, ie last one in this list
-; is searched *first*.
-; All environment variables *MUST* be in the form ${variable_name}
-;
-; Example:
-;(source-library "${HOME}@PATHSEP@projects@PATHSEP@my_schematics")
-
-; source-library-search atring
-;
-; Specifies the directory where other source libraries can be found
-; The string after this keyword should be a valid directory name.
-; You should have read access to this directory and all the files inside
-; the directory.
-; The order of the source libraries found within the specified directory
-; is in inode order. The libraries found using this keyword will be searched
-; *before* the source libraries specified above.
-; All environment variables *MUST* be in the form ${variable_name}
-;
-; Example:
-;(source-library-search "${HOME}@PATHSEP@projects@PATHSEP@my_schematics")
-
-; font-directory string
-; Specifies where the vector font definitions are stored.
-; You should have read access to this directory and all the files inside
-; the directory.
-; All environment variables *MUST* be in the form ${variable_name}
-;
-(define default-font-directory "${GEDADATA}@PATHSEP@sym@PATHSEP@font")
-(font-directory default-font-directory)
-
-
-; scheme-directory string
-; Specifies where the supporting scheme lives
-; You should have read access to this directory and all the files inside
-; the directory.
-; All environment variables *MUST* be in the form ${variable_name}
-;
-(scheme-directory "${GEDADATA}@PATHSEP@scheme")
-
-
-; bitmap-directory string
-; Specifies where the supporting bitmaps live
-; You should have read access to this directory and all the files inside
-; the directory.
-; All environment variables *MUST* be in the form ${variable_name}
-;
-(bitmap-directory "${GEDADATA}@PATHSEP@bitmap")
-
-
-; postscript-prolog
-;
-; Sets the name of the postscript prolog file that will be
-; pasted into the postscript output after the DSC comments, but
-; before the main script.
-(postscript-prolog "${GEDADATA}@PATHSEP@prolog.ps")
-
-
-
-
-;
-; End of path related keywords
-;
-
-;
-; Start of font related keywords
-;
-
-(map-font-character-to-file " " (string-append default-font-directory "@PATHSEP@"
- "space.sym"))
-
-(map-font-character-to-file "\n" (string-append default-font-directory "/"
- "newline.sym"))
-
-(map-font-character-to-file "!" (string-append default-font-directory "@PATHSEP@"
- "excl.sym"))
-(map-font-character-to-file "," (string-append default-font-directory "@PATHSEP@"
- "comma.sym"))
-(map-font-character-to-file "(" (string-append default-font-directory "@PATHSEP@"
- "lparen.sym"))
-(map-font-character-to-file ")" (string-append default-font-directory "@PATHSEP@"
- "rparen.sym"))
-(map-font-character-to-file "-" (string-append default-font-directory "@PATHSEP@"
- "minus.sym"))
-(map-font-character-to-file "+" (string-append default-font-directory "@PATHSEP@"
- "plus.sym"))
-(map-font-character-to-file "#" (string-append default-font-directory "@PATHSEP@"
- "pound.sym"))
-(map-font-character-to-file "?" (string-append default-font-directory "@PATHSEP@"
- "quest.sym"))
-(map-font-character-to-file "\"" (string-append default-font-directory "@PATHSEP@"
- "quote.sym"))
-(map-font-character-to-file ":" (string-append default-font-directory "@PATHSEP@"
- "colon.sym"))
-(map-font-character-to-file "@" (string-append default-font-directory "@PATHSEP@"
- "at.sym"))
-(map-font-character-to-file "=" (string-append default-font-directory "@PATHSEP@"
- "equal.sym"))
-(map-font-character-to-file ">" (string-append default-font-directory "@PATHSEP@"
- "more.sym"))
-(map-font-character-to-file "<" (string-append default-font-directory "@PATHSEP@"
- "less.sym"))
-(map-font-character-to-file "/" (string-append default-font-directory "@PATHSEP@"
- "slash.sym"))
-(map-font-character-to-file "$" (string-append default-font-directory "@PATHSEP@"
- "dollar.sym"))
-(map-font-character-to-file ";" (string-append default-font-directory "@PATHSEP@"
- "semi.sym"))
-(map-font-character-to-file "&" (string-append default-font-directory "@PATHSEP@"
- "amper.sym"))
-(map-font-character-to-file "\\" (string-append default-font-directory "@PATHSEP@"
- "backslash.sym"))
-(map-font-character-to-file "{" (string-append default-font-directory "@PATHSEP@"
- "lbrace.sym"))
-(map-font-character-to-file "}" (string-append default-font-directory "@PATHSEP@"
- "rbrace.sym"))
-(map-font-character-to-file "'" (string-append default-font-directory "@PATHSEP@"
- "apost.sym"))
-(map-font-character-to-file "`" (string-append default-font-directory "@PATHSEP@"
- "backtick.sym"))
-(map-font-character-to-file "^" (string-append default-font-directory "@PATHSEP@"
- "caret.sym"))
-(map-font-character-to-file "%" (string-append default-font-directory "@PATHSEP@"
- "percent.sym"))
-(map-font-character-to-file "[" (string-append default-font-directory "@PATHSEP@"
- "lbrack.sym"))
-(map-font-character-to-file "]" (string-append default-font-directory "@PATHSEP@"
- "rbrack.sym"))
-(map-font-character-to-file "*" (string-append default-font-directory "@PATHSEP@"
- "astericks.sym"))
-(map-font-character-to-file "." (string-append default-font-directory "@PATHSEP@"
- "period.sym"))
-(map-font-character-to-file "_" (string-append default-font-directory "@PATHSEP@"
- "under.sym"))
-(map-font-character-to-file "~" (string-append default-font-directory "@PATHSEP@"
- "tilde.sym"))
-(map-font-character-to-file "|" (string-append default-font-directory "@PATHSEP@"
- "vbar.sym"))
-
-(let ((dir (string-append default-font-directory "@PATHSEP@")))
- (for-each
- (lambda (c)
- (map-font-character-to-file (car c) (string-append dir (cdr c))))
- '(
- ;; A-umlaut finnish/swedish/german
- ("Ã?" . "A-diaeresis.sym")
- ;; A-ring finnish/swedish/danish/norwegian
- ("Ã?" . "A-ring.sym")
- ;; AE-diphtong danish/norwegian
- ("Ã?" . "AE-lig.sym")
- ;; O-umlaut finnish/swedish/german
- ("Ã?" . "O-diaeresis.sym")
- ;; O-double_acute_accent hungarian
- ("Å?" . "O-double-acute-accent.sym")
- ;; O-slash danish/norwegian
- ("Ã?" . "O-slash.sym")
- ;; U-umlaut german
- ("Ã?" . "U-diaeresis.sym")
- ;; U-double_acute_accent hungarian
- ("Å°" . "U-double-acute-accent.sym")
- ;; a-umlaut finnish/swedish/german
- ("ä" . "a_-diaeresis.sym")
- ;; a-ring finnish/swedish/danish/norwegian
- ("Ã¥" . "a_-ring.sym")
- ;; ae-diphtong danish/norwegian
- ("æ" . "ae_-lig.sym")
- ;; o-umlaut finnish/swedish/german
- ("ö" . "o_-diaeresis.sym")
- ;; o-double_acute_accent hungarian
- ("Å?" . "o_-double-acute-accent.sym")
- ;; o-slash danish/norwegian
- ("ø" . "o_-slash.sym")
- ;; u-umlaut german
- ("ü" . "u_-diaeresis.sym")
- ;; u-double_acute_accent hungarian
- ("ű" . "u_-double-acute-accent.sym")
- ;; a-acute_accent spanish
- ("á" . "a_-acute-accent.sym")
- ;; e-acute_accent spanish
- ("é" . "e_-acute-accent.sym")
- ;; i-acute_accent spanish
- ("Ã" . "i_-acute-accent.sym")
- ;; o-acute_accent spanish
- ("ó" . "o_-acute-accent.sym")
- ;; u-acute_accent spanish
- ("ú" . "u_-acute-accent.sym")
- ;; A-acute_accent spanish
- ("Ã?" . "A-acute-accent.sym")
- ;; E-acute_accent spanish
- ("Ã?" . "E-acute-accent.sym")
- ;; I-acute_accent spanish
- ("Ã?" . "I-acute-accent.sym")
- ;; O-acute_accent spanish
- ("Ã?" . "O-acute-accent.sym")
- ;; U-acute_accent spanish
- ("Ã?" . "U-acute-accent.sym")
- ;; n-tilde spanish
- ("ñ" . "n_-tilde.sym")
- ;; N-tilde spanish
- ("Ã?" . "N-tilde.sym")
- ;; open exclamation spanish
- ("¡" . "excl-open.sym")
- ;; open question spanish
- ("¿" . "quest-open.sym")
- ;;
- ("Ä?" . "a_-ogonek.sym")
- ("Ä?" . "A-ogonek.sym")
- ("Ä?" . "c_-acute-accent.sym")
- ("Ä?" . "C-acute-accent.sym")
- ("Ä?" . "e_-ogonek.sym")
- ("Ä?" . "E-ogonek.sym")
- ("Å?" . "l_-slash.sym")
- ("Å?" . "L-slash.sym")
- ("Å?" . "n_-acute-accent.sym")
- ("Å?" . "N-acute-accent.sym")
- ("Å?" . "s_-acute-accent.sym")
- ("Å?" . "S-acute-accent.sym")
- ("ź" . "z_-acute-accent.sym")
- ("Ź" . "Z-acute-accent.sym")
- ("ż" . "z_-dot.sym")
- ("Å»" . "Z-dot.sym")
- ;; small mu character greek
- ("µ" . "mu_.sym")
- ("Ω" . "Omega.sym")
- )))
-
-;
-; End of font related keywords
-;
-
-;
-; Start of attribute promotion keywords
-;
-
-; always-promote-attributes string
-;
-; Contains a list of attributes that are always promoted regardless of
-; their visibility.
-(always-promote-attributes "footprint device value model-name")
-
-;
-; End of attribute promotion keywords
-;
commit 041fa3eedf71df34cdd04bad4c2cd5b08cff7232
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Jun 15 09:06:55 2007 +0100
Add infrastructure for installing Scheme files with libgeda.
diff --git a/libgeda/Makefile.am b/libgeda/Makefile.am
index 77fa989..1484d22 100644
--- a/libgeda/Makefile.am
+++ b/libgeda/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = src include scripts docs share
+SUBDIRS = src include scripts docs share lib scheme
EXTRA_DIST = HACKING BUGS autogen.sh
diff --git a/libgeda/configure.ac b/libgeda/configure.ac
index 7f16c3c..4ce879f 100644
--- a/libgeda/configure.ac
+++ b/libgeda/configure.ac
@@ -490,7 +490,9 @@ AC_CONFIG_FILES([Makefile
include/Makefile
docs/Makefile
libgeda.pc
- share/Makefile ])
+ share/Makefile
+ lib/Makefile
+ scheme/Makefile ])
AC_OUTPUT
diff --git a/libgeda/lib/.cvsignore b/libgeda/lib/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/libgeda/lib/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/libgeda/lib/Makefile.am b/libgeda/lib/Makefile.am
new file mode 100644
index 0000000..3a282e8
--- /dev/null
+++ b/libgeda/lib/Makefile.am
@@ -0,0 +1,8 @@
+
+rcdatadir = @GEDARCDIR@
+rcdata_DATA =
+
+MOSTLYCLEANFILES = *.log *~
+CLEANFILES = *.log *~
+DISTCLEANFILES = *.log *~
+MAINTAINERCLEANFILES = *.log *~ Makefile.in
diff --git a/libgeda/scheme/.cvsignore b/libgeda/scheme/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/libgeda/scheme/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/libgeda/scheme/Makefile.am b/libgeda/scheme/Makefile.am
new file mode 100644
index 0000000..dafee28
--- /dev/null
+++ b/libgeda/scheme/Makefile.am
@@ -0,0 +1,8 @@
+
+scmdatadir = @GEDADATADIR@@PATHSEP@scheme
+scmdata_DATA = geda.scm
+
+MOSTLYCLEANFILES = *.log *~
+CLEANFILES = *.log *~
+DISTCLEANFILES = *.log core FILE *~ prototype.bak
+MAINTAINERCLEANFILES = *.log *~ Makefile.in
diff --git a/libgeda/scheme/geda.scm b/libgeda/scheme/geda.scm
new file mode 100644
index 0000000..5a0b1b3
--- /dev/null
+++ b/libgeda/scheme/geda.scm
@@ -0,0 +1,6 @@
+; -*-Scheme-*-
+(define (build-path first . rest)
+ (if (null? rest) first
+ (apply build-path
+ (append (list (string-append first path-sep (car rest)))
+ (cdr rest)))))
commit 10f0c8203b1fa9c87d09f1aeb4da28a0e5599ea8
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Fri Jun 15 09:06:55 2007 +0100
Make libgeda define Guile variables for the gEDA data paths.
Add three variables from libgeda to the Guile environment:
geda-rc-path, geda-data-path, and path-sep.
diff --git a/libgeda/src/g_register.c b/libgeda/src/g_register.c
index 1bc0daa..0fb0497 100644
--- a/libgeda/src/g_register.c
+++ b/libgeda/src/g_register.c
@@ -103,6 +103,13 @@ void g_register_libgeda_funcs (void)
*/
void g_register_libgeda_vars (void)
{
+ scm_c_define("geda-rc-path",
+ scm_from_locale_string (g_rc_parse_path()));
+ scm_c_define("geda-data-path",
+ scm_from_locale_string (g_getenv ("GEDADATA")));
+ scm_c_define("path-sep",
+ scm_from_locale_string(G_DIR_SEPARATOR_S));
+
scm_c_define("OBJ_LINE", SCM_MAKE_CHAR((unsigned char) OBJ_LINE));
scm_c_define("OBJ_BOX", SCM_MAKE_CHAR((unsigned char) OBJ_BOX));
scm_c_define("OBJ_PICTURE", SCM_MAKE_CHAR((unsigned char) OBJ_PICTURE));
=========
Summary
=========
gschem/lib/system-gschemrc.in | 19 +--
libgeda/Makefile.am | 2 +-
libgeda/configure.ac | 4 +-
{docs/wiki => libgeda/lib}/.cvsignore | 0
libgeda/lib/Makefile.am | 8 +
libgeda/lib/system-gafrc | 50 +++++
{docs/wiki => libgeda/scheme}/.cvsignore | 0
libgeda/scheme/Makefile.am | 8 +
libgeda/scheme/geda.scm | 6 +
libgeda/src/g_register.c | 7 +
symbols/Makefile.am | 4 +-
symbols/configure.ac | 3 +-
symbols/geda-clib.scm | 62 ++++++
symbols/geda-font.scm | 130 ++++++++++++
symbols/system-gafrc.in | 337 ------------------------------
15 files changed, 284 insertions(+), 356 deletions(-)
copy {docs/wiki => libgeda/lib}/.cvsignore (100%)
create mode 100644 libgeda/lib/Makefile.am
create mode 100644 libgeda/lib/system-gafrc
copy {docs/wiki => libgeda/scheme}/.cvsignore (100%)
create mode 100644 libgeda/scheme/Makefile.am
create mode 100644 libgeda/scheme/geda.scm
create mode 100644 symbols/geda-clib.scm
create mode 100644 symbols/geda-font.scm
delete mode 100644 symbols/system-gafrc.in
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs