diff --git a/source/texk/web2c/luatexdir/dvi/dvigen.w b/source/texk/web2c/luatexdir/dvi/dvigen.w
index e54dac4835863d18576bd84c3a9961877ccc3ddc..9c031804d48468c7f08d16975fa448bdc145e4d5 100644
--- a/source/texk/web2c/luatexdir/dvi/dvigen.w
+++ b/source/texk/web2c/luatexdir/dvi/dvigen.w
@@ -1,21 +1,21 @@
-%dvigen.w
-
-%Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
-%This file is part of LuaTeX.
-
-%LuaTeX is free software; you can redistribute it and/or modify it under
-%the terms of the GNU General Public License as published by the Free
-%Software Foundation; either version 2 of the License, or (at your
-%option) any later version.
-
-%LuaTeX is distributed in the hope that it will be useful, but WITHOUT
-%ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-%FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-%License for more details.
-
-%You should have received a copy of the GNU General Public License along
-%with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
+% dvigen.w
+%
+% Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
+%
+% This file is part of LuaTeX.
+%
+% LuaTeX is free software; you can redistribute it and/or modify it under
+% the terms of the GNU General Public License as published by the Free
+% Software Foundation; either version 2 of the License, or (at your
+% option) any later version.
+%
+% LuaTeX is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+% License for more details.
+%
+% You should have received a copy of the GNU General Public License along
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 \def\MF{MetaFont}
 \def\MP{MetaPost}
diff --git a/source/texk/web2c/luatexdir/font/dofont.w b/source/texk/web2c/luatexdir/font/dofont.w
index 3644f729b3001d9c2935c48b37b5d43d0321fbcf..aef7563dfa42efe97ba55d92c88a2bb25178d076 100644
--- a/source/texk/web2c/luatexdir/font/dofont.w
+++ b/source/texk/web2c/luatexdir/font/dofont.w
@@ -1,31 +1,30 @@
 % dofont.w
 %
-%   Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
 %
-%   This file is part of LuaTeX.
+% This file is part of LuaTeX.
 %
-%   LuaTeX is free software; you can redistribute it and/or modify it under
-%   the terms of the GNU General Public License as published by the Free
-%   Software Foundation; either version 2 of the License, or (at your
-%   option) any later version.
+% LuaTeX is free software; you can redistribute it and/or modify it under
+% the terms of the GNU General Public License as published by the Free
+% Software Foundation; either version 2 of the License, or (at your
+% option) any later version.
 %
-%   LuaTeX is distributed in the hope that it will be useful, but WITHOUT
-%   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-%   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-%   License for more details.
+% LuaTeX is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+% License for more details.
 %
-%   You should have received a copy of the GNU General Public License along
-%   with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% You should have received a copy of the GNU General Public License along
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
-#include "lua/luatex-api.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+#include "lua/luatex-api.h"
+
 @ a bit more interfacing is needed for proper error reporting 
 
 @c
diff --git a/source/texk/web2c/luatexdir/font/luafont.w b/source/texk/web2c/luatexdir/font/luafont.w
index cc2d0068a049f6fb96be0307d1068cbddfd7ee43..a4b62febd85705387b776d181620108541f8d90a 100644
--- a/source/texk/web2c/luatexdir/font/luafont.w
+++ b/source/texk/web2c/luatexdir/font/luafont.w
@@ -1,26 +1,26 @@
 % luafont.w
 %
-%   Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
 %
-%   This file is part of LuaTeX.
+% This file is part of LuaTeX.
 %
-%   LuaTeX is free software; you can redistribute it and/or modify it under
-%   the terms of the GNU General Public License as published by the Free
-%   Software Foundation; either version 2 of the License, or (at your
-%   option) any later version.
+% LuaTeX is free software; you can redistribute it and/or modify it under
+% the terms of the GNU General Public License as published by the Free
+% Software Foundation; either version 2 of the License, or (at your
+% option) any later version.
 %
-%   LuaTeX is distributed in the hope that it will be useful, but WITHOUT
-%   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-%   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-%   License for more details.
+% LuaTeX is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+% License for more details.
 %
-%   You should have received a copy of the GNU General Public License along
-%   with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
+% You should have received a copy of the GNU General Public License along
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
+    "$Id$"
+    "$URL$";
 
 #include "ptexlib.h"
 #include "lua/luatex-api.h"
diff --git a/source/texk/web2c/luatexdir/font/mapfile.w b/source/texk/web2c/luatexdir/font/mapfile.w
index b9947f9ec33a8556900983377f95860db12e90f0..aead7b2a2c090b54f775c133a92b2e775e375059 100644
--- a/source/texk/web2c/luatexdir/font/mapfile.w
+++ b/source/texk/web2c/luatexdir/font/mapfile.w
@@ -1,26 +1,26 @@
-@ @c
-/* mapfile.c
-
-   Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-   Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
-   This file is part of LuaTeX.
-
-   LuaTeX is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 2 of the License, or (at your
-   option) any later version.
-
-   LuaTeX is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-   License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
+% mapfile.w
+%
+% Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
+% Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
+%
+% This file is part of LuaTeX.
+%
+% LuaTeX is free software; you can redistribute it and/or modify it under
+% the terms of the GNU General Public License as published by the Free
+% Software Foundation; either version 2 of the License, or (at your
+% option) any later version.
+%
+% LuaTeX is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+% License for more details.
+%
+% You should have received a copy of the GNU General Public License along
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
+@ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include <math.h>
diff --git a/source/texk/web2c/luatexdir/font/pkin.w b/source/texk/web2c/luatexdir/font/pkin.w
index fba3f5f35d10d6591bff61a4bf5438f98b99aad2..69812fc6964cbfdfac5aed19f280d0531c5bf5e6 100644
--- a/source/texk/web2c/luatexdir/font/pkin.w
+++ b/source/texk/web2c/luatexdir/font/pkin.w
@@ -1,22 +1,22 @@
-%   pkin.w
-%   
-%   Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-%   Copyright 2006-2008 Taco Hoekwater <taco@@luatex.org>
+% pkin.w
 %
-%   This file is part of LuaTeX.
+% Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
+% Copyright 2006-2008 Taco Hoekwater <taco@@luatex.org>
 %
-%   LuaTeX is free software; you can redistribute it and/or modify it under
-%   the terms of the GNU General Public License as published by the Free
-%   Software Foundation; either version 2 of the License, or (at your
-%   option) any later version.
+% This file is part of LuaTeX.
 %
-%   LuaTeX is distributed in the hope that it will be useful, but WITHOUT
-%   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-%   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-%   License for more details.
+% LuaTeX is free software; you can redistribute it and/or modify it under
+% the terms of the GNU General Public License as published by the Free
+% Software Foundation; either version 2 of the License, or (at your
+% option) any later version.
 %
-%   You should have received a copy of the GNU General Public License along
-%   with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% LuaTeX is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+% License for more details.
+%
+% You should have received a copy of the GNU General Public License along
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @
 NAME
@@ -47,14 +47,14 @@ Piet Tutelaers <rcpt@@urc.tue.nl>
 Modified for use with pdftex by Han The Thanh <thanh@@fi.muni.cz>.
 
 @c
-#include "ptexlib.h"
-
-typedef short shalfword;
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
+typedef short shalfword;
+
 @
 Now we have some routines to get stuff from the pk file.  pkbyte returns
 the next byte from the pk file.
diff --git a/source/texk/web2c/luatexdir/font/sfnt.w b/source/texk/web2c/luatexdir/font/sfnt.w
index 2163ba18843a9406a78e4af0ba95c625dbb42610..6da4d342635c1dc7c019169eccd45a84297d52a7 100644
--- a/source/texk/web2c/luatexdir/font/sfnt.w
+++ b/source/texk/web2c/luatexdir/font/sfnt.w
@@ -1,26 +1,29 @@
 % sfnt.w
-%  
+%
 % Copyright 2002 by Jin-Hwan Cho and Shunsaku Hirata,
 % the dvipdfmx project team <dvipdfmx@@project.ktug.or.kr>
 % Copyright 2006-2008 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ Based on dvipdfmx-0.13.2c
 @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
 
 #if  HAVE_CONFIG_H
 #  include <w2c/config.h>
@@ -31,12 +34,6 @@
 #  include "ptexlib.h"
 #include "font/sfnt.h"
 
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
-
-
 @ type:
 
  `true' (0x74727565): TrueType (Mac)
diff --git a/source/texk/web2c/luatexdir/font/subfont.w b/source/texk/web2c/luatexdir/font/subfont.w
index 559b2bb457bb29b8a1ebd89c75ddfd81aef55509..1a2964cd2fe902119b33e35d8012433d8edcaf47 100644
--- a/source/texk/web2c/luatexdir/font/subfont.w
+++ b/source/texk/web2c/luatexdir/font/subfont.w
@@ -1,31 +1,31 @@
 % subfont.w
-% 
+%
 % Copyright 2005-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2008 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "ptexlib.h"
 #include <string.h>
 
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 @ @c
 static struct avl_table *sfd_tree = NULL;
 
diff --git a/source/texk/web2c/luatexdir/font/texfont.w b/source/texk/web2c/luatexdir/font/texfont.w
index d14247f72ec93301ac780ec60a41da55c70203d5..32abd521f41198294bc19b4f8aaee68afee3d492 100644
--- a/source/texk/web2c/luatexdir/font/texfont.w
+++ b/source/texk/web2c/luatexdir/font/texfont.w
@@ -1,23 +1,22 @@
-% texfont.w 
-
+% texfont.w
+%
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
-
 @* Main font API implementation for the original pascal parts.
 
 Stuff to watch out for:
@@ -33,8 +32,8 @@ problematic |if 0 != null|.
 
 @c
 static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
+    "$Id$"
+    "$URL$";
 
 #include "ptexlib.h"
 #include "lua/luatex-api.h"
diff --git a/source/texk/web2c/luatexdir/font/tfmofm.w b/source/texk/web2c/luatexdir/font/tfmofm.w
index b3adab7669ad64d96a2b81abfb88e0bd5f0ae3b5..8e78e6221a4c04cb19e3b06d9073df3df25fd82a 100644
--- a/source/texk/web2c/luatexdir/font/tfmofm.w
+++ b/source/texk/web2c/luatexdir/font/tfmofm.w
@@ -1,28 +1,28 @@
 % tfmofm.w
-% 
+%
 % Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
+    "$Id$"
+    "$URL$";
+
+#include "ptexlib.h"
 
 @ Here are some macros that help process ligatures and kerns 
 @c
diff --git a/source/texk/web2c/luatexdir/font/tounicode.w b/source/texk/web2c/luatexdir/font/tounicode.w
index 2e3fad40c72c91ce216e5df254c6f2617b9aebe1..6f83b737e7785ae26c0cb6c574c4139524793cd5 100644
--- a/source/texk/web2c/luatexdir/font/tounicode.w
+++ b/source/texk/web2c/luatexdir/font/tounicode.w
@@ -1,29 +1,29 @@
 % tounicode.w
-
+%
 % Copyright 2006 Han The Thanh, <thanh@@pdftex.org>
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
+    "$Id$"
+    "$URL$";
+
+#include "ptexlib.h"
 
 @ @c
 #define isXdigit(c) (isdigit(c) || ('A' <= (c) && (c) <= 'F'))
diff --git a/source/texk/web2c/luatexdir/font/tt_glyf.w b/source/texk/web2c/luatexdir/font/tt_glyf.w
index 4eb34113b48047c0fced3de1ea5d0d2fd98c6f07..e70a7ced69a6cb778c5b273fe2a95e330b76cae8 100644
--- a/source/texk/web2c/luatexdir/font/tt_glyf.w
+++ b/source/texk/web2c/luatexdir/font/tt_glyf.w
@@ -1,27 +1,31 @@
 % tt_glyf.w
-%  
+%
 % Copyright 2002 by Jin-Hwan Cho and Shunsaku Hirata,
 % the dvipdfmx project team <dvipdfmx@@project.ktug.or.kr>
 % Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @* Subsetting glyf, updating loca, hmtx, etc.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "ptexlib.h"
 
 #include "font/sfnt.h"
@@ -29,10 +33,6 @@
 #include "font/tt_glyf.h"
 #include "font/writettf.h"
 
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 @ @c
 #define NUM_GLYPH_LIMIT        65534
 #define TABLE_DATA_ALLOC_SIZE  40960
diff --git a/source/texk/web2c/luatexdir/font/tt_table.w b/source/texk/web2c/luatexdir/font/tt_table.w
index d1df1d273412ca8c816a729fba2ce5a83c856f6e..17dbd06feff53006e69e9a4838af138eafd90ef1 100644
--- a/source/texk/web2c/luatexdir/font/tt_table.w
+++ b/source/texk/web2c/luatexdir/font/tt_table.w
@@ -1,35 +1,34 @@
 % tt_table.w
-%  
+%
 % Copyright 2002 by Jin-Hwan Cho and Shunsaku Hirata,
 % the dvipdfmx project team <dvipdfmx@@project.ktug.or.kr>
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include <stdio.h>
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
 
+#include <stdio.h>
 #include "ptexlib.h"
 #include "font/sfnt.h"
 #include "font/tt_table.h"
 
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 @ tables contains information refered by other tables
 
   |maxp->numGlyphs, etc --> loca, etc|
diff --git a/source/texk/web2c/luatexdir/font/vfovf.w b/source/texk/web2c/luatexdir/font/vfovf.w
index 6f1b46c74bde88e5ad5de079ee1278445ee4387c..3f6c23a3c643184a9a0c57d8a434e67d32ef8372 100644
--- a/source/texk/web2c/luatexdir/font/vfovf.w
+++ b/source/texk/web2c/luatexdir/font/vfovf.w
@@ -1,30 +1,30 @@
 % vfovf.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 /* this is a hack! */
 #define font_max 5000
diff --git a/source/texk/web2c/luatexdir/font/vfpacket.w b/source/texk/web2c/luatexdir/font/vfpacket.w
index c4e0c7a8bd9c0d9aefcb2da9fa61674c6814215d..021592a62fd3f6a132d480f6996266113fd92343 100644
--- a/source/texk/web2c/luatexdir/font/vfpacket.w
+++ b/source/texk/web2c/luatexdir/font/vfpacket.w
@@ -20,7 +20,7 @@
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/font/writecff.w b/source/texk/web2c/luatexdir/font/writecff.w
index 5bb901578a8a504574de2453e26bf652ed05a2f8..6ffc231257843c7f573d40eddd6570d9d71efc8f 100644
--- a/source/texk/web2c/luatexdir/font/writecff.w
+++ b/source/texk/web2c/luatexdir/font/writecff.w
@@ -1,34 +1,33 @@
 % writecff.w
-
+%
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "ptexlib.h"
 #include "lua/luatex-api.h"
-
 #include "font/writecff.h"
 
 extern int cidset;
 
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 @ @c
 #define get_offset(s,n) get_unsigned(s, (n))
 #define get_card8(a)  (card8)(a->stream[a->offset++])
diff --git a/source/texk/web2c/luatexdir/font/writeenc.w b/source/texk/web2c/luatexdir/font/writeenc.w
index ad99bda0a6a850c1b6227ba9619cd0e8e56d93fc..63172a8732ae35a76299bea4e58d69023b5a73f6 100644
--- a/source/texk/web2c/luatexdir/font/writeenc.w
+++ b/source/texk/web2c/luatexdir/font/writeenc.w
@@ -1,29 +1,29 @@
 % writeenc.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
+    "$Id$"
+    "$URL$";
+
+#include "ptexlib.h"
 
 @ All encoding entries go into AVL tree for fast search by name.
 @c
diff --git a/source/texk/web2c/luatexdir/font/writefont.w b/source/texk/web2c/luatexdir/font/writefont.w
index 533ba1d3c866cd0a4e9d0cacc41c73d6ff898871..a7c0f337ab9e2a5d078e41f795aa4c830f6dbf3d 100644
--- a/source/texk/web2c/luatexdir/font/writefont.w
+++ b/source/texk/web2c/luatexdir/font/writefont.w
@@ -1,27 +1,27 @@
 % writefont.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
+    "$Id$"
+    "$URL$";
 
 #include "ptexlib.h"
 #include "lua/luatex-api.h"
diff --git a/source/texk/web2c/luatexdir/font/writet1.w b/source/texk/web2c/luatexdir/font/writet1.w
index 8bc9f56ed330ca5c3474fbb3bf1066d6951002c6..527e1f6c5a71667f926f03f6aac99ed813e80982 100644
--- a/source/texk/web2c/luatexdir/font/writet1.w
+++ b/source/texk/web2c/luatexdir/font/writet1.w
@@ -20,7 +20,7 @@
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/font/writet3.w b/source/texk/web2c/luatexdir/font/writet3.w
index 7abbfd82a8895b55ff8d7d64d0d75e6b5142fc30..6ed1ecca36752498a47336a3190191951d5da9ff 100644
--- a/source/texk/web2c/luatexdir/font/writet3.w
+++ b/source/texk/web2c/luatexdir/font/writet3.w
@@ -1,27 +1,27 @@
 % writet3.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
+    "$Id$"
+    "$URL$";
 
 #include "ptexlib.h"
 #include <kpathsea/tex-glyph.h>
diff --git a/source/texk/web2c/luatexdir/font/writettf.w b/source/texk/web2c/luatexdir/font/writettf.w
index d99134dc10283bea9235152e0f51b328a24c1858..a8f0fa62b6a66c7596acc38e4727a6cd10b90ac1 100644
--- a/source/texk/web2c/luatexdir/font/writettf.w
+++ b/source/texk/web2c/luatexdir/font/writettf.w
@@ -1,32 +1,32 @@
 % writettf.w
-% 
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "ptexlib.h"
 #include "font/writettf.h"
 #include <string.h>
 
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 #define DEFAULT_NTABS       14
 #define NEW_CMAP_SIZE       2
 
diff --git a/source/texk/web2c/luatexdir/font/writetype0.w b/source/texk/web2c/luatexdir/font/writetype0.w
index e517fcbc43fd5a20c188575a90d8e7e9fde3026b..afa88433626adb6d28747a023add26c70a86f873 100644
--- a/source/texk/web2c/luatexdir/font/writetype0.w
+++ b/source/texk/web2c/luatexdir/font/writetype0.w
@@ -1,31 +1,31 @@
 % writetype0.w
-% 
+%
 % Copyright 2006-2008 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "ptexlib.h"
 #include "font/writettf.h"
 #include "font/writecff.h"
 
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 @ @c
 void writetype0(PDF pdf, fd_entry * fd)
 {
diff --git a/source/texk/web2c/luatexdir/font/writetype2.w b/source/texk/web2c/luatexdir/font/writetype2.w
index 7c7477d093241c6fba3ae51122328e6ebdd5e3cf..a66ed2b3b95ce78efb699b0678e8ee1dce873330 100644
--- a/source/texk/web2c/luatexdir/font/writetype2.w
+++ b/source/texk/web2c/luatexdir/font/writetype2.w
@@ -18,6 +18,10 @@
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "ptexlib.h"
 #include "font/writettf.h"
 #include "font/writecff.h"
@@ -26,9 +30,6 @@
 #include "font/sfnt.h"
 #include "font/tt_glyf.h"
 
-static const char _svn_version[] =
-    "$Id$ $URL$";
-
 @ forward declaration
 @c
 void make_tt_subset(PDF pdf, fd_entry * fd, unsigned char *buffer, int buflen);
diff --git a/source/texk/web2c/luatexdir/image/pdftoepdf.w b/source/texk/web2c/luatexdir/image/pdftoepdf.w
index f11b256df45648ebf5d9bbfbab6d21bc69ccb82d..ba2ebdcd5199f555e0758a7630221ce68aefcc9d 100644
--- a/source/texk/web2c/luatexdir/image/pdftoepdf.w
+++ b/source/texk/web2c/luatexdir/image/pdftoepdf.w
@@ -1,26 +1,26 @@
-@ @c
-/* pdftoepdf.w
-
-   Copyright 1996-2006 Han The Thanh <thanh@pdftex.org>
-   Copyright 2006-2012 Taco Hoekwater <taco@luatex.org>
-
-   This file is part of LuaTeX.
-
-   LuaTeX is free software; you can redistribute it and/or modify it under
-   the terms of the GNU General Public License as published by the Free
-   Software Foundation; either version 2 of the License, or (at your
-   option) any later version.
-
-   LuaTeX is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-   License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
+% pdftoepdf.w
+%
+% Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
+% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
+%
+% This file is part of LuaTeX.
+%
+% LuaTeX is free software; you can redistribute it and/or modify it under
+% the terms of the GNU General Public License as published by the Free
+% Software Foundation; either version 2 of the License, or (at your
+% option) any later version.
+%
+% LuaTeX is distributed in the hope that it will be useful, but WITHOUT
+% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+% FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+% License for more details.
+%
+% You should have received a copy of the GNU General Public License along
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
+@ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 // define DEBUG
diff --git a/source/texk/web2c/luatexdir/image/writeimg.w b/source/texk/web2c/luatexdir/image/writeimg.w
index 54b732f91cf2f33a5a6a8a5bf8582fa58014aab6..0bf2101aeeb188d76adc129882f34c5bed6b1025 100644
--- a/source/texk/web2c/luatexdir/image/writeimg.w
+++ b/source/texk/web2c/luatexdir/image/writeimg.w
@@ -1,20 +1,20 @@
 % writeimg.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
@@ -22,7 +22,7 @@
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/image/writejbig2.w b/source/texk/web2c/luatexdir/image/writejbig2.w
index 41b32d04a287262177304324aacc2b78bda441bc..9a0f539cf99d3370dffc49b5c1b3388243e947df 100644
--- a/source/texk/web2c/luatexdir/image/writejbig2.w
+++ b/source/texk/web2c/luatexdir/image/writejbig2.w
@@ -1,21 +1,21 @@
 % writejbig2.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
-% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-% Copyright 2003-2011 Hartmut Henkel <hartmut@@luatex.org>
-
+% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2003-2012 Hartmut Henkel <hartmut@@luatex.org>
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
@@ -81,7 +81,7 @@ object exists, reference it. Else create fresh one.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #undef DEBUG
@@ -450,7 +450,7 @@ static void checkseghdrflags(SEGINFO * sip)
     }
 }
 
-@ for first reading of file; return value tells if header been read 
+@ for first reading of file; return value tells if header been read
 
 @c
 static boolean readseghdr(FILEINFO * fip, SEGINFO * sip)
@@ -533,7 +533,7 @@ static void markpage0seg(FILEINFO * fip, unsigned long referedseg)
     }
 }
 
-@ for writing, marks refered page0 segments, sets segpage > 0 to 1 
+@ for writing, marks refered page0 segments, sets segpage > 0 to 1
 
 @c
 static void writeseghdr(PDF pdf, FILEINFO * fip, SEGINFO * sip)
@@ -584,7 +584,7 @@ static void writeseghdr(PDF pdf, FILEINFO * fip, SEGINFO * sip)
     /* ---- at end of segment header ---- */
 }
 
-@ for recursive marking of refered page0 segments 
+@ for recursive marking of refered page0 segments
 @c
 static void checkseghdr(FILEINFO * fip, SEGINFO * sip)
 {
diff --git a/source/texk/web2c/luatexdir/image/writejp2.w b/source/texk/web2c/luatexdir/image/writejp2.w
index 0d4054d8c1bc1ae08c592013b2f8d8152322b2d3..9c5a894a750988cc1241d108e3a203c20fbe2e49 100644
--- a/source/texk/web2c/luatexdir/image/writejp2.w
+++ b/source/texk/web2c/luatexdir/image/writejp2.w
@@ -1,26 +1,26 @@
 % writejp2.w
-
+%
 % Copyright 2011-2012 Taco Hoekwater <taco@@luatex.org>
 % Copyright 2011-2012 Hartmut Henkel <hartmut@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 @ Basic JPEG~2000 image support. Section and Table references below:
diff --git a/source/texk/web2c/luatexdir/image/writejpg.w b/source/texk/web2c/luatexdir/image/writejpg.w
index ca6db68d22440488143132556fc5125e532bc2a6..8d58286914d889a423884e14510e1ca743b5ba4c 100644
--- a/source/texk/web2c/luatexdir/image/writejpg.w
+++ b/source/texk/web2c/luatexdir/image/writejpg.w
@@ -1,26 +1,26 @@
 % writejpg.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include <assert.h>
diff --git a/source/texk/web2c/luatexdir/image/writepng.w b/source/texk/web2c/luatexdir/image/writepng.w
index 5411818f4e71bf69f3a833d1aba20d20505a9153..04bf9ae1a13a73cb3ea124ede62ffdb62b7b2a0c 100644
--- a/source/texk/web2c/luatexdir/image/writepng.w
+++ b/source/texk/web2c/luatexdir/image/writepng.w
@@ -1,26 +1,26 @@
 % writepng.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include <assert.h>
diff --git a/source/texk/web2c/luatexdir/lang/hnjalloc.w b/source/texk/web2c/luatexdir/lang/hnjalloc.w
index da1f04a6b550fcd858c3e29f5b75acf86dfc7825..91fefec9e5d32830a4e1ee34ff5b4a09d065f20f 100644
--- a/source/texk/web2c/luatexdir/lang/hnjalloc.w
+++ b/source/texk/web2c/luatexdir/lang/hnjalloc.w
@@ -1,38 +1,40 @@
+% hnjalloc.w
+%
 % LibHnj is dual licensed under LGPL and MPL. Boilerplate for both
 % licenses follows.
-% 
-% 
+%
+%
 % LibHnj - a library for high quality hyphenation and justification
 % Copyright (C) 1998 Raph Levien, (C) 2001 ALTLinux, Moscow
-% 
+%
 % This library is free software; you can redistribute it and/or
 % modify it under the terms of the GNU Library General Public
 % License as published by the Free Software Foundation; either
 % version 2 of the License, or (at your option) any later version.
-% 
+%
 % This library is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 % Library General Public License for more details.
-% 
+%
 % You should have received a copy of the GNU Library General Public
-% License along with this library; if not, write to the 
-% Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+% License along with this library; if not, write to the
+% Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 % Boston, MA  02111-1307  USA.
-% 
-% 
-% 
+%
+%
+%
 % The contents of this file are subject to the Mozilla Public License
 % Version 1.0 (the "MPL"); you may not use this file except in
 % compliance with the MPL.  You may obtain a copy of the MPL at
 % http://www.mozilla.org/MPL/
-% 
+%
 % Software distributed under the MPL is distributed on an "AS IS" basis,
 % WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
 % for the specific language governing rights and limitations under the
 % MPL.
 
-@ wrappers for malloc 
+@ wrappers for malloc
 @c
 
 #include <stdlib.h>
diff --git a/source/texk/web2c/luatexdir/lang/hyphen.w b/source/texk/web2c/luatexdir/lang/hyphen.w
index 472e9ffb8a503d764e7bdf2e5a84b06b8d5383ad..eabb378376938d16459183370527d658f97566ab 100644
--- a/source/texk/web2c/luatexdir/lang/hyphen.w
+++ b/source/texk/web2c/luatexdir/lang/hyphen.w
@@ -1,34 +1,36 @@
+% hyphen.w
+%
 % Libhnj is dual licensed under LGPL and MPL. Boilerplate for both
 % licenses follows.
-% 
-% 
+%
+%
 % LibHnj - a library for high quality hyphenation and justification
-% Copyright (C) 1998 Raph Levien, 
-% 	     (C) 2001 ALTLinux, Moscow (http://www.alt-linux.org), 
+% Copyright (C) 1998 Raph Levien,
+% 	     (C) 2001 ALTLinux, Moscow (http://www.alt-linux.org),
 %           (C) 2001 Peter Novodvorsky (nidd@@cs.msu.su)
-% 
+%
 % This library is free software; you can redistribute it and/or
 % modify it under the terms of the GNU Library General Public
 % License as published by the Free Software Foundation; either
 % version 2 of the License, or (at your option) any later version.
-% 
+%
 % This library is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 % Library General Public License for more details.
-% 
+%
 % You should have received a copy of the GNU Library General Public
-% License along with this library; if not, write to the 
-% Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+% License along with this library; if not, write to the
+% Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 % Boston, MA  02111-1307  USA.
-% 
-% 
-% 
+%
+%
+%
 % The contents of this file are subject to the Mozilla Public License
 % Version 1.0 (the "MPL"); you may not use this file except in
 % compliance with the MPL.  You may obtain a copy of the MPL at
 % http://www.mozilla.org/MPL/
-% 
+%
 % Software distributed under the MPL is distributed on an "AS IS" basis,
 % WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
 % for the specific language governing rights and limitations under the
@@ -36,6 +38,10 @@
 
 
 @ @c
+static const char _svn_version[] =
+    "$Id$ "
+    "$URL$";
+
 #include <stdlib.h>             /* for NULL, malloc */
 #include <stdio.h>              /* for fprintf */
 #include <string.h>             /* for strdup */
@@ -54,11 +60,6 @@
 #include "lang/hnjalloc.h"
 #include "lang/hyphen.h"
 
-@ @c
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 @ TODO: should be moved to separate library
 
 @c 
diff --git a/source/texk/web2c/luatexdir/lang/texlang.w b/source/texk/web2c/luatexdir/lang/texlang.w
index 55bf3242acf9a1f88dd8aa7b9f6a3aa11e905fc5..ca9cb8f61a0ab369588c31f74deb6859243b153d 100644
--- a/source/texk/web2c/luatexdir/lang/texlang.w
+++ b/source/texk/web2c/luatexdir/lang/texlang.w
@@ -1,35 +1,31 @@
 % texlang.w
-% 
-% Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
+% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
 
+#include "ptexlib.h"
 #include <string.h>
-
 #include "lua/luatex-api.h"
 
-
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
-
 @ Low-level helpers 
 
 @c
diff --git a/source/texk/web2c/luatexdir/lua/luagen.w b/source/texk/web2c/luatexdir/lua/luagen.w
index ccc438c86cfa2d3398ae8ee0e916f891e4b258df..37251ba41b86dac6832ef372a845adf566b6a27a 100644
--- a/source/texk/web2c/luatexdir/lua/luagen.w
+++ b/source/texk/web2c/luatexdir/lua/luagen.w
@@ -1,25 +1,25 @@
 % luagen.w
-% 
-% Copyright 2009 Taco Hoekwater <taco@@luatex.org>
-
+%
+% Copyright 2009-2012 Taco Hoekwater <taco@@luatex.org>
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/lua/luainit.w b/source/texk/web2c/luatexdir/lua/luainit.w
index 61cac67eab7eb1a9f09027b536c34d9418c677af..1affdc33a914b94eab10a30ec5a7e3c2cb319a73 100644
--- a/source/texk/web2c/luatexdir/lua/luainit.w
+++ b/source/texk/web2c/luatexdir/lua/luainit.w
@@ -1,33 +1,34 @@
 % luainit.w
-% 
+%
 % Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "openbsd-compat.h"
 #include <kpathsea/c-stat.h>
 
 #include "ptexlib.h"
 #include "lua/luatex-api.h"
 
-static const char _svn_version[] =
-    "$Id$ $URL$";
-
-@ 
+@
 TH: TODO
 
 This file is getting a bit messy, but it is not simple to fix unilaterally.
diff --git a/source/texk/web2c/luatexdir/lua/luanode.w b/source/texk/web2c/luatexdir/lua/luanode.w
index a6f27c6131f4850a02fd4f71e6baa9237f1dafc5..6bb60eb567b962fea398fcd334245155ae8722ab 100644
--- a/source/texk/web2c/luatexdir/lua/luanode.w
+++ b/source/texk/web2c/luatexdir/lua/luanode.w
@@ -1,31 +1,30 @@
 % luanode.w
-% 
+%
 % Copyright 2006-2008 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "ptexlib.h"
 #include "lua/luatex-api.h"
 
-
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 @ @c
 static const char *group_code_names[] = {
     "",
diff --git a/source/texk/web2c/luatexdir/lua/luastuff.w b/source/texk/web2c/luatexdir/lua/luastuff.w
index 324c8fd209710d2d727189bdf2c3b31cab76771a..a8d90452aabc663e8cd6c975b3b1ddb816efcf76 100644
--- a/source/texk/web2c/luatexdir/lua/luastuff.w
+++ b/source/texk/web2c/luatexdir/lua/luastuff.w
@@ -1,25 +1,25 @@
 % luastuff.w
-
+%
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/lua/luatoken.w b/source/texk/web2c/luatexdir/lua/luatoken.w
index d084c357743aa76d7fdc8fe71319b628f09b26a5..91a5c4fa2d8b532b8ee5f57c74de48ffdfcf766f 100644
--- a/source/texk/web2c/luatexdir/lua/luatoken.w
+++ b/source/texk/web2c/luatexdir/lua/luatoken.w
@@ -1,30 +1,30 @@
 % luatoken.w
-% 
-% Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
+% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include "ptexlib.h"
 #include "lua/luatex-api.h"
 
-static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
-
 @ @c
 command_item command_names[] = {
     {"relax", relax_cmd, NULL},
diff --git a/source/texk/web2c/luatexdir/lua/texluac.w b/source/texk/web2c/luatexdir/lua/texluac.w
index 84ab5a2a67cb89ec44d2b524b93879f63e111903..631b903757690512aa472ced8b02d308283a0c6f 100644
--- a/source/texk/web2c/luatexdir/lua/texluac.w
+++ b/source/texk/web2c/luatexdir/lua/texluac.w
@@ -1,7 +1,7 @@
-% texlua.w
+% texluac.w
 %
 % Copyright (C) 1994-2007 Lua.org, PUC-Rio.  All rights reserved.
-% Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
+% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
 %
 % Permission is hereby granted, free of charge, to any person obtaining
 % a copy of this software and associated documentation files (the
@@ -10,10 +10,10 @@
 % distribute, sublicense, and/or sell copies of the Software, and to
 % permit persons to whom the Software is furnished to do so, subject to
 % the following conditions:
-*
+%
 % The above copyright notice and this permission notice shall be
 % included in all copies or substantial portions of the Software.
-*
+%
 % THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 % EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 % MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -21,10 +21,14 @@
 % CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 % TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 % SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
+%
 % This file is part of LuaTeX.
 
 @ @c
+static const char _svn_version[] =
+    "$Id$"
+    "$URL$";
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,11 +50,7 @@
 
 #include "lua/luatex-api.h"
 
-
 @ @c
-static const char _svn_version[] =
-    "$Id$ $URL$";
-
 /*  fix for non-gcc compilation: */
 #if !defined(__GNUC__) || (__GNUC__ < 2) 
 # define __attribute__(x)
diff --git a/source/texk/web2c/luatexdir/luascripts/txt2zlib.w b/source/texk/web2c/luatexdir/luascripts/txt2zlib.w
index 22a59e8189235c7631155c597ca350f49c98c577..7965ec51f022f7229e94b6df25e8b34c863bc94e 100644
--- a/source/texk/web2c/luatexdir/luascripts/txt2zlib.w
+++ b/source/texk/web2c/luatexdir/luascripts/txt2zlib.w
@@ -1,23 +1,23 @@
 % txt2zlib.w
-
+%
 % Copyright 2010 Taco Hoekwater <taco@@luatex.org>
 % Copyright 2010 Hartmut Henkel <hartmut@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
-
+%
 % $Id$
 % $URL$
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfaction.w b/source/texk/web2c/luatexdir/pdf/pdfaction.w
index cb7671e4054c5500fe56429f54ddc211d2cb3a8e..a3bbb079183bce9cdb3ffbebbfd931dc2d43a7d5 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfaction.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfaction.w
@@ -1,29 +1,28 @@
 % pdfaction.w
-
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
 
 @ @c
 static halfword new_action_node(void)
diff --git a/source/texk/web2c/luatexdir/pdf/pdfannot.w b/source/texk/web2c/luatexdir/pdf/pdfannot.w
index f329fc08a3cc07bb6240b0d97936cd736502f1c2..b36609103b6d1fdb411a5c47a7114f4bc7dcd806 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfannot.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfannot.w
@@ -1,19 +1,19 @@
 % pdfannot.w
-
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w b/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w
index b43abf782c76f7388027c5c601e934991d537829..07ac3aa95d403021844268d7387d7e963bf02095 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfcolorstack.w
@@ -1,29 +1,28 @@
 % pdfcolorstack.w
-% 
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
 
 @* Color Stack and Matrix Transformation Support.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfdest.w b/source/texk/web2c/luatexdir/pdf/pdfdest.w
index 45f6f12d7a8727cc727141ff7f5143c8e06c44e1..d66faa2d5b18b5296b2c37cda35e0212114ed62e 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfdest.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfdest.w
@@ -1,19 +1,19 @@
 % pdfdest.w
-
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdffont.w b/source/texk/web2c/luatexdir/pdf/pdffont.w
index b81cf4d87bd51e67dc22ad28f5c1a0e55c956180..c52ad9d35b9db3e2b217590a87c61db652265522 100644
--- a/source/texk/web2c/luatexdir/pdf/pdffont.w
+++ b/source/texk/web2c/luatexdir/pdf/pdffont.w
@@ -1,21 +1,21 @@
 % pdffont.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 \def\pdfTeX{pdf\TeX}
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfgen.w b/source/texk/web2c/luatexdir/pdf/pdfgen.w
index 71ad56bd02aa512060e16078386f1e0333b40a58..4b8236b879dfe3e856518a6c6806a82161158f79 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfgen.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfgen.w
@@ -1,19 +1,19 @@
 % pdfgen.w
-
+%
 % Copyright 2009-2012 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfglyph.w b/source/texk/web2c/luatexdir/pdf/pdfglyph.w
index 61262df0c479c4a5e49c13f443d6cf388ca068da..3a5dd6f1278af13f33ae5103c4a2684fd50ebc10 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfglyph.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfglyph.w
@@ -1,19 +1,19 @@
 % pdfglyph.w
-
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfimage.w b/source/texk/web2c/luatexdir/pdf/pdfimage.w
index 7f6365790996003fc44af5d299047eb0f7c70b89..7961d9e4d84df62e8d2e47d87a158af7685c5123 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfimage.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfimage.w
@@ -1,21 +1,21 @@
 % pdfimage.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
diff --git a/source/texk/web2c/luatexdir/pdf/pdflink.w b/source/texk/web2c/luatexdir/pdf/pdflink.w
index f400f3a7b8febcc375e3e5e81a579e307a7f0223..020f3c7645d6e43812ef8d2c6d5760e4c56e89ea 100644
--- a/source/texk/web2c/luatexdir/pdf/pdflink.w
+++ b/source/texk/web2c/luatexdir/pdf/pdflink.w
@@ -1,19 +1,19 @@
 % pdflink.w
-
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdflistout.w b/source/texk/web2c/luatexdir/pdf/pdflistout.w
index be05a3d18f1faa2269b1b6480c68f833da442ad3..285814b250a9bbc2f068e057f61d580aa5941b90 100644
--- a/source/texk/web2c/luatexdir/pdf/pdflistout.w
+++ b/source/texk/web2c/luatexdir/pdf/pdflistout.w
@@ -1,19 +1,19 @@
 % pdflistout.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfliteral.w b/source/texk/web2c/luatexdir/pdf/pdfliteral.w
index 501d8e127a0ce1bcd430e82517d841fa0634b5c7..deb72c24e1fbb0e077e64948fdb89b77ef66ea62 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfliteral.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfliteral.w
@@ -1,29 +1,29 @@
 % pdfliteral.w
 %
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 void pdf_special(PDF pdf, halfword p)
 {
diff --git a/source/texk/web2c/luatexdir/pdf/pdfluaapi.w b/source/texk/web2c/luatexdir/pdf/pdfluaapi.w
index 8f747bfd4d876ad4edafb1755c3bbdf69b9146c7..175201ec173f845ce6774bbc3061f0e11b6158ac 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfluaapi.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfluaapi.w
@@ -1,19 +1,19 @@
 % pdfluaapi.w
-% 
+%
 % Copyright 2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfobj.w b/source/texk/web2c/luatexdir/pdf/pdfobj.w
index ed63aa7c4f42ad53c9eab7f163c50d13719efa9d..8c0a209ac9762be81f6b8a23fc1669bfbd76a1e7 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfobj.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfobj.w
@@ -1,21 +1,21 @@
 % pdfobj.w
-
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
@@ -23,8 +23,6 @@ static const char _svn_version[] =
     "$URL$";
 
 #include "ptexlib.h"
-
-@ @c
 #include "lua/luatex-api.h"
 
 int pdf_last_obj;
diff --git a/source/texk/web2c/luatexdir/pdf/pdfoutline.w b/source/texk/web2c/luatexdir/pdf/pdfoutline.w
index d643d6f1ede423a040067196b6871e6fe517410c..87f5c7d51710f9d2fcd28e8c5b30c7a8af975063 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfoutline.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfoutline.w
@@ -1,29 +1,29 @@
 % pdfoutline.w
-
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ Data structure of outlines; it's not able to write out outline entries
 before all outline entries are defined, so memory allocated for outline
 entries can't not be deallocated and will stay in memory. For this reason we
diff --git a/source/texk/web2c/luatexdir/pdf/pdfpage.w b/source/texk/web2c/luatexdir/pdf/pdfpage.w
index 571c8865638c2aee2a40d2b45e776ca5b5e7b65a..a955192132a1b9ad477cc7fd970f8a7a6ecede8d 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfpage.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfpage.w
@@ -1,25 +1,25 @@
 % pdfpage.w
-
+%
 % Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/pdf/pdfpagetree.w b/source/texk/web2c/luatexdir/pdf/pdfpagetree.w
index 9a0f9062d6de373b74006aa82b1a6492f1e602f3..24c6c86ab952fed002f6fb76bffd3b1b8a4dc4ec 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfpagetree.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfpagetree.w
@@ -1,29 +1,29 @@
 % pdfpagetree.w
-
+%
 % Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @* Page diversions.
 
 @ @c
diff --git a/source/texk/web2c/luatexdir/pdf/pdfrule.w b/source/texk/web2c/luatexdir/pdf/pdfrule.w
index fee18a3509ea6de262a604c3b091e8bc482307f9..6552d58e8d85293d138160eeb749568cad204300 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfrule.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfrule.w
@@ -1,19 +1,19 @@
 % pdfrule.w
-% 
+%
 % Copyright 2010-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w b/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w
index 60816415009c69fe2f0bd1489c1579603270b542..9fd37eaaa6a1a30d331e7eba3975f130bbe1998c 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfsaverestore.w
@@ -1,25 +1,25 @@
 % pdfsaverestore.w
-% 
+%
 % Copyright 2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w b/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w
index 2c068291c75431cb4c843809799e7ff99e995fbf..acc35eef4b6903718bb2665ed70bd9d4abcfd353 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfsetmatrix.w
@@ -1,25 +1,25 @@
 % pdfsetmatrix.w
-% 
+%
 % Copyright 2009 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/pdf/pdfshipout.w b/source/texk/web2c/luatexdir/pdf/pdfshipout.w
index ab89b3feb0f0ce5625db153ffae35476bbc4d56a..97f0fec153b4dadb9f6e7a201de9a6294d928378 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfshipout.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfshipout.w
@@ -1,21 +1,21 @@
 % pdfshipout.w
-
+%
 % Copyright 2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
diff --git a/source/texk/web2c/luatexdir/pdf/pdftables.w b/source/texk/web2c/luatexdir/pdf/pdftables.w
index dec77be76da5de115a6d5cbfbed4fa099f87076f..8451a3ad658a119dee86d557e65486ff6324db06 100644
--- a/source/texk/web2c/luatexdir/pdf/pdftables.w
+++ b/source/texk/web2c/luatexdir/pdf/pdftables.w
@@ -1,21 +1,21 @@
 % pdftables.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
diff --git a/source/texk/web2c/luatexdir/pdf/pdfthread.w b/source/texk/web2c/luatexdir/pdf/pdfthread.w
index 81627ff1cbf3c0a08cb154f10f441387cf9ae0a3..b3f0a8c4911b3735c2dfd4073494e3c563be92e1 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfthread.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfthread.w
@@ -1,19 +1,19 @@
 % pdfthread.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/pdf/pdfxform.w b/source/texk/web2c/luatexdir/pdf/pdfxform.w
index 91a8e6a1c888ef46edf5232d941ed3bf66405b80..f114e4fce2f59bb93d1be68ac4f8f92eea413708 100644
--- a/source/texk/web2c/luatexdir/pdf/pdfxform.w
+++ b/source/texk/web2c/luatexdir/pdf/pdfxform.w
@@ -1,21 +1,21 @@
 % pdfxform.w
-
+%
 % Copyright 2009-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
diff --git a/source/texk/web2c/luatexdir/tex/align.w b/source/texk/web2c/luatexdir/tex/align.w
index 6f7451036b37b2d6de12ceaf258f7414d03b3f07..bc8266dae452a2774bb090b0ecb33144533a8a1e 100644
--- a/source/texk/web2c/luatexdir/tex/align.w
+++ b/source/texk/web2c/luatexdir/tex/align.w
@@ -1,31 +1,31 @@
 % align.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 \def\<#1>{$#1$}
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 void fin_align(void);
 void init_row(void);
diff --git a/source/texk/web2c/luatexdir/tex/arithmetic.w b/source/texk/web2c/luatexdir/tex/arithmetic.w
index 4ecf440fef1c3cf20bcb1d400dac431fe0d9ae23..4261e68dbdfc6987421421e0f552b954a5497622 100644
--- a/source/texk/web2c/luatexdir/tex/arithmetic.w
+++ b/source/texk/web2c/luatexdir/tex/arithmetic.w
@@ -1,31 +1,30 @@
 % arithmetic.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 \def\MP{MetaPost}
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
 
 @ The principal computations performed by \TeX\ are done entirely in terms of
 integers less than $2^{31}$ in magnitude; and divisions are done only when both
diff --git a/source/texk/web2c/luatexdir/tex/buildpage.w b/source/texk/web2c/luatexdir/tex/buildpage.w
index 363afd4319d533368bbd3769e079848008f337b9..d4a0f551ebc7418f1f51fd9e6448e6cb9aa5de9b 100644
--- a/source/texk/web2c/luatexdir/tex/buildpage.w
+++ b/source/texk/web2c/luatexdir/tex/buildpage.w
@@ -1,19 +1,19 @@
 % buildpage.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/tex/commands.w b/source/texk/web2c/luatexdir/tex/commands.w
index 8f57edc450dbd1a31249f15593c51470e42b6dd4..bfa47da670299fb49143d35cce1072ea40eed384 100644
--- a/source/texk/web2c/luatexdir/tex/commands.w
+++ b/source/texk/web2c/luatexdir/tex/commands.w
@@ -1,31 +1,31 @@
 % commands.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 \def\eTeX{e-\TeX}
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ The symbolic names for glue parameters are put into \TeX's hash table
 by using the routine called |primitive|, defined below. Let us enter them
 now, so that we don't have to list all those parameter names anywhere else.
diff --git a/source/texk/web2c/luatexdir/tex/conditional.w b/source/texk/web2c/luatexdir/tex/conditional.w
index 11f6eef07b46b4815a917f8580b25a198bf81665..ad46b0f71b78ef911add86dc518bb2c9e92f3ac6 100644
--- a/source/texk/web2c/luatexdir/tex/conditional.w
+++ b/source/texk/web2c/luatexdir/tex/conditional.w
@@ -1,29 +1,29 @@
 % conditional.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 #define box(A) eqtb[box_base+(A)].hh.rh
 
diff --git a/source/texk/web2c/luatexdir/tex/directions.w b/source/texk/web2c/luatexdir/tex/directions.w
index 35756fe62a779819e8c68c0da4a96433d772b495..f4ef10b3ee0450ca2e7e50beb30ba5b288808e44 100644
--- a/source/texk/web2c/luatexdir/tex/directions.w
+++ b/source/texk/web2c/luatexdir/tex/directions.w
@@ -1,29 +1,29 @@
 % directions.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 void scan_direction(void)
 {
diff --git a/source/texk/web2c/luatexdir/tex/dumpdata.w b/source/texk/web2c/luatexdir/tex/dumpdata.w
index 26a6bda53bf68a4681596bcaf3c486679190090b..88f4f588b459692cda95e111e01bf06d630a2471 100644
--- a/source/texk/web2c/luatexdir/tex/dumpdata.w
+++ b/source/texk/web2c/luatexdir/tex/dumpdata.w
@@ -1,29 +1,29 @@
 % dumpdata.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 #define font_id_text(A) cs_text(font_id_base+(A))
 #define prev_depth cur_list.prev_depth_field
 
diff --git a/source/texk/web2c/luatexdir/tex/equivalents.w b/source/texk/web2c/luatexdir/tex/equivalents.w
index a53052abd857d99f10cbbf09f10eb05bf98dff64..fff2eb9f3bd9b52c80bb256ea342a0e8dde16c20 100644
--- a/source/texk/web2c/luatexdir/tex/equivalents.w
+++ b/source/texk/web2c/luatexdir/tex/equivalents.w
@@ -1,29 +1,29 @@
 % equivalents.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 #define par_shape_ptr equiv(par_shape_loc)
 
diff --git a/source/texk/web2c/luatexdir/tex/errors.w b/source/texk/web2c/luatexdir/tex/errors.w
index 28ddcf05a27f0363972e2525dbfc667fb8177fd2..e9b0cf6f2221159cb50d2190d9b37c419f4ce75f 100644
--- a/source/texk/web2c/luatexdir/tex/errors.w
+++ b/source/texk/web2c/luatexdir/tex/errors.w
@@ -1,29 +1,29 @@
 % errors.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 #define new_line_char int_par(new_line_char_code)
 
diff --git a/source/texk/web2c/luatexdir/tex/expand.w b/source/texk/web2c/luatexdir/tex/expand.w
index 419e0c23673357f52a3117e8d02f6003d475b5e6..de9f7aca6398b45e75ff52a2dc6143ad96d9a6c6 100644
--- a/source/texk/web2c/luatexdir/tex/expand.w
+++ b/source/texk/web2c/luatexdir/tex/expand.w
@@ -1,29 +1,28 @@
 % expand.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
 
 @ Only a dozen or so command codes |>max_command| can possibly be returned by
 |get_next|; in increasing order, they are |undefined_cs|, |expand_after|,
diff --git a/source/texk/web2c/luatexdir/tex/extensions.w b/source/texk/web2c/luatexdir/tex/extensions.w
index 9b052ab4c131bd56d9fc75bb916b975423d28753..f5e72f43bada1a77ddaf3c0d7723b4874357db72 100644
--- a/source/texk/web2c/luatexdir/tex/extensions.w
+++ b/source/texk/web2c/luatexdir/tex/extensions.w
@@ -1,19 +1,19 @@
 % extensions.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/tex/filename.w b/source/texk/web2c/luatexdir/tex/filename.w
index cbc4f39bbf0f85c5a3370813c918c622d7ea1655..f0d29df8ba83698e0955dabaf62fa02208e6fcbe 100644
--- a/source/texk/web2c/luatexdir/tex/filename.w
+++ b/source/texk/web2c/luatexdir/tex/filename.w
@@ -1,29 +1,29 @@
 % filename.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 
 @  In order to isolate the system-dependent aspects of file names, the
   @^system dependencies@>
diff --git a/source/texk/web2c/luatexdir/tex/inputstack.w b/source/texk/web2c/luatexdir/tex/inputstack.w
index 26d2470b5c45c609cf950c058f5d801b05e2bcc3..a6ef4cb87a457b7786b4d25c4e41a910ed02e598 100644
--- a/source/texk/web2c/luatexdir/tex/inputstack.w
+++ b/source/texk/web2c/luatexdir/tex/inputstack.w
@@ -18,12 +18,12 @@
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 #define end_line_char int_par(end_line_char_code)
 #define error_context_lines int_par(error_context_lines_code)
diff --git a/source/texk/web2c/luatexdir/tex/linebreak.w b/source/texk/web2c/luatexdir/tex/linebreak.w
index 2a7fca9ec5d04333df4af3d38cd07e69a46a36a1..ad17a020d6079b7017b3c8790b831f708c498067 100644
--- a/source/texk/web2c/luatexdir/tex/linebreak.w
+++ b/source/texk/web2c/luatexdir/tex/linebreak.w
@@ -1,29 +1,29 @@
 % linebreak.w
-% 
+%
 % Copyright 2006-2008 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ We come now to what is probably the most interesting algorithm of \TeX:
 the mechanism for choosing the ``best possible'' breakpoints that yield
 the individual lines of a paragraph. \TeX's line-breaking algorithm takes
diff --git a/source/texk/web2c/luatexdir/tex/mainbody.w b/source/texk/web2c/luatexdir/tex/mainbody.w
index 9f66333cd652fe0144ebfc4d40aa7189a22d5e33..e16f9f785d896837c2cce8b787b1b879fd5bc422 100644
--- a/source/texk/web2c/luatexdir/tex/mainbody.w
+++ b/source/texk/web2c/luatexdir/tex/mainbody.w
@@ -1,19 +1,19 @@
 % mainbody.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
@@ -22,12 +22,12 @@
 \def\pdfTeX{pdf\TeX}
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ 
 pdfTeX is copyright (C) 1996-2006 Han The Thanh, <thanh@@pdftex.org>.
 
diff --git a/source/texk/web2c/luatexdir/tex/maincontrol.w b/source/texk/web2c/luatexdir/tex/maincontrol.w
index 6c4c70ff1743b0fded453d8a9dc0ac48e56a1726..f9929559b0411ec39bd68df8eee113545bfc02ce 100644
--- a/source/texk/web2c/luatexdir/tex/maincontrol.w
+++ b/source/texk/web2c/luatexdir/tex/maincontrol.w
@@ -1,19 +1,19 @@
 % maincontrol.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/tex/mathcodes.w b/source/texk/web2c/luatexdir/tex/mathcodes.w
index efd876becd909af6526fd94aec303b3ed0a9ff29..27dfec33e46fe7e2aa3a6da5e33edddf692c0353 100644
--- a/source/texk/web2c/luatexdir/tex/mathcodes.w
+++ b/source/texk/web2c/luatexdir/tex/mathcodes.w
@@ -1,30 +1,30 @@
 % mathnodes.w
-% 
+%
 % Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
 % Copyright 2012 Khaled Hosny <khaledhosny@@eglug.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ math codes 
 @c
 static sa_tree mathcode_head = NULL;
diff --git a/source/texk/web2c/luatexdir/tex/memoryword.w b/source/texk/web2c/luatexdir/tex/memoryword.w
index c115f46885377ac870f3be9bcb32e4cb2363a71e..3e5c8a9e65382a748fca11fa8f46c6b58c0b054a 100644
--- a/source/texk/web2c/luatexdir/tex/memoryword.w
+++ b/source/texk/web2c/luatexdir/tex/memoryword.w
@@ -1,29 +1,28 @@
 % memoryword.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
 
 @ When debugging, we may want to print a |memory_word| without knowing
 what type it is; so we print it in all modes.
diff --git a/source/texk/web2c/luatexdir/tex/mlist.w b/source/texk/web2c/luatexdir/tex/mlist.w
index c3787a2bc427267a012b81ecccad50f9ca039fd8..f184332f3343358ec0230af94f076b6ef84173f2 100644
--- a/source/texk/web2c/luatexdir/tex/mlist.w
+++ b/source/texk/web2c/luatexdir/tex/mlist.w
@@ -1,33 +1,32 @@
 % mlist.w
-
+%
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 \def\LuaTeX{Lua\TeX}
 
 @ @c
-#include "ptexlib.h"
-
-#include "lua/luatex-api.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+#include "lua/luatex-api.h"
+
 @ @c
 #define delimiter_factor     int_par(delimiter_factor_code)
 #define delimiter_shortfall  dimen_par(delimiter_shortfall_code)
diff --git a/source/texk/web2c/luatexdir/tex/nesting.w b/source/texk/web2c/luatexdir/tex/nesting.w
index e9a62154c05cded6d79603e2267ccf3e1d7ef025..a1d727dfe7fd2d15310a4b24f9796947e4eab823 100644
--- a/source/texk/web2c/luatexdir/tex/nesting.w
+++ b/source/texk/web2c/luatexdir/tex/nesting.w
@@ -1,29 +1,28 @@
 % nesting.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
 
 @ these are for |show_activities|
 @c
diff --git a/source/texk/web2c/luatexdir/tex/packaging.w b/source/texk/web2c/luatexdir/tex/packaging.w
index cc8af55ec445586e9e24845fee7ce8239250bfc5..6853a31f0ff5fa58c67d8088ebccf7b1dfcdaaf2 100644
--- a/source/texk/web2c/luatexdir/tex/packaging.w
+++ b/source/texk/web2c/luatexdir/tex/packaging.w
@@ -1,29 +1,29 @@
 % packaging.w
-
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 #define scan_normal_dimen() scan_dimen(false,false,false)
 
diff --git a/source/texk/web2c/luatexdir/tex/postlinebreak.w b/source/texk/web2c/luatexdir/tex/postlinebreak.w
index 3d5fb59b52776cf629127a682acf3237e1517f94..52f9ac5f1bcfe9de9bbe34df2fb3a6b209babf98 100644
--- a/source/texk/web2c/luatexdir/tex/postlinebreak.w
+++ b/source/texk/web2c/luatexdir/tex/postlinebreak.w
@@ -1,29 +1,29 @@
 % postlinebreak.w
-% 
+%
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ So far we have gotten a little way into the |line_break| routine, having
 covered its important |try_break| subroutine. Now let's consider the
 rest of the process.
diff --git a/source/texk/web2c/luatexdir/tex/primitive.w b/source/texk/web2c/luatexdir/tex/primitive.w
index e98ebef6b733f1a80ef45cf5f39594657bc529e0..2a75761d0e6151bafe2aba6241783386694950a7 100644
--- a/source/texk/web2c/luatexdir/tex/primitive.w
+++ b/source/texk/web2c/luatexdir/tex/primitive.w
@@ -1,30 +1,28 @@
 % primitive.w
-
+%
 % Copyright 2008-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
 
 @ Control sequences are stored and retrieved by means of a fairly standard hash
 table algorithm called the method of ``coalescing lists'' (cf.\ Algorithm 6.4C
diff --git a/source/texk/web2c/luatexdir/tex/printing.w b/source/texk/web2c/luatexdir/tex/printing.w
index f62196a651f3c89694a3717fd68e3c847321889d..9f3396662f2e82478db52475c6d7d137de83cd7b 100644
--- a/source/texk/web2c/luatexdir/tex/printing.w
+++ b/source/texk/web2c/luatexdir/tex/printing.w
@@ -18,13 +18,13 @@
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-#include "lua/luatex-api.h"     /* for ptexbanner */
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+#include "lua/luatex-api.h"     /* for ptexbanner */
+
 @ @c
 #define font_id_text(A) cs_text(font_id_base+(A))
 
diff --git a/source/texk/web2c/luatexdir/tex/scanning.w b/source/texk/web2c/luatexdir/tex/scanning.w
index c154e0c915c438869c8678b8698bea3c6ebea167..1d01f78b56c86953eb77ba50ea0bce96c5574430 100644
--- a/source/texk/web2c/luatexdir/tex/scanning.w
+++ b/source/texk/web2c/luatexdir/tex/scanning.w
@@ -1,29 +1,28 @@
 % scanning.w
-% 
+%
 % Copyright 2009-2012 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
 
 @ @c
 #define prev_depth cur_list.prev_depth_field
diff --git a/source/texk/web2c/luatexdir/tex/stringpool.w b/source/texk/web2c/luatexdir/tex/stringpool.w
index 713c3c4977053cf230caf3ba4c882fd10b10b2ef..d3ef2272f6d068b378ce76cec5f72a30b701f6fb 100644
--- a/source/texk/web2c/luatexdir/tex/stringpool.w
+++ b/source/texk/web2c/luatexdir/tex/stringpool.w
@@ -1,29 +1,29 @@
 % stringpool.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ Control sequence names and diagnostic messages are variable-length strings
 of eight-bit characters. Since PASCAL did not have a well-developed string
 mechanism, \TeX\ did all of its string processing by homegrown methods.
diff --git a/source/texk/web2c/luatexdir/tex/texdeffont.w b/source/texk/web2c/luatexdir/tex/texdeffont.w
index b26c24971be28279627137f82a7e8f73ff41bd50..f11ef3ece1517164219392ca91bb3f0df7f3bdc2 100644
--- a/source/texk/web2c/luatexdir/tex/texdeffont.w
+++ b/source/texk/web2c/luatexdir/tex/texdeffont.w
@@ -1,29 +1,28 @@
 % texdeffont.w
-
+%
 % Copyright 2008-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ $URL$";
-
+    "$Id$"
+    "$URL$";
 
+#include "ptexlib.h"
 
 @ When the user defines \.{\\font\\f}, say, \TeX\ assigns an internal number
 to the user's font~\.{\\f}. Adding this number to |font_id_base| gives the
diff --git a/source/texk/web2c/luatexdir/tex/texfileio.w b/source/texk/web2c/luatexdir/tex/texfileio.w
index e751631d8093359dd69959eb36b2e435585a67dc..bd951e6bb73f508c85a2ddc9fb7329ae39b56670 100644
--- a/source/texk/web2c/luatexdir/tex/texfileio.w
+++ b/source/texk/web2c/luatexdir/tex/texfileio.w
@@ -1,31 +1,31 @@
 % texfileio.w
-% 
+%
 % Copyright 2009-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include <string.h>
-#include "ptexlib.h"
-#include <kpathsea/absolute.h>
-
 static const char _svn_version[] =
     "$Id$"
     "$URL$";
 
+#include <string.h>
+#include "ptexlib.h"
+#include <kpathsea/absolute.h>
+
 @ @c
 #define end_line_char int_par(end_line_char_code)
 
diff --git a/source/texk/web2c/luatexdir/tex/texmath.w b/source/texk/web2c/luatexdir/tex/texmath.w
index b678621946ee951bf640164598226e90a943cf7e..62b0710b0fbbaad15b14fa5e4c571c60e233a9ca 100644
--- a/source/texk/web2c/luatexdir/tex/texmath.w
+++ b/source/texk/web2c/luatexdir/tex/texmath.w
@@ -1,29 +1,29 @@
 % texmath.w
-
+%
 % Copyright 2008-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 #define mode          cur_list.mode_field
 #define head          cur_list.head_field
diff --git a/source/texk/web2c/luatexdir/tex/texnodes.w b/source/texk/web2c/luatexdir/tex/texnodes.w
index bc0854a8d06e21ce615e8ae5145a21ba0920ce0f..57706ed5abc96a3b4a93603e2d8c1a0346f09442 100644
--- a/source/texk/web2c/luatexdir/tex/texnodes.w
+++ b/source/texk/web2c/luatexdir/tex/texnodes.w
@@ -1,25 +1,25 @@
 % texnodes.w
-
+%
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 #include "ptexlib.h"
diff --git a/source/texk/web2c/luatexdir/tex/textcodes.w b/source/texk/web2c/luatexdir/tex/textcodes.w
index 05b9272be9f5c67715dd8da1862e9a240c861eb7..c2eb8f03cb4338f417bbf0830af6ee2ac76a7c98 100644
--- a/source/texk/web2c/luatexdir/tex/textcodes.w
+++ b/source/texk/web2c/luatexdir/tex/textcodes.w
@@ -1,29 +1,29 @@
 % textcodes.w
-% 
+%
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+
 @ @c
 #define LCCODESTACK  8
 #define LCCODEDEFAULT 0
diff --git a/source/texk/web2c/luatexdir/tex/textoken.w b/source/texk/web2c/luatexdir/tex/textoken.w
index 7e1d87da50088ebe41925cc544ce237c741c93ff..51c0a89bb0cb13d043994595e2bdd5ff00e808b9 100644
--- a/source/texk/web2c/luatexdir/tex/textoken.w
+++ b/source/texk/web2c/luatexdir/tex/textoken.w
@@ -1,19 +1,19 @@
 % textoken.w
-% 
+%
 % Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source/texk/web2c/luatexdir/utils/avlstuff.w b/source/texk/web2c/luatexdir/utils/avlstuff.w
index 7916c92aee0428f9e9a21d675e3c673ddf9ce119..dd2c0eca64334244e2fe50c415ef1ff072c8ac80 100644
--- a/source/texk/web2c/luatexdir/utils/avlstuff.w
+++ b/source/texk/web2c/luatexdir/utils/avlstuff.w
@@ -1,33 +1,33 @@
 % avlstuff.w
-
+%
 % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
 % Copyright 2006-2009 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
 % with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @* AVL helper functions.
 
 @ @c
-#include "ptexlib.h"
-#include "utils/avl.h"
-
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
+#include "ptexlib.h"
+#include "utils/avl.h"
+
 @ memory management functions for AVL
 @c
 static void *avl_xmalloc(struct libavl_allocator *allocator, size_t size)
diff --git a/source/texk/web2c/luatexdir/utils/managed-sa.w b/source/texk/web2c/luatexdir/utils/managed-sa.w
index 67aa8274291b55f6a4467754b7d7797056f4ffd3..e908197a4d8c0cf5185b5ce2f046ac03df0f0ccd 100644
--- a/source/texk/web2c/luatexdir/utils/managed-sa.w
+++ b/source/texk/web2c/luatexdir/utils/managed-sa.w
@@ -1,30 +1,30 @@
 % managed-sa.w
-% 
+%
 % Copyright 2006-2010 Taco Hoekwater <taco@@luatex.org>
-
+%
 % This file is part of LuaTeX.
-
+%
 % LuaTeX is free software; you can redistribute it and/or modify it under
 % the terms of the GNU General Public License as published by the Free
 % Software Foundation; either version 2 of the License, or (at your
 % option) any later version.
-
+%
 % LuaTeX is distributed in the hope that it will be useful, but WITHOUT
 % ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 % FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 % License for more details.
-
+%
 % You should have received a copy of the GNU General Public License along
-% with LuaTeX; if not, see <http://www.gnu.org/licenses/>. 
+% with LuaTeX; if not, see <http://www.gnu.org/licenses/>.
 
 @* Sparse arrays with an embedded save stack.
 
 @ @c
-#include "ptexlib.h"
-
 static const char _svn_version[] =
-    "$Id$ "
-"$URL$";
+    "$Id$"
+    "$URL$";
+
+#include "ptexlib.h"
 
 @ @c
 static void store_sa_stack(sa_tree a, int n, sa_tree_item v, int gl)
diff --git a/source/texk/web2c/luatexdir/utils/utils.w b/source/texk/web2c/luatexdir/utils/utils.w
index cefffbff8f690630324aa1c55086b94953e5e846..58eb12ba7d64cd76aab1d2c5439e8d5b9af5d3ed 100644
--- a/source/texk/web2c/luatexdir/utils/utils.w
+++ b/source/texk/web2c/luatexdir/utils/utils.w
@@ -20,7 +20,7 @@
 
 @ @c
 static const char _svn_version[] =
-    "$Id$ "
+    "$Id$"
     "$URL$";
 
 @ @c