X-Git-Url: http://git.chise.org/gitweb/?p=m17n%2Fm17n-docs.git;a=blobdiff_plain;f=utils%2Fja_filter.rb;h=e2f7ac1b62eedbb0c550eeb4cb482ea683b6b095;hp=eb146df88cf06c7ada4e5c453e5db8cea94464fd;hb=eec81e9290cc6e143f551aaf60d352a89a3c7f18;hpb=498e1235ee98882fc70c54cde00840ea22117d13

diff --git a/utils/ja_filter.rb b/utils/ja_filter.rb
index eb146df..e2f7ac1 100755
--- a/utils/ja_filter.rb
+++ b/utils/ja_filter.rb
@@ -2,6 +2,7 @@
 
 buf = [] 
 doxy = 0
+example = 0
 
 def commentblock(buf)
     unless buf == []	
@@ -18,57 +19,75 @@ while gets
   gsub!("@returns", "@par Ìá¤êÃÍ:")
   gsub!("@return", "@par Ìá¤êÃÍ:")
  #let doxygen find functions
-  gsub!(/[a-z_]\s\(\)/) {|m| m.delete!(" ")}
+  gsub!(/[a-zA-Z_]\s\(\)/) {|m| m.delete!(" ")}
  #make variables in function descriptions shown in bold
-  gsub!(/\$[A-Z_]+/) {|m| m.delete!("$").reverse.downcase!.concat(" e@").reverse}
+  gsub!(/\$[A-Z_]+/) {|m| m.delete!("$").reverse.downcase!.concat(" b@").reverse}
+
+  if example == 1
+     case $_ 
+      when /#endif/
+        buf.push($_.gsub!(/#endif/, "@endcode"))
+	example = 0
+      else	
+        buf.push($_)
+    end
+
+    else  # when example == 0
 
    case  $_
-     when /^$/
-	if doxy == 1 
+     when /^\s*$/
+	if doxy == 1	                    # empty line in doxygen comment
            buf.push($_)
 	   end
-     when /\/\/\/\// 
+     when /\/\*=\*\//                         #/*=*/ (flush)
     	commentblock(buf)
     	buf = []
    
-     when /\/\*\s.*\*\//	# /* comment */ type comment
-	if doxy == 1		
-	buf.push($_.gsub!(/\*\//, " ").gsub!(/\/\*/, "//")) # should be included only in the example code
-	else
+      when /^\/\*\s.*\*\//	# /* comment */ type comment 
+#	if doxy == 1		
+#	  # should be included only in the example code
+#	  ## We used to do the following substituion as a workaround of
+#	  ## a Doxygen bug.
+# 	  ## buf.push($_.gsub!(/\*\//, " ").gsub!(/\/\*/, "//"))
+#	  buf.push($_)
+#	end
+
+      when /\/\*\s.*\*\//	# code + /* comment */ type comment
+#	if doxy == 1		
+#	  # should be included in the example code
+#	  ## See the above comment.
+#	  ## buf.push($_.gsub!(/\*\//, " ").gsub!(/\/\*/, "//"))
+#	  buf.push($_) # should be included in the example code
+#	else
           if doxy == 0 
-    	  commentblock(buf)
-    	  buf = []
-	  print $_.gsub!(/\/\*\s.*\*\//," ")	            # should be omiited in code
-	  end
+	    commentblock(buf)
+ 	    buf = []
+ 	    print $_.gsub!(/\/\*\s.*\*\//," ") # should be omiited in code
+#	  end
 	end
+
      when /\/\*{2,3}en.*\*\//	#english one liner is omitted
-     when /\/\*{2,3}ja.*\*\//	#one liner
-        buf.push($_.gsub!(/\/\*+ja/, " ").gsub!(/\*\//, " "))
-     when /\/\*{2,3}.*\*\//	#one liner
-        buf.push($_.gsub!(/\/\*+/, " ").gsub!(/\*\//, " "))
+     when /\/\*\*ja.*\*\//	#one liner
+     when /\/\*\*\*ja.*\*\//	#one liner
+        buf.push($_.gsub!(/\/\*+ja/, " ").gsub!(/\*\//, " ")).push("\n")
+     when /\/\*\*\s.*\*\//	#one liner
+     when /\/\*\*\*\s.*\*\//	#one liner
+        buf.push($_.gsub!(/\/\*+/, " ").gsub!(/\*\//, " ")).push("\n")
 
-     when /\/\*\s|\/\*{2,3}en/
+     when /\/\*{1,2}\s|\/\*{2,3}en|\/\*\*ja/  #this is not for Ja nor users
 	doxy = -1
-     when /\/\*{2,3}ja/
+     when /\/\*\*\*ja/
         buf.push($_.gsub!(/\/\*+ja/, " "))
 	doxy = 1
-     when /\/\*{2,3}/	
+     when /\/\*\*\*/	
         buf.push($_.gsub!(/\/\*+/, " "))
 	doxy = 1
 
      when /EXAMPLE_CODE/ 
-        buf.push($_.gsub!(/#if EXAMPLE_CODE/, "@par Î㡧 \n @code \n"))
-	doxy = 1
+	#start example code lines
+        buf.push($_.gsub!(/#if EXAMPLE_CODE/, "\n \n @par Î㡧 \n @code"))
+	example = 1
 
-     when /#endif/
-	if doxy == 1
-           buf.push($_.gsub!(/#endif/, "@endcode"))
-	else
-           commentblock(buf)
-    	   buf = []
-	   print $_
-	end
-        doxy = 0
      when /\*\//
 	if doxy == 1
            buf.push($_.gsub!(/\*\//, " "))
@@ -84,5 +103,12 @@ while gets
     	   buf = []
 	   print($_)
         end
+    end
    end
 end
+
+commentblock(buf)
+
+# Local Variables:
+# coding: euc-jp
+# End: