From: Angus Leeming <leeming@lyx.org>
Date: Wed, 13 Jun 2001 14:33:31 +0000 (+0000)
Subject: Added // -*- C++ -*- to the top of all files in controllers/ and xforms/
X-Git-Tag: 1.6.10~21185
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0c2a3e5960f032dcd8be726e3e63628207a06dd3;p=lyx.git

Added // -*- C++ -*- to the top of all files in controllers/ and xforms/


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2118 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 9a6f3fdb5f..f5d45f1df4 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,6 +1,6 @@
 2001-06-13  Angus Leeming  <a.leeming@ic.ac.uk>
 
-	* ControlDialogs.h added // -*- C++ -*-
+	* *.[Ch]: added // -*- C++ -*-
 
 	* ControlCharacter.[Ch]: added // -*- C++ -*-
 	(setParams): Check contents of font_ to activate Apply button.
diff --git a/src/frontends/controllers/ControlBibitem.C b/src/frontends/controllers/ControlBibitem.C
index c1023622de..13c88d0a97 100644
--- a/src/frontends/controllers/ControlBibitem.C
+++ b/src/frontends/controllers/ControlBibitem.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlBibitem.h b/src/frontends/controllers/ControlBibitem.h
index 2d64b7da2e..0b0d94b6c1 100644
--- a/src/frontends/controllers/ControlBibitem.h
+++ b/src/frontends/controllers/ControlBibitem.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlButtons.h b/src/frontends/controllers/ControlButtons.h
index 2918724acb..c252bcd7e9 100644
--- a/src/frontends/controllers/ControlButtons.h
+++ b/src/frontends/controllers/ControlButtons.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlCitation.C b/src/frontends/controllers/ControlCitation.C
index c601db9afb..bbfe6e7d31 100644
--- a/src/frontends/controllers/ControlCitation.C
+++ b/src/frontends/controllers/ControlCitation.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlCitation.h b/src/frontends/controllers/ControlCitation.h
index a42cb6b057..04be484e6f 100644
--- a/src/frontends/controllers/ControlCitation.h
+++ b/src/frontends/controllers/ControlCitation.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C
index 6689bbf644..a3de4b7406 100644
--- a/src/frontends/controllers/ControlCommand.C
+++ b/src/frontends/controllers/ControlCommand.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlCommand.h b/src/frontends/controllers/ControlCommand.h
index cd7ea20783..709c73fbb1 100644
--- a/src/frontends/controllers/ControlCommand.h
+++ b/src/frontends/controllers/ControlCommand.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlConnections.h b/src/frontends/controllers/ControlConnections.h
index ad0ebb08c7..ca27eeed33 100644
--- a/src/frontends/controllers/ControlConnections.h
+++ b/src/frontends/controllers/ControlConnections.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlCopyright.C b/src/frontends/controllers/ControlCopyright.C
index ac51fdf3a7..a04105d976 100644
--- a/src/frontends/controllers/ControlCopyright.C
+++ b/src/frontends/controllers/ControlCopyright.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file ControlCopyright.C
  * Copyright 2000-2001 The LyX Team.
diff --git a/src/frontends/controllers/ControlCopyright.h b/src/frontends/controllers/ControlCopyright.h
index 77ae67abaa..886e37773c 100644
--- a/src/frontends/controllers/ControlCopyright.h
+++ b/src/frontends/controllers/ControlCopyright.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file ControlCopyright.C
  * Copyright 2000-2001 The LyX Team.
diff --git a/src/frontends/controllers/ControlCredits.C b/src/frontends/controllers/ControlCredits.C
index 2d7c3849fb..1848e13f15 100644
--- a/src/frontends/controllers/ControlCredits.C
+++ b/src/frontends/controllers/ControlCredits.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file ControlCredits.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/controllers/ControlCredits.h b/src/frontends/controllers/ControlCredits.h
index cdb08d2f68..5cbeda72b9 100644
--- a/src/frontends/controllers/ControlCredits.h
+++ b/src/frontends/controllers/ControlCredits.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file ControlCredits.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/controllers/ControlError.C b/src/frontends/controllers/ControlError.C
index 8333253d39..c93213327b 100644
--- a/src/frontends/controllers/ControlError.C
+++ b/src/frontends/controllers/ControlError.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlError.h b/src/frontends/controllers/ControlError.h
index dae63426c1..c4505a1f9b 100644
--- a/src/frontends/controllers/ControlError.h
+++ b/src/frontends/controllers/ControlError.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file ControlError.h
  * This file is part of
diff --git a/src/frontends/controllers/ControlExternal.C b/src/frontends/controllers/ControlExternal.C
index 0edb6f83a2..5387a01279 100644
--- a/src/frontends/controllers/ControlExternal.C
+++ b/src/frontends/controllers/ControlExternal.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlExternal.h b/src/frontends/controllers/ControlExternal.h
index cb486061e6..d40228960c 100644
--- a/src/frontends/controllers/ControlExternal.h
+++ b/src/frontends/controllers/ControlExternal.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index 167d2ad140..1da149a242 100644
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlGraphics.h b/src/frontends/controllers/ControlGraphics.h
index a81aeedfbf..ba40f44bb1 100644
--- a/src/frontends/controllers/ControlGraphics.h
+++ b/src/frontends/controllers/ControlGraphics.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C
index dd3beaadbf..ec8759eb73 100644
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file ControlInclude.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/controllers/ControlInclude.h b/src/frontends/controllers/ControlInclude.h
index beb257650b..317644b7a1 100644
--- a/src/frontends/controllers/ControlInclude.h
+++ b/src/frontends/controllers/ControlInclude.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file ControlInclude.h
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/controllers/ControlIndex.C b/src/frontends/controllers/ControlIndex.C
index 36c96bd379..f15529c408 100644
--- a/src/frontends/controllers/ControlIndex.C
+++ b/src/frontends/controllers/ControlIndex.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlIndex.h b/src/frontends/controllers/ControlIndex.h
index 54845364a8..6ee17cdaae 100644
--- a/src/frontends/controllers/ControlIndex.h
+++ b/src/frontends/controllers/ControlIndex.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlInset.h b/src/frontends/controllers/ControlInset.h
index bab53f8d9b..ec1cad3010 100644
--- a/src/frontends/controllers/ControlInset.h
+++ b/src/frontends/controllers/ControlInset.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlLog.C b/src/frontends/controllers/ControlLog.C
index c85f91bcbe..b285d2f387 100644
--- a/src/frontends/controllers/ControlLog.C
+++ b/src/frontends/controllers/ControlLog.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlMinipage.C b/src/frontends/controllers/ControlMinipage.C
index dab432c839..3ac3f38b8d 100644
--- a/src/frontends/controllers/ControlMinipage.C
+++ b/src/frontends/controllers/ControlMinipage.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlMinipage.h b/src/frontends/controllers/ControlMinipage.h
index 344f5fd53b..37a68a0b30 100644
--- a/src/frontends/controllers/ControlMinipage.h
+++ b/src/frontends/controllers/ControlMinipage.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/controllers/ControlPreamble.C b/src/frontends/controllers/ControlPreamble.C
index 2d4c7b93a6..f1546d50a4 100644
--- a/src/frontends/controllers/ControlPreamble.C
+++ b/src/frontends/controllers/ControlPreamble.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormPreamble.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/controllers/ControlPreamble.h b/src/frontends/controllers/ControlPreamble.h
index 71907fcc2b..4b1f711ac0 100644
--- a/src/frontends/controllers/ControlPreamble.h
+++ b/src/frontends/controllers/ControlPreamble.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file ControlPreamble.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/controllers/ControlPrint.C b/src/frontends/controllers/ControlPrint.C
index 7ee3ac2938..e133816db7 100644
--- a/src/frontends/controllers/ControlPrint.C
+++ b/src/frontends/controllers/ControlPrint.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/controllers/ControlPrint.h b/src/frontends/controllers/ControlPrint.h
index a29536e115..29a7dab215 100644
--- a/src/frontends/controllers/ControlPrint.h
+++ b/src/frontends/controllers/ControlPrint.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/controllers/ControlRef.C b/src/frontends/controllers/ControlRef.C
index b909d5bb88..7b3fb01855 100644
--- a/src/frontends/controllers/ControlRef.C
+++ b/src/frontends/controllers/ControlRef.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlRef.h b/src/frontends/controllers/ControlRef.h
index 23e5cb1899..b1afc7349f 100644
--- a/src/frontends/controllers/ControlRef.h
+++ b/src/frontends/controllers/ControlRef.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlSearch.C b/src/frontends/controllers/ControlSearch.C
index 2928857c85..d20e8c8333 100644
--- a/src/frontends/controllers/ControlSearch.C
+++ b/src/frontends/controllers/ControlSearch.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlSearch.h b/src/frontends/controllers/ControlSearch.h
index 3b625187a0..1774b94e60 100644
--- a/src/frontends/controllers/ControlSearch.h
+++ b/src/frontends/controllers/ControlSearch.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlSplash.C b/src/frontends/controllers/ControlSplash.C
index fd18e80073..1a981af295 100644
--- a/src/frontends/controllers/ControlSplash.C
+++ b/src/frontends/controllers/ControlSplash.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file ControlSplash.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/controllers/ControlSplash.h b/src/frontends/controllers/ControlSplash.h
index d3385c94c9..c9fe110455 100644
--- a/src/frontends/controllers/ControlSplash.h
+++ b/src/frontends/controllers/ControlSplash.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file ControlSplash.h
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/controllers/ControlTabularCreate.C b/src/frontends/controllers/ControlTabularCreate.C
index cad18eccde..c4f3a77e0c 100644
--- a/src/frontends/controllers/ControlTabularCreate.C
+++ b/src/frontends/controllers/ControlTabularCreate.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlTabularCreate.h b/src/frontends/controllers/ControlTabularCreate.h
index 90a63eda46..4382b54af9 100644
--- a/src/frontends/controllers/ControlTabularCreate.h
+++ b/src/frontends/controllers/ControlTabularCreate.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/controllers/ControlToc.C b/src/frontends/controllers/ControlToc.C
index 235d043c9d..c363eff0cd 100644
--- a/src/frontends/controllers/ControlToc.C
+++ b/src/frontends/controllers/ControlToc.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlUrl.C b/src/frontends/controllers/ControlUrl.C
index b8896bfa25..2d99198ff6 100644
--- a/src/frontends/controllers/ControlUrl.C
+++ b/src/frontends/controllers/ControlUrl.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlUrl.h b/src/frontends/controllers/ControlUrl.h
index d730e7e9da..c32e0abbe4 100644
--- a/src/frontends/controllers/ControlUrl.h
+++ b/src/frontends/controllers/ControlUrl.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/ControlVCLog.C b/src/frontends/controllers/ControlVCLog.C
index 087cd5fa77..e2bd3fe142 100644
--- a/src/frontends/controllers/ControlVCLog.C
+++ b/src/frontends/controllers/ControlVCLog.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  *
diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h
index 6ff8a8f6d0..c37220ddf1 100644
--- a/src/frontends/controllers/GUI.h
+++ b/src/frontends/controllers/GUI.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file GUI.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/controllers/biblio.C b/src/frontends/controllers/biblio.C
index f363c8107f..c768434cf1 100644
--- a/src/frontends/controllers/biblio.C
+++ b/src/frontends/controllers/biblio.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/biblio.h b/src/frontends/controllers/biblio.h
index 4b163ee8ee..8ce0b9f359 100644
--- a/src/frontends/controllers/biblio.h
+++ b/src/frontends/controllers/biblio.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/character.C b/src/frontends/controllers/character.C
index 4fe1b9a9f7..a232267fb5 100644
--- a/src/frontends/controllers/character.C
+++ b/src/frontends/controllers/character.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/character.h b/src/frontends/controllers/character.h
index 8ba5e7d2f8..b59aa7f626 100644
--- a/src/frontends/controllers/character.h
+++ b/src/frontends/controllers/character.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/controllers/helper_funcs.C b/src/frontends/controllers/helper_funcs.C
index 147fef18ea..a5257c811a 100644
--- a/src/frontends/controllers/helper_funcs.C
+++ b/src/frontends/controllers/helper_funcs.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 2b2ac1010c..f6ee958f5a 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,6 +1,7 @@
 2001-06-13  Angus Leeming  <a.leeming@ic.ac.uk>
 
-	* FormCharacter.[Ch]: added // -*- C++ -*-
+	* *.[Ch]: added // -*- C++ -*-
+
 	* FormCharacter.C (update): now uses contents of font_, stored
 	permanently by the controller to update() the dialog.
 
diff --git a/src/frontends/xforms/Dialogs.C b/src/frontends/xforms/Dialogs.C
index 4046c1771e..13976ff2e7 100644
--- a/src/frontends/xforms/Dialogs.C
+++ b/src/frontends/xforms/Dialogs.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  *
diff --git a/src/frontends/xforms/FileDialog.C b/src/frontends/xforms/FileDialog.C
index d64f0e9a61..d92e80e103 100644
--- a/src/frontends/xforms/FileDialog.C
+++ b/src/frontends/xforms/FileDialog.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FileDialog.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormBibitem.C b/src/frontends/xforms/FormBibitem.C
index 0b85396a77..28bd8e1887 100644
--- a/src/frontends/xforms/FormBibitem.C
+++ b/src/frontends/xforms/FormBibitem.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormBibitem.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormBibitem.h b/src/frontends/xforms/FormBibitem.h
index eeae7230f1..9599fbc85a 100644
--- a/src/frontends/xforms/FormBibitem.h
+++ b/src/frontends/xforms/FormBibitem.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormBibitem.h
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormBibtex.C b/src/frontends/xforms/FormBibtex.C
index 923b147684..80611e187b 100644
--- a/src/frontends/xforms/FormBibtex.C
+++ b/src/frontends/xforms/FormBibtex.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormBibtex.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormBrowser.C b/src/frontends/xforms/FormBrowser.C
index 54a1f355f0..48741b450f 100644
--- a/src/frontends/xforms/FormBrowser.C
+++ b/src/frontends/xforms/FormBrowser.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* FormBrowser.C
  * (C) 2001 LyX Team
  * John Levon, moz@compsoc.man.ac.uk
diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index c31010064b..bbf32c5bd0 100644
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormCitation.h b/src/frontends/xforms/FormCitation.h
index b40c33c57e..1429269c89 100644
--- a/src/frontends/xforms/FormCitation.h
+++ b/src/frontends/xforms/FormCitation.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormCopyright.C b/src/frontends/xforms/FormCopyright.C
index 5103aa535a..f0648695e1 100644
--- a/src/frontends/xforms/FormCopyright.C
+++ b/src/frontends/xforms/FormCopyright.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file FormCopyright.C
  * Copyright 2000-2001 The LyX Team.
diff --git a/src/frontends/xforms/FormCopyright.h b/src/frontends/xforms/FormCopyright.h
index 43c2c25da8..1ab43b72d2 100644
--- a/src/frontends/xforms/FormCopyright.h
+++ b/src/frontends/xforms/FormCopyright.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormCopyright.h
  * This file is part of
diff --git a/src/frontends/xforms/FormCredits.C b/src/frontends/xforms/FormCredits.C
index 89c320e55a..da93ac58d7 100644
--- a/src/frontends/xforms/FormCredits.C
+++ b/src/frontends/xforms/FormCredits.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormCredits.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormCredits.h b/src/frontends/xforms/FormCredits.h
index 712c815023..aff26344bb 100644
--- a/src/frontends/xforms/FormCredits.h
+++ b/src/frontends/xforms/FormCredits.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormCredits.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 99e626cd2f..a181d5879c 100644
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/xforms/FormError.C b/src/frontends/xforms/FormError.C
index 9c6cedd189..f5c59fc001 100644
--- a/src/frontends/xforms/FormError.C
+++ b/src/frontends/xforms/FormError.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file FormError.C
  * This file is part of
diff --git a/src/frontends/xforms/FormError.h b/src/frontends/xforms/FormError.h
index 08342a8963..d927e02d45 100644
--- a/src/frontends/xforms/FormError.h
+++ b/src/frontends/xforms/FormError.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file FormError.h
  * This file is part of
diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index edf65d0c4d..2b24c5c8d0 100644
--- a/src/frontends/xforms/FormExternal.C
+++ b/src/frontends/xforms/FormExternal.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormExternal.h b/src/frontends/xforms/FormExternal.h
index 34de5021fb..35c3995896 100644
--- a/src/frontends/xforms/FormExternal.h
+++ b/src/frontends/xforms/FormExternal.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormFiledialog.C b/src/frontends/xforms/FormFiledialog.C
index 260f6b7fb2..7fee49139a 100644
--- a/src/frontends/xforms/FormFiledialog.C
+++ b/src/frontends/xforms/FormFiledialog.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormFiledialog.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index a4ef19ad23..d618b13659 100644
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormGraphics.h b/src/frontends/xforms/FormGraphics.h
index a43e48996d..4563f3193b 100644
--- a/src/frontends/xforms/FormGraphics.h
+++ b/src/frontends/xforms/FormGraphics.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C
index 42015d2d3e..2090284403 100644
--- a/src/frontends/xforms/FormInclude.C
+++ b/src/frontends/xforms/FormInclude.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormInclude.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormIndex.C b/src/frontends/xforms/FormIndex.C
index c2057a5a99..5b6f0dea1a 100644
--- a/src/frontends/xforms/FormIndex.C
+++ b/src/frontends/xforms/FormIndex.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormIndex.h b/src/frontends/xforms/FormIndex.h
index 0720e28ac6..1a3fc3f534 100644
--- a/src/frontends/xforms/FormIndex.h
+++ b/src/frontends/xforms/FormIndex.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormLog.C b/src/frontends/xforms/FormLog.C
index 194fc2a96e..f80a9cd8a3 100644
--- a/src/frontends/xforms/FormLog.C
+++ b/src/frontends/xforms/FormLog.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* FormLog.C
  * (C) 2001 LyX Team
  * John Levon, moz@compsoc.man.ac.uk
diff --git a/src/frontends/xforms/FormMathsBitmap.C b/src/frontends/xforms/FormMathsBitmap.C
index c08da574b2..3e289ec4cb 100644
--- a/src/frontends/xforms/FormMathsBitmap.C
+++ b/src/frontends/xforms/FormMathsBitmap.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormMathsBitmap.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormMathsBitmap.h b/src/frontends/xforms/FormMathsBitmap.h
index 0e820dfeb3..4a3c6d07be 100644
--- a/src/frontends/xforms/FormMathsBitmap.h
+++ b/src/frontends/xforms/FormMathsBitmap.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormMathsBitmap.h
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormMathsDeco.C b/src/frontends/xforms/FormMathsDeco.C
index 22664de189..2f0aadc50a 100644
--- a/src/frontends/xforms/FormMathsDeco.C
+++ b/src/frontends/xforms/FormMathsDeco.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormMathsDeco.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsDeco.h b/src/frontends/xforms/FormMathsDeco.h
index ff1a485d78..4d953d3614 100644
--- a/src/frontends/xforms/FormMathsDeco.h
+++ b/src/frontends/xforms/FormMathsDeco.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /** 
  * \file FormMathsDeco.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsDelim.C b/src/frontends/xforms/FormMathsDelim.C
index 01d243649e..0ac0034a48 100644
--- a/src/frontends/xforms/FormMathsDelim.C
+++ b/src/frontends/xforms/FormMathsDelim.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormMathsDelim.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsDelim.h b/src/frontends/xforms/FormMathsDelim.h
index efacd5c6b6..a0b22a6f1c 100644
--- a/src/frontends/xforms/FormMathsDelim.h
+++ b/src/frontends/xforms/FormMathsDelim.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /** 
  * \file FormMathsDelim.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index 8f68e8393e..4655a1f4de 100644
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormMathsMatrix.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsMatrix.h b/src/frontends/xforms/FormMathsMatrix.h
index e071bd128d..a6631a5786 100644
--- a/src/frontends/xforms/FormMathsMatrix.h
+++ b/src/frontends/xforms/FormMathsMatrix.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /** 
  * \file FormMathsMatrix.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C
index fffe677b2d..027bbc115b 100644
--- a/src/frontends/xforms/FormMathsPanel.C
+++ b/src/frontends/xforms/FormMathsPanel.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormMathsPanel.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsPanel.h b/src/frontends/xforms/FormMathsPanel.h
index bb88a4c4dd..8d9ac6f51c 100644
--- a/src/frontends/xforms/FormMathsPanel.h
+++ b/src/frontends/xforms/FormMathsPanel.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /** 
  * \file FormMathsPanel.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsSpace.C b/src/frontends/xforms/FormMathsSpace.C
index 6946a6e919..3f202b50ce 100644
--- a/src/frontends/xforms/FormMathsSpace.C
+++ b/src/frontends/xforms/FormMathsSpace.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormMathsSpace.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMathsSpace.h b/src/frontends/xforms/FormMathsSpace.h
index 675cd3fb5d..8fd3031fb6 100644
--- a/src/frontends/xforms/FormMathsSpace.h
+++ b/src/frontends/xforms/FormMathsSpace.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /** 
  * \file FormMathsSpace.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormMinipage.C b/src/frontends/xforms/FormMinipage.C
index 73d9a17645..ef045d573b 100644
--- a/src/frontends/xforms/FormMinipage.C
+++ b/src/frontends/xforms/FormMinipage.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormMinipage.h b/src/frontends/xforms/FormMinipage.h
index 7ee939c935..94a648dacd 100644
--- a/src/frontends/xforms/FormMinipage.h
+++ b/src/frontends/xforms/FormMinipage.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index ef51c02e27..a6e73a4e1c 100644
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/xforms/FormPreamble.C b/src/frontends/xforms/FormPreamble.C
index 6e9a13b679..544b5e6b48 100644
--- a/src/frontends/xforms/FormPreamble.C
+++ b/src/frontends/xforms/FormPreamble.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormPreamble.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormPreamble.h b/src/frontends/xforms/FormPreamble.h
index 0b124177cf..2efaf2118a 100644
--- a/src/frontends/xforms/FormPreamble.h
+++ b/src/frontends/xforms/FormPreamble.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormPreamble.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormPrint.C b/src/frontends/xforms/FormPrint.C
index 5e2c3b9ad0..d3c6f6665a 100644
--- a/src/frontends/xforms/FormPrint.C
+++ b/src/frontends/xforms/FormPrint.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file FormPrint.C
  * Copyright 2000-2001 The LyX Team.
diff --git a/src/frontends/xforms/FormPrint.h b/src/frontends/xforms/FormPrint.h
index abf17c09ea..8f68ba2727 100644
--- a/src/frontends/xforms/FormPrint.h
+++ b/src/frontends/xforms/FormPrint.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index 6c4fa3d442..f06e8d5951 100644
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormRef.h b/src/frontends/xforms/FormRef.h
index 0b71e28ef4..9a6901324d 100644
--- a/src/frontends/xforms/FormRef.h
+++ b/src/frontends/xforms/FormRef.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormSearch.C b/src/frontends/xforms/FormSearch.C
index 34077d94f4..78ffcf5ab9 100644
--- a/src/frontends/xforms/FormSearch.C
+++ b/src/frontends/xforms/FormSearch.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormSearch.C
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormSearch.h b/src/frontends/xforms/FormSearch.h
index 1999ed6dad..24a473ad8c 100644
--- a/src/frontends/xforms/FormSearch.h
+++ b/src/frontends/xforms/FormSearch.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormSearch.h
  * Copyright 2001 The LyX Team.
diff --git a/src/frontends/xforms/FormSplash.C b/src/frontends/xforms/FormSplash.C
index 7fac1a161e..aee59aa241 100644
--- a/src/frontends/xforms/FormSplash.C
+++ b/src/frontends/xforms/FormSplash.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormSplash.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormSplash.h b/src/frontends/xforms/FormSplash.h
index e648ef0b69..695cddf799 100644
--- a/src/frontends/xforms/FormSplash.h
+++ b/src/frontends/xforms/FormSplash.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file FormSplash.h
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/FormTabularCreate.C b/src/frontends/xforms/FormTabularCreate.C
index 2ec372345c..6ba1f0ff82 100644
--- a/src/frontends/xforms/FormTabularCreate.C
+++ b/src/frontends/xforms/FormTabularCreate.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormTabularCreate.h b/src/frontends/xforms/FormTabularCreate.h
index f966d4e1f3..ab2811709f 100644
--- a/src/frontends/xforms/FormTabularCreate.h
+++ b/src/frontends/xforms/FormTabularCreate.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/xforms/FormToc.C b/src/frontends/xforms/FormToc.C
index 8691bfa3b2..96a9378536 100644
--- a/src/frontends/xforms/FormToc.C
+++ b/src/frontends/xforms/FormToc.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormUrl.C b/src/frontends/xforms/FormUrl.C
index f8a1f88553..040c2b8efb 100644
--- a/src/frontends/xforms/FormUrl.C
+++ b/src/frontends/xforms/FormUrl.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormUrl.h b/src/frontends/xforms/FormUrl.h
index d9d44f6953..5ad62ce30f 100644
--- a/src/frontends/xforms/FormUrl.h
+++ b/src/frontends/xforms/FormUrl.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/FormVCLog.C b/src/frontends/xforms/FormVCLog.C
index 7620ad4c83..fc0eac28f7 100644
--- a/src/frontends/xforms/FormVCLog.C
+++ b/src/frontends/xforms/FormVCLog.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* FormVCLog.C
  * (C) 2001 LyX Team
  * John Levon, moz@compsoc.man.ac.uk
diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C
index aefa36811d..a4bbf54c34 100644
--- a/src/frontends/xforms/GUIRunTime.C
+++ b/src/frontends/xforms/GUIRunTime.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  * 
diff --git a/src/frontends/xforms/MathsSymbols.C b/src/frontends/xforms/MathsSymbols.C
index 164d1fccb3..d561e44823 100644
--- a/src/frontends/xforms/MathsSymbols.C
+++ b/src/frontends/xforms/MathsSymbols.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file MathsSymbols.C
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/MathsSymbols.h b/src/frontends/xforms/MathsSymbols.h
index f31a276ba9..13f5b26fb2 100644
--- a/src/frontends/xforms/MathsSymbols.h
+++ b/src/frontends/xforms/MathsSymbols.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file MathsSymbols.h
  * Copyright 2001 the LyX Team
diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index cb2fa4fd3d..48dc776798 100644
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
 * ======================================================
 * 
diff --git a/src/frontends/xforms/Timeout_pimpl.C b/src/frontends/xforms/Timeout_pimpl.C
index deefa81da8..fa149ac9ce 100644
--- a/src/frontends/xforms/Timeout_pimpl.C
+++ b/src/frontends/xforms/Timeout_pimpl.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file Timeout_pimpl.C
  * Copyright 2001 LyX Team
diff --git a/src/frontends/xforms/Timeout_pimpl.h b/src/frontends/xforms/Timeout_pimpl.h
index 9ee24325a2..ee686ace02 100644
--- a/src/frontends/xforms/Timeout_pimpl.h
+++ b/src/frontends/xforms/Timeout_pimpl.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /**
  * \file Timeout_pimpl.h
  * Copyright 2001 LyX Team
diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C
index 9a051dd33a..7db3c8a7d0 100644
--- a/src/frontends/xforms/Toolbar_pimpl.C
+++ b/src/frontends/xforms/Toolbar_pimpl.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  * 
diff --git a/src/frontends/xforms/bmtable.h b/src/frontends/xforms/bmtable.h
index a55c423f09..3ae4adb07a 100644
--- a/src/frontends/xforms/bmtable.h
+++ b/src/frontends/xforms/bmtable.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  *  File:        bmtable.h
  *  Purpose:     Declaration of the XForms object bmtable. 
diff --git a/src/frontends/xforms/forms/form_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd
index 96f882e31b..7d40f4a9c9 100644
--- a/src/frontends/xforms/forms/form_paragraph.fd
+++ b/src/frontends/xforms/forms/form_paragraph.fd
@@ -5,18 +5,19 @@ Internal Form Definition File
 
 Number of forms: 3
 Unit of measure: FL_COORD_PIXEL
+SnapGrid: 5
 
 =============== FORM ===============
-Name: form_paragraph_general
-Width: 490
-Height: 250
-Number of Objects: 29
+Name: form_tabbed_paragraph
+Width: 510
+Height: 350
+Number of Objects: 7
 
 --------------------
 class: FL_BOX
-type: FLAT_BOX
-box: 0 0 490 250
-boxtype: FL_FLAT_BOX
+type: UP_BOX
+box: 0 0 510 350
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
@@ -31,124 +32,130 @@ callback:
 argument: 
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 360 110 120 50
-boxtype: FL_NO_BOX
+class: FL_TABFOLDER
+type: TOP_TABFOLDER
+box: 10 10 490 270
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: 
+label: Tabbed folder
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
+name: tabbed_folder
 callback: 
 argument: 
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 110 340 90
-boxtype: FL_NO_BOX
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 400 310 100 30
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Cancel|^[
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: button_cancel
+callback: C_FormBaseDeprecatedCancelCB
+argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 360 20 120 70
-boxtype: FL_NO_BOX
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 290 310 100 30
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Apply|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: button_apply
+callback: C_FormBaseDeprecatedApplyCB
+argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 210 20 140 70
-boxtype: FL_NO_BOX
+class: FL_BUTTON
+type: RETURN_BUTTON
+box: 180 310 100 30
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
-shortcut: 
+label: OK
+shortcut: ^M
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: button_ok
+callback: C_FormBaseDeprecatedOKCB
+argument: 0
 
 --------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 20 190 70
-boxtype: FL_NO_BOX
+class: FL_BUTTON
+type: NORMAL_BUTTON
+box: 10 310 100 30
+boxtype: FL_UP_BOX
 colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Restore|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 100 210 360 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Label Width:|#d
-shortcut: 
-resize: FL_RESIZE_X
-gravity: FL_West FL_East
-name: input_labelwidth
-callback: C_FormBaseDeprecatedInputCB
+name: button_restore
+callback: C_FormBaseDeprecatedRestoreCB
 argument: 0
 
 --------------------
 class: FL_TEXT
 type: NORMAL_TEXT
-box: 370 100 60 20
+box: 10 280 490 30
 boxtype: FL_FLAT_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Indent
+label: 
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: text_warning
+callback: 
+argument: 
+
+=============== FORM ===============
+Name: form_general
+Width: 490
+Height: 250
+Number of Objects: 11
+
+--------------------
+class: FL_BOX
+type: UP_BOX
+box: 0 0 490 250
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
+alignment: FL_ALIGN_LEFT
+style: FL_NORMAL_STYLE
+size: FL_NORMAL_SIZE
+lcol: FL_BLACK
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -157,191 +164,197 @@ callback:
 argument: 
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 230 30 120 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 255 80 190 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Above|#b
+label: Horizontal Alignment|#H
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_lines_top
+name: choice_align_horizontal
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 230 60 120 30
+box: 415 20 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Below|#E
+label: Indent first|#I
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_lines_bottom
-callback: C_FormBaseDeprecatedInputCB
+name: button_indent
+callback: C_FormBaseInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 360 30 120 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 255 200 130 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Above|#o
+label: Label width|#w
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_pagebreaks_top
+name: input_label_width
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 360 60 120 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 395 200 50 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
+size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Below|#l
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_pagebreaks_bottom
+name: choice_label_width_units
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 360 120 120 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 105 160 140 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: No Indent|#I
+label: Spacing|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_noindent
+name: choice_spacing
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_BEGIN_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 255 160 130 30
+boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_radio_alignment
-callback: 
-argument: 
+name: input_spacing
+callback: C_FormBaseDeprecatedInputCB
+argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 30 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 395 160 50 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Right|#R
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_right
+name: choice_spacing_units
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 10 60 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 255 120 130 30
+boxtype: FL_DOWN_BOX
+colors: FL_COL1 FL_MCOL
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Left|#f
+label: Horizontal offset|#o
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_left
+name: input_offset
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 100 30 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 395 120 50 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Block|#c
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_block
+name: choice_offset_units
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 100 60 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 95 20 190 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Center|#n
+label: Layout|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_align_center
+name: combox_layout
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+=============== FORM ===============
+Name: form_surrounds
+Width: 490
+Height: 250
+Number of Objects: 14
+
 --------------------
-class: FL_END_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_BOX
+type: UP_BOX
+box: 0 0 490 250
+boxtype: FL_UP_BOX
+colors: FL_COL1 FL_COL1
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
@@ -355,562 +368,196 @@ callback:
 argument: 
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 180 120 90 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 270 40 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Above|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_space_above
+name: button_line_above
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 180 160 90 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 270 70 30 30
+boxtype: FL_NO_BOX
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Below|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_space_below
+name: button_line_below
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
---------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 70 120 100 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Above:|#v
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: choice_space_above
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHOICE
-type: NORMAL_CHOICE
-box: 70 160 100 30
-boxtype: FL_FRAME_BOX
-colors: FL_COL1 FL_BLACK
-alignment: FL_ALIGN_LEFT
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Below:|#w
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: choice_space_below
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 370 10 100 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Pagebreaks
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 230 10 50 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Lines
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 20 10 80 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Alignment
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 20 100 130 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Vertical Spaces
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 270 120 40 30
+box: 40 40 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Keep|#K
+label: Above|#e
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_space_above
+name: 
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
 class: FL_CHECKBUTTON
 type: PUSH_BUTTON
-box: 270 160 40 30
+box: 40 70 30 30
 boxtype: FL_NO_BOX
 colors: FL_COL1 FL_YELLOW
 alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Keep|#p
+label: Below|#w
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: check_space_below
+name: 
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
-=============== FORM ===============
-Name: form_paragraph_extra
-Width: 490
-Height: 250
-Number of Objects: 21
-
---------------------
-class: FL_BOX
-type: FLAT_BOX
-box: 0 0 490 250
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 10 20 170 100
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 350 20 100 100
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_FRAME
-type: ENGRAVED_FRAME
-box: 190 20 150 100
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
 --------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 20 10 120 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Extra Options
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_INPUT
-type: NORMAL_INPUT
-box: 240 30 90 30
-boxtype: FL_DOWN_BOX
-colors: FL_COL1 FL_MCOL
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 110 140 140 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Length|#L
+label: Above|#b
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_pextra_width
+name: choice_space_above
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
 class: FL_INPUT
-type: INT_INPUT
-box: 240 70 90 30
+type: NORMAL_INPUT
+box: 260 140 130 30
 boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: or %|#o
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: input_pextra_widthp
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 200 10 60 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Width
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 350 10 90 20
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
-style: FL_BOLD_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Alignment
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_BEGIN_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: group_alignment
-callback: 
-argument: 
-
---------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 360 30 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Top|#T
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_top
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 360 60 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Middle|#d
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_middle
+name: input_space_above
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: RADIO_BUTTON
-box: 360 90 80 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 400 140 50 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bottom|#B
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_bottom
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_END_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
 label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 130 300 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: HFill between Minipage paragraphs|#H
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_hfill
+name: choice_space_above_units
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 160 260 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 110 180 140 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Start new Minipage|#S
+label: Below|#e
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_startmp
+name: choice_space_below
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_BEGIN_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
+class: FL_INPUT
+type: NORMAL_INPUT
+box: 260 180 130 30
+boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: group_extraopt
-callback: 
-argument: 
-
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 30 160 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Indented Paragraph|#I
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_indent
+name: input_space_below
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 60 160 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
+class: FL_CHOICE
+type: NORMAL_CHOICE
+box: 400 180 50 30
+boxtype: FL_FRAME_BOX
+colors: FL_COL1 FL_BLACK
+alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Minipage|#M
+label: 
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_minipage
+name: choice_space_below_units
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
 --------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 10 90 160 30
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 20 125 450 100
 boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Floatflt|#F
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: radio_pextra_floatflt
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-
---------------------
-class: FL_END_GROUP
-type: 0
-box: 0 0 0 0
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: 
+label: Vertical Spaces
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -918,23 +565,17 @@ name:
 callback: 
 argument: 
 
-=============== FORM ===============
-Name: form_tabbed_paragraph
-Width: 510
-Height: 350
-Number of Objects: 7
-
 --------------------
-class: FL_BOX
-type: UP_BOX
-box: 0 0 510 350
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 250 30 220 80
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_BOLD_STYLE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Lines
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -943,110 +584,20 @@ callback:
 argument: 
 
 --------------------
-class: FL_TABFOLDER
-type: TOP_TABFOLDER
-box: 10 10 490 270
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 20 30 220 80
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: Tabbed folder
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: tabbed_folder
-callback: 
-argument: 
-
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 400 310 100 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Cancel|^[
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_cancel
-callback: C_FormBaseDeprecatedCancelCB
-argument: 0
-
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 290 310 100 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Apply|#A
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_apply
-callback: C_FormBaseDeprecatedApplyCB
-argument: 0
-
---------------------
-class: FL_BUTTON
-type: RETURN_BUTTON
-box: 180 310 100 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: OK
-shortcut: ^M
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_ok
-callback: C_FormBaseDeprecatedOKCB
-argument: 0
-
---------------------
-class: FL_BUTTON
-type: NORMAL_BUTTON
-box: 10 310 100 30
-boxtype: FL_UP_BOX
-colors: FL_COL1 FL_COL1
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Restore|#R
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: button_restore
-callback: C_FormBaseDeprecatedRestoreCB
-argument: 0
-
---------------------
-class: FL_TEXT
-type: NORMAL_TEXT
-box: 10 280 490 30
-boxtype: FL_FLAT_BOX
-colors: FL_COL1 FL_MCOL
-alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_BOLD_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 
+label: Page breaks
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: text_warning
+name: 
 callback: 
 argument: 
 
diff --git a/src/frontends/xforms/input_validators.C b/src/frontends/xforms/input_validators.C
index e511e10e59..0f45f8a3a8 100644
--- a/src/frontends/xforms/input_validators.C
+++ b/src/frontends/xforms/input_validators.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* input_validators.C
  * A collection of input filtering and validating functions for use in
  * XForms dialogs.  Mainly meant for filtering input boxes although may
diff --git a/src/frontends/xforms/input_validators.h b/src/frontends/xforms/input_validators.h
index 83d0b02ac7..cb111ba49a 100644
--- a/src/frontends/xforms/input_validators.h
+++ b/src/frontends/xforms/input_validators.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
diff --git a/src/frontends/xforms/xformsBC.C b/src/frontends/xforms/xformsBC.C
index 422aa17103..f19489a997 100644
--- a/src/frontends/xforms/xformsBC.C
+++ b/src/frontends/xforms/xformsBC.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  *
diff --git a/src/frontends/xforms/xformsBC.h b/src/frontends/xforms/xformsBC.h
index d000484bb4..f631a76eea 100644
--- a/src/frontends/xforms/xformsBC.h
+++ b/src/frontends/xforms/xformsBC.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ======================================================
  *
diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C
index 7013561419..1539c18005 100644
--- a/src/frontends/xforms/xforms_helpers.C
+++ b/src/frontends/xforms/xforms_helpers.C
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /** Collection of some useful xform helper functions
  */
 
diff --git a/src/frontends/xforms/xforms_helpers.h b/src/frontends/xforms/xforms_helpers.h
index a8c1731270..2a43ea810f 100644
--- a/src/frontends/xforms/xforms_helpers.h
+++ b/src/frontends/xforms/xforms_helpers.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
 #ifndef XFORMSHELPERS_H
 #define XFORMSHELPERS_H