Bug 770660 - Code snippet always shows line numbers from 1

This patch makes the handling of the \snippet and other commands consistent between the different languages (no line numbers anymore with python) and also introduces analogous to \includelineno  the command \snippetlineno.

Some non relevant changes:
- *code.l Calculation of the end line was incorrect, in case of a snippet the end line was the number of lines of the snippet and not reltive to the start line.
- *code.l made consistent over the different laguages, enabling exBlock and inlineFragment
- testing/indexpage.xml in test 14 the \snippet command was used with python and giving line numbers, linenumbers are now gone (consistency)

1 files changed, 11 insertions, 8 deletions

diff --git a/src/xmlcode.l b/src/xmlcode.l
index fd36ebb..efcac0e 100644
--- a/src/xmlcode.l
+++ b/src/xmlcode.l
@@ -49,6 +49,7 @@ static int           g_yyLineNr;        //!< current line number
 static bool          g_needsTermination;
 static Definition   *g_searchCtx;
 
+static bool          g_exampleBlock;
 static QCString      g_exampleName;
 static QCString      g_exampleFile;
 
@@ -323,12 +324,12 @@ void parseXmlCode(
     CodeOutputInterface &od,
     const char * /*className*/,
     const QCString &s,
-    bool /*exBlock*/,
+    bool exBlock,
     const char *exName,
     FileDef *fd,
     int startLine,
     int endLine,
-    bool /*inlineFragment*/,
+    bool inlineFragment,
     MemberDef *,
     bool,Definition *searchCtx,
     bool /*collectXRefs*/
@@ -345,22 +346,23 @@ void parseXmlCode(
   g_needsTermination = FALSE;
   g_searchCtx=searchCtx;
   
-  if (endLine!=-1)
-    g_inputLines  = endLine+1;
-  else
-    g_inputLines  = countLines();
-  
   if (startLine!=-1)
     g_yyLineNr    = startLine;
   else
     g_yyLineNr    = 1;
   
+  if (endLine!=-1)
+    g_inputLines  = endLine+1;
+  else
+    g_inputLines  = g_yyLineNr + countLines() - 1;
+  
+  g_exampleBlock  = exBlock; 
   g_exampleName   = exName;
   g_sourceFileDef = fd;
 
   bool cleanupSourceDef = FALSE;
   
-  if (fd==0)
+  if (exBlock && fd==0)
   {
     // create a dummy filedef for the example
     g_sourceFileDef = new FileDef("",(exName?exName:"generated"));
@@ -372,6 +374,7 @@ void parseXmlCode(
     setCurrentDoc("l00001");
   }
 
+  g_includeCodeFragment = inlineFragment;
   // Starts line 1 on the output  
   startCodeLine();