one line /* */ type handling changed

[m17n/m17n-docs.git] / utils / usr_filter.rb

diff --git a/utils/usr_filter.rb b/utils/usr_filter.rb
index b09f7fb..2bb63b0 100755 (executable)
--- a/utils/usr_filter.rb
+++ b/utils/usr_filter.rb
@@ -13,6 +13,8 @@ def commentblock(buf)
 
 while gets
 
+#  print "****",  $_, "\n"
+
   gsub!("@seealso", "@par See Also:")
   gsub!("@errors", "@par Errors:")
   gsub!("@returns", "@par Return value:")
@@ -23,7 +25,7 @@ while gets
   gsub!(/\$[A-Z_]+/) {|m| m.delete!("$").reverse.downcase!.concat(" b@").reverse}
 
    case  $_
-     when /^$/
+     when /^\s*$/
        if doxy == 1 
            buf.push($_)
           end
@@ -31,16 +33,22 @@ while gets
        commentblock(buf)
        buf = []
    
-     when /\/\*\s.*\*\//       # /* comment */ type comment
+     when /^\/\*\s.*\*\//      # /* comment */ type comment
        if doxy == 1            
        buf.push($_.gsub!(/\*\//, " ").gsub!(/\/\*/, "//")) # should be included only in the example code
+       end
+
+     when /\/\*\s.*\*\//       # code + /* comment */ type comment
+       if doxy == 1            
+       buf.push($_.gsub!(/\*\//, " ").gsub!(/\/\*/, "//")) # should be included in the example code
        else
-          if doxy == 0 
+         if doxy == 0 
          commentblock(buf)
          buf = []
          print $_.gsub!(/\/\*\s.*\*\//," ")                # should be omiited in code
          end
        end
+
      when /\/\*{2,3}ja.*\*\//  #japanese one liner
      when /\/\*\*en.*\*\//     #one liner
      when /\/\*\*\*en.*\*\//   #one liner
@@ -49,7 +57,7 @@ while gets
      when /\/\*\*\*\s.*\*\//   #one liner
         buf.push($_.gsub!(/\/\*+/, " ").gsub!(/\*\//, " ")).push("\n")
 
-     when /\/\*{1,2}\s|\/\*{2,3}ja|\/\*\*en/
+     when /\/\*{1,2}\s|\/\*{2,3}ja|\/\*\*en/  #this is not for En nor users
        doxy = -1
      when /\/\*\*\*en/
         buf.push($_.gsub!(/\/\*+en/, " "))
@@ -59,7 +67,7 @@ while gets
        doxy = 1
 
      when /EXAMPLE_CODE/ 
-        buf.push($_.gsub!(/#if EXAMPLE_CODE/, "@code \n"))
+        buf.push($_.gsub!(/#if EXAMPLE_CODE/, "\n \n @par Example:\n @code"))
        doxy = 1
 
      when /#endif/
@@ -88,3 +96,5 @@ while gets
         end
    end
 end
+
+commentblock(buf)