[FIXED] Subtitle naming mix-up (closes robelix#3)

[FIXED] Some spelling mistakes
[FIXED] Minor fix for encoding conversion (closes robelix#2)

README

@@ -1,13 +1,14 @@
-sub2srt  - Convert subtitles from ".sub" to subviewer ".srt" format
+sub2srt  - Convert subtitles from ".sub" to SubRip ".srt" format
 
 
 (c) 2003-2005 Roland "Robelix" Obermayer <roland\@robelix.com>
 Project Homepage: http://www.robelix.com/sub2srt/
 
 
-sub2srt is a simple tool to convert 2 common subtitle formats (microdvd
-and subrip - both are known as ".sub") to subviewer ".srt" format.
+sub2srt is a simple tool to convert 2 common subtitle formats (MicroDVD
+and SubViewer - both are known as ".sub") to SubRip ".srt" format.
 This is the format ogmmerge accepts for multiplexing into ogm streams.
+This format is also used by mkvmerge for multiplexing into mkv streams.
 
 
 This is Beta Software!
@@ -20,14 +21,14 @@ Please report bugs, problems, patches... to [email protected]
 
 What it does not:
 -----------------
-It does not - and will never - convert DVD-subtitles or vobsub.
+It does not - and will never - convert DVD-subtitles or VobSub.
 Google on if you need this ;)
 
 
 Installation:
 -------------
 Not necessary ;) - it's just a single perl-script.
-But you may want to copy sub2srt to a directory that's in your $PATH - 
+But you may want to copy sub2srt to a directory that's in your $PATH -
 like /usr/local/bin or /usr/bin.
 
 
@@ -52,6 +53,8 @@ Changelog:
 01 Aug 2015: PhobosK
  * sub2srt-0.5.6
  - Fixed character encoding conversion using Encode instead of piconv
+ - Fixed subtitle naming mix-up
+ - Fixed some spelling mistakes
 
 10 Dec 2014: Toni Ahola
  * sub2srt-0.5.5
@@ -60,7 +63,7 @@ Changelog:
 02 Nov 2013: Krzysztof Trybowski
  * sub2srt-0.5.4
  - Added support for 2 input formats "mpl2" and "tmp"
- 
+
 15 Jan 2005: Roland Obermayer <[email protected]>
  * sub2srt-0.5.3
  - Added support for a third input format "txtsub"
@@ -78,7 +81,7 @@ Changelog:
 
 31 Aug 2003: Roland Obermayer <[email protected]>
  * sub2srt-0.5.1
- - Bugfix in the microdvd conversion routine
+ - Bugfix in the MicroDVD conversion routine
 
 26 Aug 2003: Roland Obermayer <[email protected]>
  * sub2srt-0.5

sub2srt

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-#     sub2srt  - Convert subtitles from microdvd or subrip ".sub" to subviewer ".srt" format
+#    sub2srt  - Convert subtitles from MicroDVD or SubViewer ".sub" to SubRip ".srt" format
 #    (c) 2003-2005 Roland "Robelix" Obermayer <[email protected]>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -69,7 +69,7 @@ my $infile = shift || '';
 if (!$infile) { help(); }
 
 my $outfile = shift || '';
-if (!$outfile) { 
+if (!$outfile) {
 	$outfile = $infile;
 	$outfile =~ s/(\.sub|\.txt)$//i;
 	$outfile .= ".srt";
@@ -110,8 +110,8 @@ print "Converting from $format to srt\n" if ($format ne "srt" && !$quiet);
 open INFILE, "$infile" or die "Unable to open $infile for reading\n";
 open OUTFILE, ">$outfile" or die "Unable to open $outfile for writing\n";
 
-if ($format eq "subrip") {
-	conv_subrip();
+if ($format eq "subviewer") {
+	conv_subviewer();
 }
 elsif ($format eq "microdvd") {
 	conv_microdvd();
@@ -126,7 +126,7 @@ elsif ($format eq "tmp") {
 	conv_tmp();
 }
 elsif ($format eq "srt") {
-	print "Input file is already subviewer srt format.\n";
+	print "Input file is already SubRip srt format.\n";
 }
 
 
@@ -161,11 +161,11 @@ if($convert) {
 
     mv($tmpfile, $outfile);
 
-    print "Encoding convertion from \"$fenc\" to \"$tenc\" done.\n"  if (!$quiet);
+    print "Encoding conversion from \"$fenc\" to \"$tenc\" done.\n"  if (!$quiet);
 }
 
 
-sub conv_subrip {
+sub conv_subviewer {
 	my $converted = 0;
 	my $failed = 0;
 	while (my $line1 = <INFILE>) {
@@ -374,7 +374,7 @@ sub write_srt {
 
 sub frames_2_time {
 	# convert frames to time
-	# used for microdvd format
+	# used for MicroDVD format
 	my $frames = shift;
 	my $seconds = $frames / $fps;
 	my $ms = ($seconds - int($seconds)) * 1000;
@@ -421,17 +421,17 @@ sub detect_format {
 		$line =~ s/[\n\r]*$//;
 		print "  Trying line $i: $line \n" if $debug;
 
-		# microdvd format
+		# MicroDVD format
 		# looks like:
 		# {startframe}{endframe}Text
 
 		if ( $line =~ m/^\{\d+\}\{\d+\}.+$/ ) {
-			print "  seems to be microdvd format\n" if ($debug);
+			print "  seems to be MicroDVD format\n" if ($debug);
 			my $line2 = <INFILE>;
 			$line2 =~ s/[\n\r]*$//;
 			print "  checking next line: $line2\n" if ($debug);
 			if ($line2 =~ m/^\{\d+\}\{\d+\}.+$/) {
-				print "microdvd format detected!\n" if ($debug);
+				print "MicroDVD format detected!\n" if ($debug);
 				$detected = "microdvd";
 			}
 		}
@@ -468,14 +468,14 @@ sub detect_format {
 			}
 		}
 
-		# trying subrip format
+		# trying SubViewer format
 		# 3 lines:
 		# hh:mm:ss.ms,hh:mm:ss.ms
 		# text
 		# (empty line)
 
 		if ($line =~ m/^\d\d:\d\d:\d\d\.\d\d,\d\d:\d\d:\d\d\.\d\d$/) {
-			print "  seems to be subrip format\n" if ($debug);
+			print "  seems to be SubViewer format\n" if ($debug);
 			my $line2 = <INFILE>;
 			$line2 =~ s/[\n\r]*$//;
 			my $line3 = <INFILE>;
@@ -484,15 +484,15 @@ sub detect_format {
 			$line4 =~ s/[\n\r]*$//;
 			print "  checking the next lines:\n    $line2\n    $line3\n    $line4\n" if ($debug);
 			if ($line2 =~ m/^.+$/ && $line3 =~ m/^$/ && $line4 =~ m/^\d\d:\d\d:\d\d\.\d\d,\d\d:\d\d:\d\d\.\d\d$/) {
-				print "subrip format detected!\n" if ($debug);
-				$detected = "subrip";
+				print "SubViewer format detected!\n" if ($debug);
+				$detected = "subviewer";
 			}
 		}
 
-		# trying subviewer .srt format
+		# trying SubRip .srt format
 
 		if ($line =~ m/^\d\d:\d\d:\d\d\,\d\d\d\s-->\s\d\d:\d\d:\d\d\,\d\d\d$/) {
-			print "subviewer .srt format detected!\n" if ($debug);
+			print "SubRip .srt format detected!\n" if ($debug);
 			$detected = "srt";
 		}
 
@@ -503,7 +503,7 @@ sub detect_format {
 		# subtitle-text
 		# [endtime]
 		# (the endtime can be the starttime of the next sub)
-		# I've seen two variants with slightly diffrent time-formats
+		# I've seen two variants with slightly different time-formats
 		# a) [00:02:05.000]
 		# b) [00:02:05]
 		# Both are supported
@@ -533,7 +533,7 @@ print <<__HELP__;
 
 sub2srt [options] inputfile.sub [outputfile.srt]
 
-    Convert subrip and microdvd ".sub" subtitle files to subviewer ".srt" format
+    Convert SubViewer and MicroDVD ".sub" subtitle files to SubRip ".srt" format
     (the format accepted by ogmmerge for multiplexing into ogm files)
 
 
@@ -542,7 +542,7 @@ Options:
     -v --version	Display Program version.
     -l --license	Display License information.
 
-    -f=n --fps=n	Fps to be used if input file is frame-based microdvd-format
+    -f=n --fps=n	Fps to be used if input file is frame-based MicroDVD-format
 			Default: 25 fps. Ignored if input format is time-based.
 
     -n  --ntsc		Sets the framerate to 29.97 fps. Overrides --fps.
@@ -554,7 +554,7 @@ Options:
     -c --convert	To convert character encoding.
 
     --fenc=s		From encoding. Overrides ISO-8859-1
-    --tenc=s		To enconding. Overrides UTF-8
+    --tenc=s		To encoding. Overrides UTF-8
 
     --force		Overwrite existing files without prompt
 
@@ -564,7 +564,7 @@ Options:
 
 inputfile.sub
     Input file
-    Both types usally have the ending .sub, the format is autodetected.
+    Both types usually have the ending .sub, the format is auto-detected.
 
 
 [outputfile.srt]