+2002-11-07 Angus Leeming <leeming@lyx.org>
+
+ * forms/fdfixh.sed: generate the d-tors in a clean way.
+ * forms/fdfixc.sed: Go from "fdui->form_xxx" to "fdui->form" in
+ a clean way.
+
2002-10-31 Herbert Voss <voss@perce.de>
* FormGraphics.C (build, apply): get the rotate-list from the
# FL_FORM * form;
# so we must do so here too.
#
-# 1. Rewrite "fdui->form_xxx->fdui = ..." as "fdui->form->fdui = ..."
-s/fdui->form_\([^ ]*\)->fdui =/fdui->form->fdui =/
-
-# 2. Rewrite "fdui->form_xxx = ..." as "fdui->form = ..."
-s/fdui->form_\([^ ]*\) =/fdui->form =/
-
-# 3. Rewrite "fdui->form_xxx->..." as "fdui->form->..."
-s/fdui->form_\([^ ]*\)->/fdui->form->/
+# Rewrite "fdui->form_xxx" as "fdui->form"
+# xxx is followed by ' ', '->' or ')', so use these to flag when xxx ends.
+/fdui->form/s/\(fdui->form\)_[^ )-]*/\1/
# Replace "forms.h" by FORMS_H_LOCATION in the #include directives
s/#include \"forms\.h\"/#include FORMS_H_LOCATION/
i\
# 2. Rewrite "} FD_xxx;" as "struct FD_xxx {" and append a d-tor.
-s/} \(.*\);/struct \1 {/p
-# When the wrappers are here, delete this line and the p-print command above
-/struct/s/struct \(.*\) {/ ~\1();/
+s/} \(.*\);/struct \1 {\
+ ~\1();/
# 3. Paste the contents of the hold space beneath it
G