Unsigned/signed.

[lyx.git] / forms / fdfix.sh

diff --git a/forms/fdfix.sh b/forms/fdfix.sh
index 58001da1a011f02fc4b3081a20145ece7e467964..15c51358958bb42e26b438abd225b16792ecd6a2 100755 (executable)
--- a/forms/fdfix.sh
+++ b/forms/fdfix.sh
@@ -24,7 +24,7 @@ if [ -f "$2.patch" ]; then
     patch -s $1 < "$2.patch"
 fi
 
-echo "// File modified by fdfix.sh for use by lyx (with xforms 0.81) and gettext" > $2
+echo "// File modified by fdfix.sh for use by lyx (with xforms > 0.88) and gettext" > $2
 echo "#include <config.h>" >> $2
 echo "#include \"lyx_gui_misc.h\"" >> $2
 echo "#include \"gettext.h\"" >> $2
@@ -56,30 +56,51 @@ echo >> $2
 # For all lines containing "fl_add" and a string containing |, add the
 # shortcut command after the end of this line
 #
-# -e 's/fl_set_object_lcolor/fl_set_object_lcol/' 
-#
-#  For all lines replace "fl_set_object_lcolor" with "fl_set_object_lcol"
-#  This will be removed when we don't support 0.81
-#
-# -e 's/fdui->.*->fdui = fdui/\/\/&/'
-#
-#  For all lines replace "fdui->...->fdui" with "//fdui->...->fdui"
-#  This will be removed when we don't support 0.81
-#
 # -e 's/\(\(FD_[^ ]*\) \*fdui.*\)sizeof(\*fdui)/\1sizeof(\2)/'
 #
 #  Some picky/broken compilers (eg AIX's xlC) don't like evaluating  
 #  sizeof(*fdui) before fdui has been given a value and output a warning. 
 #  This will not be needed anymore as soon as fdesign is fixed (already 
 #  reported to its authors).
-
-
+#
+# -e 's/,\([^ ]\)/, \1/g' \
+# -e 's/\("[^"][^"]*,\) \("\)/\1\2/g'
+#
+# Someone got busy and put spaces in after commas but didn't allow for the
+# autogeneration of the files so their pretty formatting got lost. Not anymore.
+# The second rule cleans up one special case where a comma appears at the end
+# of a string while ensuring "...", "..." isn't affected. Update: this seems
+# to have not been fixed in fdesign 0.56 (xforms 0.89), we should probably
+# report it once more. (Lgb)
+#
+# -e 's/stdlib.h/cstdlib/'
+#
+# Include the right C header.  Another one of those changes made by someone
+# who forgot that these files are regenerated.
+#
+# -e '/fl_.*"[^"]*%.*"/i\
+#   //xgettext:no-c-format'
+#
+# Something else someone got busy adding only to have them removed by the
+# autogeneration.  Maybe someday I won't have to clean up after everyone else
+# and will be able to spend my time working on what I want to work on.
+#
+# -e 's/NULL/0/'
+#
+# Hopefully the last thing that I'll ever have to merge in because in future
+# everyone will do their own merging when they decide they want to modify a
+# generated file.
+#
 cat $1 | sed \
 -e 's/#include "forms\.h"/#include FORMS_H_LOCATION/' \
 -e '/fl_/ s/".[^|]*"/_(&)/' \
 -e '/shortcut/ s/".*[|].*"/scex(_(&))/' \
 -e '/fl_add/ s/".*[|].*"/idex(_(&))/' \
 -e '/fl_add/ s/idex(\(.*\)").*$/&fl_set_button_shortcut(obj,scex(\1")),1);/' \
--e 's/fl_set_object_lcolor/fl_set_object_lcol/' \
--e 's/fdui->.*->fdui = fdui/\/\/&/' \
--e 's/\(\(FD_[^ ]*\) \*fdui.*\)sizeof(\*fdui)/\1sizeof(\2)/' >> $2
+-e 's/\(\(FD_[^ ]*\) \*fdui.*\)sizeof(\*fdui)/\1sizeof(\2)/' \
+-e 's/,\([^ ]\)/, \1/g' \
+-e 's/\("[^"][^"]*,\) \("\)/\1\2/g' \
+-e '/fl_.*"[^"]*%.*"/i\
+  // xgettext:no-c-format' \
+-e 's/NULL/0/' \
+-e 's/stdlib.h/cstdlib/' >> $2