Index: constants.txt
===================================================================
--- dam_ttcontent/pi_cssstyledcontent/static/constants.txt	(revision 35454)
+++ dam_ttcontent/pi_cssstyledcontent/static/constants.txt	(working copy)
@@ -1,5 +1,5 @@
 
 styles.content.imgtext {
-    # cat=content/cImage/c; type=boolean; label= Images, captions: If this is checked, then each image will get a caption from DAM meta data.
+    # cat=content/cImage/c; type=boolean; label= DAM Images, captions: If this is checked, then each image will get a caption from DAM meta data. If not checked, images will get caption from Caption field if set.
   captionEach = 1
 }
Index: setup.txt
===================================================================
--- dam_ttcontent/pi_cssstyledcontent/static/setup.txt	(revision 35454)
+++ dam_ttcontent/pi_cssstyledcontent/static/setup.txt	(working copy)
@@ -1,5 +1,3 @@
-
-
 # *****************
 # CType: image
 # *****************
@@ -28,15 +26,24 @@
 		1 = TEXT
 		1 {
 			field >
-			data = field : txdam_caption // field : txdam_description // field : imagecaption
-#			data = field : imagecaption // field : txdam_caption // field : txdam_description
+			data = field : txdam_caption // field : txdam_description
 			required = 1
 			parseFunc =< lib.parseFunc
-			br = 1
-			fontTag = <p class="csc-caption">|</p>
 			wrapAlign.field = imagecaption_position
 			split >
 		}
+		1.if.isTrue = {$styles.content.imgtext.captionEach}
+		
+		2 = TEXT
+		2 {
+			field = imagecaption
+			required = 1
+			parseFunc =< lib.parseFunc
+			wrapAlign.field = imagecaption_position
+			split.token.char = 10
+			split.token.if.isPositive = {$styles.content.imgtext.imageTextSplit} + {$styles.content.imgtext.captionSplit}
+			split.returnKey.data = register : IMAGE_NUM_CURRENT
+		}
+		2.if.isFalse = {$styles.content.imgtext.captionEach}
 	}
-}
-
+}
\ No newline at end of file