Index: scripts/coder_format/coder_format.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/coder_format.inc,v
retrieving revision 1.2.4.8
diff -u -r1.2.4.8 coder_format.inc
--- scripts/coder_format/coder_format.inc	21 Jan 2008 03:40:33 -0000	1.2.4.8
+++ scripts/coder_format/coder_format.inc	21 Jan 2008 04:03:00 -0000
@@ -262,6 +262,7 @@
   $after_initial_comment      = FALSE;
   $after_visibility_modifier  = FALSE;
   $after_return_in_case       = FALSE;
+  $after_php                  = FALSE;
 
   // Whether or not a function token was encountered:
   $in_function_declaration = FALSE;
@@ -342,7 +343,7 @@
             --$_coder_indent;
             $after_return_in_case = FALSE;
           }
-          if (!$parenthesis && !$in_heredoc) {
+          if (!$parenthesis && !$in_heredoc && !$after_php) {
             coder_br($result);
             $after_semicolon = TRUE;
           }
@@ -531,6 +532,7 @@
         case T_OPEN_TAG:
         case T_OPEN_TAG_WITH_ECHO:
           $in_php = true;
+          $after_php = true;
           // Add a line break between two PHP tags.
           if (substr(rtrim($result), -2) == '?>') {
             coder_br($result);
@@ -610,6 +612,7 @@
           if ($cc) {
             $after_semicolon = FALSE;
             $after_case = FALSE;
+            $after_php = FALSE;
           }
           
           $in_variable = FALSE;
Index: scripts/coder_format/tests/tests/tags.phpt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/tests/tests/Attic/tags.phpt,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 tags.phpt
--- scripts/coder_format/tests/tests/tags.phpt	21 Jan 2008 03:40:33 -0000	1.1.2.2
+++ scripts/coder_format/tests/tests/tags.phpt	21 Jan 2008 04:04:55 -0000
@@ -15,3 +15,10 @@
   return $baz;
 }
 
+--INPUT--
+<?php
+// $Id$
+
+?>
+<a href="<?php print $link; ?>"><?php print $title; ?></a>
+
Index: scripts/coder_format/tests/tests/variables.phpt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/coder/scripts/coder_format/tests/tests/Attic/variables.phpt,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 variables.phpt
--- scripts/coder_format/tests/tests/variables.phpt	21 Jan 2008 01:37:41 -0000	1.1.2.3
+++ scripts/coder_format/tests/tests/variables.phpt	21 Jan 2008 03:54:13 -0000
@@ -14,7 +14,7 @@
 class CoderTestFile extends SimpleExpectation {
   private $expected;
 
-  /* Filename of test */
+  /** Filename of test */
   var $filename;
 
   // Filename of test