[SabreTools, Filter] Update list and string flags

SabreTools.Library/README.1ST

@@ -196,7 +196,7 @@ Options:
 			Normally, the DAT will be created with the date in the file name.
 			This flag removes that but keeps the date tag intact.
 			
-		-fp=, --forcepack=	Set force packing
+		-fp=, --forcepacking=	Set force packing
 			Set the forcepacking flag to one of the supported values:
 				None, Zip, Unzip
 			
@@ -282,11 +282,11 @@ Options:
 			Set the internal name for the output DAT(s) [default is folder name
 			plus date]
 			
-		-de=, --desc=		Set the description of the DAT
+		-de=, --description=	Set the description of the DAT
 			Set the description for the output DAT(s) [default is the folder
 			name]
 			
-		-c=, --cat=		Set the category of the DAT
+		-c=, --category=	Set the category of the DAT
 			Set the category for the output DAT(s) [default is blank]
 			
 		-v=, --version=		Set the version of the DAT
@@ -355,11 +355,11 @@ Options:
 			temp directory (inside the running folder) is not preferred. This is
 			used for any operations that require an archive to be extracted.
 			
-		-out=			Set the name of the output directory
+		-out=, --output-dir=	Set the name of the output directory
 			This sets an output folder to be used when the files are created. If
 			a path is not defined, the application directory is used instead.
 		
-		-mt={4}			Amount of threads to use
+		-mt=, --threads=	Amount of threads to use
 			Optionally, set the number of threads to use for the multithreaded
 			operations. The default is 4 threads; -1 means unlimited threads
 			created. If the user specifies that only 1 thread is to be used, it
@@ -382,7 +382,7 @@ Options:
 			- Nintendo Super Famicom / Super Nintendo Entertainment System
 			- Nintendo Super Famicom / Super Nintendo Entertainment System SPC 
 			
-		-out=			Set the name of the output directory
+		-out=, --output-dir=	Set the name of the output directory
 			This sets an output folder to be used when the files are created. If
 			a path is not defined, the application directory is used instead.
 		
@@ -407,7 +407,7 @@ Options:
 			- Nintendo Super Famicom / Super Nintendo Entertainment System
 			- Nintendo Super Famicom / Super Nintendo Entertainment System SPC
 			
-		-out=			Set the name of the output directory
+		-out=, --output-dir=	Set the name of the output directory
 			This sets an output folder to be used when the files are created. If
 			a path is not defined, the application directory is used instead.
 			
@@ -474,7 +474,7 @@ Options:
 		-ox, -output-xml	Output in Logiqx XML format
 			Add outputting the created DAT to Logiqx XML format
 		
-		-out=			Set the name of the output directory
+		-out=, --output-dir=	Set the name of the output directory
 			This sets an output folder to be used when the files are created. If
 			a path is not defined, the application directory is used instead.
 			
@@ -545,7 +545,7 @@ Options:
 			The user-supplied DAT used to check which files need to be rebuilt.
 			Multiple occurrences of this flag are allowed.
 		
-		-out=				Set the name of the output directory
+		-out=, --output-dir=	Set the name of the output directory
 			This sets an output folder to be used when the files are created. If
 			a path is not defined, the application directory is used instead.
 			
@@ -710,7 +710,7 @@ Options:
 			parent sets based on the cloneof and romof tags as well as device
 			references. This is incompatible with the other --dat-X flags.
 				
-		-mt={4}			Amount of threads to use
+		-mt=, --threads=	Amount of threads to use
 			Optionally, set the number of threads to use for the multithreaded
 			operations. The default is 4 threads; -1 means unlimited threads
 			created. If the user specifies that only 1 thread is to be used, it
@@ -746,7 +746,7 @@ Options:
 		-f=, --filename=	Set the filename for the output
 			Set the filename (without extension) for the outputted report
 			
-		-out=			Set the name of the output directory
+		-out=, --output-dir=	Set the name of the output directory
 			This sets an output folder to be used when the files are created. If
 			a path is not defined, the application directory is used instead.
 			
@@ -846,10 +846,10 @@ Options:
 			-q, --quotes			Put double-quotes around each item
 				This quotes only the item and not the prefix and postfix
 			
-			-ae=, --add-ext=		Add an extension to each item
+			-ae=, --add-extension=		Add an extension to each item
 				To each item, a postfixed extension is added
 			
-			-re=, --rep-ext=		Replace all extensions with specified
+			-re=, --replace-extension=	Replace all extensions with specified
 				When an extension exists, replace it with the provided instead
 				
 			-rme, --remove-extensions	Remove all extensions from all items
@@ -946,13 +946,13 @@ Options:
 		-n=, --name=		Set the internal name of the DAT
 			Set the internal name for the output DAT(s)
 			
-		-de=, --desc=		Set the description of the DAT
+		-de=, --description=	Set the description of the DAT
 			Set the description for the output DAT(s)
 		
 		-r=, --root=		Set a new rootdir
 			Set the rootdir (as used by SuperDAT mode) for the output DAT(s)
 			
-		-c=, --cat=		Set the category of the DAT
+		-c=, --category=	Set the category of the DAT
 			Set the category for the output DAT(s)
 			
 		-v=, --version=		Set the version of the DAT
@@ -982,15 +982,15 @@ Options:
 		-sd, --superdat		Enable SuperDAT creation
 			Set the type flag to "SuperDAT" for the output DAT
 
-		-fm=, --forcemerge=	Set force merging
-			Set the forcemerge tag to one of the supported values:
-				None, Split, Full
+		-fm=, --forcemerging=	Set force merging
+			Set the forcemerging tag to one of the supported values:
+				None, Split, Merged, Nonmerged, Full
 				
-		-fn=, --forcend=	Set force nodump
+		-fn=, --forcenodump=	Set force nodump
 			Set the forcenodump tag to one of the supported values:
 				None, Obsolete, Required, Ignore
 				
-		-fp=, --forcepack=	Set force packing
+		-fp=, --forcepacking=	Set force packing
 			Set the forcepacking flag to one of the supported values:
 				None, Zip, Unzip
 		
@@ -1179,10 +1179,10 @@ Options:
 				This flag enables updating of machine manufacturers from base
 				DATs
 		
-		-gn=, --not-game=	Filter by game name
-		-ngn=, --game-name=	Exclude by game name
-		-rn=, --rom-name=	Filter by rom name
-		-nrn=, --not-rom=	Exclude by rom name
+		-gn=, --game-name=	Filter by game name
+		-ngn=, --not-game-name=	Exclude by game name
+		-rn=, --item-name=	Filter by item name
+		-nrn=, --not-item-name=	Exclude by item name
 		-crc=, --crc=		Filter by CRC hash
 		-ncrc=, --not-crc=	Exclude by CRC hash
 		-md5=, --md5=		Filter by MD5 hash
@@ -1205,11 +1205,11 @@ Options:
 			well. This can allow for more advanced set-building, especially in
 			arcade-based sets.
 		
-		-rt=, --rom-type=	Filter by rom type
+		-rt=, --item-type=	Filter by item type
 			This allows users to only include roms or disks to their liking.
 			Multiples of this input are allowed.
 		
-		-nrt=, --not-type=	Exclude by rom type
+		-nrt=, --not-item-type=	Exclude by item type
 			This allows users to only exclude roms or disks to their liking.
 			Multiples of this input are allowed.
 		
@@ -1235,7 +1235,7 @@ Options:
 				None, Bios, Device, Mechanical
 			Multiples of this input are allowed.
 		
-		-ngt=, --not-gtype=	Exclude only items with a given game type
+		-ngt=, --not-game-type=	Exclude only items with a given game type
 			Exclude items with one of the supported values:
 				None, Bios, Device, Mechanical
 			Multiples of this input are allowed.
@@ -1246,7 +1246,7 @@ Options:
 		-nrun, --not-runnable	Include only items that are not marked runnable
 			This allows users to include only unrunnable games
 		
-		-out=			Set the name of the output directory
+		-out=, --output-dir=	Set the name of the output directory
 			This sets an output folder to be used when the files are created. If
 			a path is not defined, the application directory is used instead.
 			
@@ -1257,7 +1257,7 @@ Options:
 			to how file are expected to be written. This flag is only valid for
 			Update and Cascade operations.
 			
-		-mt={4}			Amount of threads to use
+		-mt=, --threads=	Amount of threads to use
 			Optionally, set the number of threads to use for the multithreaded
 			operations. The default is 4 threads; -1 means unlimited threads
 			created. If the user specifies that only 1 thread is to be used, it
@@ -1339,7 +1339,8 @@ users of SabreTools. Thanks to Kludge for most of these suggestions!
 	Convert a DAT file to XML and put it in a new folder
 
 	Long form:
-		SabreTools.exe --update --output-xml --out=OutDir Path\To\DatFile.dat
+		SabreTools.exe --update --output-xml --output-dir==OutDir
+		Path\To\DatFile.dat
 
 	Short form:
 		SabreTools.exe -ud -ox -out=OutDir DatFile.dat Path\To\DatFile.dat
@@ -1368,7 +1369,8 @@ users of SabreTools. Thanks to Kludge for most of these suggestions!
 	and outputting in TorrentZip format
 
 	Long form:
-		SabreTools.exe --sort --dat=Fix.dat --tzip --out=FixDir InDir1 InDir2
+		SabreTools.exe --sort --dat=Fix.dat --tzip --output-dir==FixDir InDir1
+		InDir2
 
 	Short form:
 		SabreTools.exe -ss -dat=Fix.dat -tzip -out=FixDir InDir2 InDir2
@@ -1414,41 +1416,56 @@ more details.
 This section contains remappings from old flag names to new ones for the purposes of testing
 
 -ab, --add-blank -> -ab, --add-blank-files
--bc, --baddump-col -> -bc, --baddump-column
+-ae, --add-ext -> -ae, --add-extension
 -b, --bare -> -b, --no-automatic-date
--dnd, --dat-devnonmerged -> -dnd, --dat-device-non-merged
--df, --dat-fullnonmerged -> -df, --dat-full-non-merged
--dnm, --dat-nonmerged -> -dnm, --dat-non-merged
+-bc, --baddump-col -> -bc, --baddump-column
+-c, --cat -> -c, --category
 -dan, --desc-name -> -dan, --description-as-name
+-de, --desc -> -de, --description
+-df, --dat-fullnonmerged -> -df, --dat-full-non-merged
+-dnd, --dat-devnonmerged -> -dnd, --dat-device-non-merged
+-dnm, --dat-nonmerged -> -dnm, --dat-non-merged
 -es, --ext -> -es, --extension
 -f, --files -> -f, --archives-as-files
+-fm, --forcemerge -> -fm, --forcemerging
+-fn, --forcend -> -fn, --forcenodump
+-fp, --forcepack -> -fp, --forcepacking
 -ic, --ignore-chd -> -ic, --chds-as-files
+-mt, --mt -> -mt, --threads
 -nc, --nodump-col -> -nc, --nodump-column
+-ngn, --not-game -> -ngn, --not-game-name
+-ngt, --not-gtype -> -ngt, --not-game-type
+-nrn, --not-rom -> -nrn, --not-rom-name
 -nm, --noMD5 -> -nm, --skip-md5
+-nrt, --not-type -> -nrt, --not-item-type
+-nrun, --not-run -> -nrun, --not-runnable
 -ns, --noSHA1 -> -ns, --skip-sha1
 -ns256, --noSHA256 -> -ns256, --skip-sha256
 -ns384, --noSHA384 -> -nm, --skip-sha384
 -ns512, --noSHA512 -> -nm, --skip-sha512
--nrun, --not-run -> -nrun, --not-runnable
--ofg, --of-as-game -> -ofg, --match-of-tags
 -oam, --output-am -> -oam, --output-attractmode
 -od, --output-dc -> -od, --output-doscenter
+-ofg, --of-as-game -> -ofg, --match-of-tags
 -olr, --output-lr -> -olr, --output-listrom
 -ool, --output-ol -> -ol, --output-offlinelist
 -or, --output-rc -> -or, --output-romcenter
 -os, --output-sd -> -os, --output-sabredat
 -osl, --output-sl -> -osl, --output-softwarelist
--rme, --rem-ext -> -rme, --remove-extensions
+-out, --out -> -out, --output-dir
+-rc, --rev-cascade -> -rc, --reverse-cascade
+-rep, --rep-ext -> -rep, --replace-extension
 -rmd5, --rem-md5 -> -rmd5, --remove-md5
+-rme, --rem-ext -> -rme, --remove-extensions
+-rn, --rom-name -> -rn, --item-name
 -rsha1, --rem-sha1 -> -rsha1, --remove-sha1
 -rsha256, --rem-sha256 -> -rsha256, --remove-sha256
 -rsha384, --rem-sha384 -> -rsha384, --remove-sha384
 -rsha512, --rem-sha512 -> -rsha512, --remove-sha512
+-rt, --rom-type -> -rt, --item-type
 -ru, --rem-uni -> -ru, --remove-unicode
--rc, --rev-cascade -> -rc, --reverse-cascade
+-sf, --skip -> -sf, --skip-first-output
 -si, --single -> -ind, --individual [For stat output case]
 -si, --single -> -si, --single-set [For '!' case]
--sf, --skip -> -sf, --skip-first-output
 -ska, --skiparc -> -ska, --skip-archives
 -skf, --skipfile -> -skf, --skip-files
 -t7z, --t7z -> -t7z, --torrent-7zip