gEDA-cvs: pcb.git: branch: master updated (8147be7a70654c6c29d0e29e222c4014cf19fa5d)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  8147be7a70654c6c29d0e29e222c4014cf19fa5d (commit)
       via  a8b69632f0219923fdbc9df8c44abeed7356b495 (commit)
      from  61bd0cb1e134bbea96abd6fd2d5fb94d09c0b3c8 (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.


=========
 Summary
=========

 lib/m4lib_to_newlib.sh    |   11 +++++++++--
 src/hid/lesstif/lesstif.h |    8 +++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)


=================
 Commit Messages
=================

commit 8147be7a70654c6c29d0e29e222c4014cf19fa5d
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Fix m4-to-newlib converter filenames
    
    The m4 library uses macros and parameters to describe footprints, which
    allows for a *very* flexible footprint naming scheme.  While it is
    impossible for pcb to know all valid footprint values, it does have a
    list of "standard" ones, and knows how to obtain those.  However, the m4
    to newlib converter wasn't using the same footprint naming convention as
    everyone else, so produced *.fp files that weren't always useful.  For
    example, there were a large number of 300.fp files that all collided.
    
    With this fix, the footprint name matches the value in [...] in the
    library window, which is what we tell people to use for the "footprint="
    attribute anyway.

:100644 100644 ca491de... 09499b6... M	lib/m4lib_to_newlib.sh

commit a8b69632f0219923fdbc9df8c44abeed7356b495
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Wrap all XmStrings in gettext()

:100644 100644 1ca229d... 235bf57... M	src/hid/lesstif/lesstif.h

=========
 Changes
=========

commit 8147be7a70654c6c29d0e29e222c4014cf19fa5d
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Fix m4-to-newlib converter filenames
    
    The m4 library uses macros and parameters to describe footprints, which
    allows for a *very* flexible footprint naming scheme.  While it is
    impossible for pcb to know all valid footprint values, it does have a
    list of "standard" ones, and knows how to obtain those.  However, the m4
    to newlib converter wasn't using the same footprint naming convention as
    everyone else, so produced *.fp files that weren't always useful.  For
    example, there were a large number of 300.fp files that all collided.
    
    With this fix, the footprint name matches the value in [...] in the
    library window, which is what we tell people to use for the "footprint="
    attribute anyway.

diff --git a/lib/m4lib_to_newlib.sh b/lib/m4lib_to_newlib.sh
index ca491de..09499b6 100644
--- a/lib/m4lib_to_newlib.sh
+++ b/lib/m4lib_to_newlib.sh
@@ -194,8 +194,16 @@ first == 1 {
 	line=$0;
 	split(line, a, "[:]");
 
-	# pick out the name of the footprint
+	template = a[1];
+	package = a[2];
 	comp = a[3];
+	comment = a[4];
+
+	# pick out the name of the footprint
+	match (comment, /(.*)\[(.*)\]/, fp);
+	comp = fp[2];
+	comment = a[3] ", " fp[1];
+
 	txtcomp = comp;
 	urlcomp = comp;
 
@@ -203,7 +211,6 @@ first == 1 {
 	gsub(/ /, "%20", urlcomp);
 	gsub(/ /, "\\ ", comp);
 
-	comment = a[4];
 
 	# extract the footprint
 	# path library template value package

commit a8b69632f0219923fdbc9df8c44abeed7356b495
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>

    Wrap all XmStrings in gettext()

diff --git a/src/hid/lesstif/lesstif.h b/src/hid/lesstif/lesstif.h
index 1ca229d..235bf57 100644
--- a/src/hid/lesstif/lesstif.h
+++ b/src/hid/lesstif/lesstif.h
@@ -64,4 +64,10 @@ extern void lesstif_attributes_dialog (char *, AttributeListType *);
 #define need_idle_proc lesstif_need_idle_proc
 #define show_crosshair lesstif_show_crosshair
 
-#define XmStringCreatePCB(x) XmStringCreateLtoR((x), XmFONTLIST_DEFAULT_TAG)
+static XmString
+XmStringCreatePCB (char *x)
+{
+  if (x && x[0])
+    x = gettext (x);
+  return XmStringCreateLtoR (x, XmFONTLIST_DEFAULT_TAG);
+}




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs