Index: CreditsDlg.cpp
===================================================================
RCS file: /cvs/mushclient/CreditsDlg.cpp,v
retrieving revision 1.8
diff -c -r1.8 CreditsDlg.cpp
*** CreditsDlg.cpp	22 Jul 2007 02:46:05 -0000	1.8
--- CreditsDlg.cpp	25 Jul 2007 04:57:37 -0000
***************
*** 80,86 ****
  
    dc.CreateCompatibleDC (NULL);
  
!    int lfHeight = -MulDiv(9, dc.GetDeviceCaps(LOGPIXELSY), 72);
  
     m_font.CreateFont(lfHeight, // int nHeight, 
  				  0, // int nWidth, 
--- 80,86 ----
  
    dc.CreateCompatibleDC (NULL);
  
!    int lfHeight = -MulDiv(App.m_iFixedPitchFontSize, dc.GetDeviceCaps(LOGPIXELSY), 72);
  
     m_font.CreateFont(lfHeight, // int nHeight, 
  				  0, // int nWidth, 
***************
*** 95,101 ****
            0, // BYTE nClipPrecision, 
            0, // BYTE nQuality, 
            MUSHCLIENT_FONT_FAMILY, // BYTE nPitchAndFamily,  
!           MUSHCLIENT_DEFAULT_FONT);// LPCTSTR lpszFacename );
  
      // Get the metrics of the font.
  
--- 95,101 ----
            0, // BYTE nClipPrecision, 
            0, // BYTE nQuality, 
            MUSHCLIENT_FONT_FAMILY, // BYTE nPitchAndFamily,  
!           App.m_strFixedPitchFont);// LPCTSTR lpszFacename );
  
      // Get the metrics of the font.
  
Index: DebugLuaDlg.cpp
===================================================================
RCS file: /cvs/mushclient/DebugLuaDlg.cpp,v
retrieving revision 1.4
diff -c -r1.4 DebugLuaDlg.cpp
*** DebugLuaDlg.cpp	13 Jun 2007 17:57:28 -0000	1.4
--- DebugLuaDlg.cpp	25 Jul 2007 04:57:37 -0000
***************
*** 53,59 ****
  	//}}AFX_DATA_MAP
  
   if(!pDX->m_bSaveAndValidate)
!    FixFont (m_font, m_ctlCommand, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
  
  }
  
--- 53,59 ----
  	//}}AFX_DATA_MAP
  
   if(!pDX->m_bSaveAndValidate)
!    FixFont (m_font, m_ctlCommand, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
  
  }
  
Index: DebugWorldInputDlg.cpp
===================================================================
RCS file: /cvs/mushclient/DebugWorldInputDlg.cpp,v
retrieving revision 1.7
diff -c -r1.7 DebugWorldInputDlg.cpp
*** DebugWorldInputDlg.cpp	20 Apr 2007 02:51:38 -0000	1.7
--- DebugWorldInputDlg.cpp	25 Jul 2007 04:57:37 -0000
***************
*** 59,65 ****
  
    dc.CreateCompatibleDC (NULL);
  
!  int lfHeight = -MulDiv(9, dc.GetDeviceCaps(LOGPIXELSY), 72);
  
   m_font.CreateFont(lfHeight, // int nHeight, 
  				0, // int nWidth, 
--- 59,65 ----
  
    dc.CreateCompatibleDC (NULL);
  
!  int lfHeight = -MulDiv(App.m_iFixedPitchFontSize, dc.GetDeviceCaps(LOGPIXELSY), 72);
  
   m_font.CreateFont(lfHeight, // int nHeight, 
  				0, // int nWidth, 
***************
*** 74,80 ****
          0, // BYTE nClipPrecision, 
          0, // BYTE nQuality, 
          MUSHCLIENT_FONT_FAMILY, // BYTE nPitchAndFamily,  
!         MUSHCLIENT_DEFAULT_FONT);// LPCTSTR lpszFacename );
  
    // Get the metrics of the font.
  
--- 74,80 ----
          0, // BYTE nClipPrecision, 
          0, // BYTE nQuality, 
          MUSHCLIENT_FONT_FAMILY, // BYTE nPitchAndFamily,  
!         App.m_strFixedPitchFont);// LPCTSTR lpszFacename );
  
    // Get the metrics of the font.
  
Index: EditDlg.cpp
===================================================================
RCS file: /cvs/mushclient/EditDlg.cpp,v
retrieving revision 1.16
diff -c -r1.16 EditDlg.cpp
*** EditDlg.cpp	11 Jun 2007 10:42:08 -0000	1.16
--- EditDlg.cpp	25 Jul 2007 04:57:37 -0000
***************
*** 52,58 ****
     }
   else
     {
!    FixFont (m_font, m_ctlText, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
     }
  
  }
--- 52,58 ----
     }
   else
     {
!    FixFont (m_font, m_ctlText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
     }
  
  }
Index: EditMultiLine.cpp
===================================================================
RCS file: /cvs/mushclient/EditMultiLine.cpp,v
retrieving revision 1.16
diff -c -r1.16 EditMultiLine.cpp
*** EditMultiLine.cpp	8 Jun 2007 01:30:36 -0000	1.16
--- EditMultiLine.cpp	25 Jul 2007 04:57:37 -0000
***************
*** 48,54 ****
  	//}}AFX_DATA_MAP
  
   if(!pDX->m_bSaveAndValidate)
!    FixFont (m_font, m_ctlText, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
  
  }
  
--- 48,54 ----
  	//}}AFX_DATA_MAP
  
   if(!pDX->m_bSaveAndValidate)
!    FixFont (m_font, m_ctlText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
  
  }
  
Index: MUSHclient.cpp
===================================================================
RCS file: /cvs/mushclient/MUSHclient.cpp,v
retrieving revision 1.82
diff -c -r1.82 MUSHclient.cpp
*** MUSHclient.cpp	21 Jun 2007 01:46:32 -0000	1.82
--- MUSHclient.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 247,252 ****
--- 247,256 ----
    else
      m_strMUSHclientFileName = ".\\MUSHclient.exe";
  
+   // in case of error dialogs, etc.
+   m_strFixedPitchFont = "FixedSys";
+   m_iFixedPitchFontSize = 9;
+ 
    // i18n setup  -------------------------------
  
    if (!I18N_Setup ())
Index: MUSHclient.h
===================================================================
RCS file: /cvs/mushclient/MUSHclient.h,v
retrieving revision 1.52
diff -c -r1.52 MUSHclient.h
*** MUSHclient.h	21 Jul 2007 03:43:37 -0000	1.52
--- MUSHclient.h	25 Jul 2007 04:57:38 -0000
***************
*** 156,161 ****
--- 156,162 ----
    unsigned int m_nPrinterTopMargin;
    unsigned int m_nTimerInterval;
    unsigned int m_bEnablePackageLibrary;
+   unsigned int m_iFixedPitchFontSize;
  
  
    COLORREF m_cNotepadBackColour;
***************
*** 181,186 ****
--- 182,188 ----
    CString m_strWorldList;
    CString m_strLuaScript;
    CString m_strLocale;
+   CString m_strFixedPitchFont;
  
  // other things
  
Index: MUSHclient.rc
===================================================================
RCS file: /cvs/mushclient/MUSHclient.rc,v
retrieving revision 1.205
diff -c -r1.205 MUSHclient.rc
*** MUSHclient.rc	22 Jul 2007 02:46:05 -0000	1.205
--- MUSHclient.rc	25 Jul 2007 04:57:38 -0000
***************
*** 56,63 ****
  //
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 4,0,14,0
!  PRODUCTVERSION 4,0,14,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
   FILEFLAGS 0x1L
--- 56,63 ----
  //
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 4,0,15,0
!  PRODUCTVERSION 4,0,15,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
   FILEFLAGS 0x1L
***************
*** 75,88 ****
              VALUE "Comments", "MUSHclient - a client program for playing MUD games\0"
              VALUE "CompanyName", "Gammon Software Solutions\0"
              VALUE "FileDescription", "MUSHclient\0"
!             VALUE "FileVersion", "4.14\0"
              VALUE "InternalName", "MUSHCLIENT\0"
              VALUE "LegalCopyright", "Copyright © 2007 Gammon Software Solutions\0"
              VALUE "LegalTrademarks", "\0"
              VALUE "OriginalFilename", "MUSHCLIENT.EXE\0"
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "MUSHclient\0"
!             VALUE "ProductVersion", "4.14\0"
              VALUE "SpecialBuild", "\0"
          END
      END
--- 75,88 ----
              VALUE "Comments", "MUSHclient - a client program for playing MUD games\0"
              VALUE "CompanyName", "Gammon Software Solutions\0"
              VALUE "FileDescription", "MUSHclient\0"
!             VALUE "FileVersion", "4.15\0"
              VALUE "InternalName", "MUSHCLIENT\0"
              VALUE "LegalCopyright", "Copyright © 2007 Gammon Software Solutions\0"
              VALUE "LegalTrademarks", "\0"
              VALUE "OriginalFilename", "MUSHCLIENT.EXE\0"
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "MUSHclient\0"
!             VALUE "ProductVersion", "4.15\0"
              VALUE "SpecialBuild", "\0"
          END
      END
Index: MapDlg.cpp
===================================================================
RCS file: /cvs/mushclient/MapDlg.cpp,v
retrieving revision 1.18
diff -c -r1.18 MapDlg.cpp
*** MapDlg.cpp	13 Jun 2007 17:57:28 -0000	1.18
--- MapDlg.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 65,71 ****
  
       }    // end of save and validate
     else
!      FixFont (m_font, m_ctlFailure, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
  
  
  }
--- 65,71 ----
  
       }    // end of save and validate
     else
!      FixFont (m_font, m_ctlFailure, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
  
  
  }
Index: RegexpProblemDlg.cpp
===================================================================
RCS file: /cvs/mushclient/RegexpProblemDlg.cpp,v
retrieving revision 1.3
diff -c -r1.3 RegexpProblemDlg.cpp
*** RegexpProblemDlg.cpp	27 Nov 2004 09:11:30 -0000	1.3
--- RegexpProblemDlg.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 56,62 ****
  
    dc.CreateCompatibleDC (NULL);
  
!    int lfHeight = -MulDiv(9, dc.GetDeviceCaps(LOGPIXELSY), 72);
  
     m_font.CreateFont(lfHeight, // int nHeight, 
  				  0, // int nWidth, 
--- 56,62 ----
  
    dc.CreateCompatibleDC (NULL);
  
!    int lfHeight = -MulDiv(App.m_iFixedPitchFontSize, dc.GetDeviceCaps(LOGPIXELSY), 72);
  
     m_font.CreateFont(lfHeight, // int nHeight, 
  				  0, // int nWidth, 
***************
*** 71,77 ****
            0, // BYTE nClipPrecision, 
            0, // BYTE nQuality, 
            MUSHCLIENT_FONT_FAMILY, // BYTE nPitchAndFamily,  
!           MUSHCLIENT_DEFAULT_FONT);// LPCTSTR lpszFacename );
  
      // Get the metrics of the font.
  
--- 71,77 ----
            0, // BYTE nClipPrecision, 
            0, // BYTE nQuality, 
            MUSHCLIENT_FONT_FAMILY, // BYTE nPitchAndFamily,  
!           App.m_strFixedPitchFont);// LPCTSTR lpszFacename );
  
      // Get the metrics of the font.
  
Index: ScriptErrorDlg.cpp
===================================================================
RCS file: /cvs/mushclient/ScriptErrorDlg.cpp,v
retrieving revision 1.5
diff -c -r1.5 ScriptErrorDlg.cpp
*** ScriptErrorDlg.cpp	12 Jun 2007 04:01:56 -0000	1.5
--- ScriptErrorDlg.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 86,92 ****
  {
  	CDialog::OnInitDialog();
  	
!   FixFont (m_font, m_ctlDescription, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
  	
    if (!m_bHaveDoc)
      {
--- 86,92 ----
  {
  	CDialog::OnInitDialog();
  	
!   FixFont (m_font, m_ctlDescription, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
  	
    if (!m_bHaveDoc)
      {
Index: SendToAllDlg.cpp
===================================================================
RCS file: /cvs/mushclient/SendToAllDlg.cpp,v
retrieving revision 1.4
diff -c -r1.4 SendToAllDlg.cpp
*** SendToAllDlg.cpp	27 Nov 2004 09:11:30 -0000	1.4
--- SendToAllDlg.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 123,129 ****
  
    dc.CreateCompatibleDC (NULL);
  
!    int lfHeight = -MulDiv(9, dc.GetDeviceCaps(LOGPIXELSY), 72);
  
     m_font.CreateFont(lfHeight, // int nHeight, 
  				  0, // int nWidth, 
--- 123,129 ----
  
    dc.CreateCompatibleDC (NULL);
  
!    int lfHeight = -MulDiv(App.m_iFixedPitchFontSize, dc.GetDeviceCaps(LOGPIXELSY), 72);
  
     m_font.CreateFont(lfHeight, // int nHeight, 
  				  0, // int nWidth, 
***************
*** 138,144 ****
            0, // BYTE nClipPrecision, 
            0, // BYTE nQuality, 
            MUSHCLIENT_FONT_FAMILY, // BYTE nPitchAndFamily,  
!           MUSHCLIENT_DEFAULT_FONT);// LPCTSTR lpszFacename );
  
      // Get the metrics of the font.
  
--- 138,144 ----
            0, // BYTE nClipPrecision, 
            0, // BYTE nQuality, 
            MUSHCLIENT_FONT_FAMILY, // BYTE nPitchAndFamily,  
!           App.m_strFixedPitchFont);// LPCTSTR lpszFacename );
  
      // Get the metrics of the font.
  
Index: TextView.cpp
===================================================================
RCS file: /cvs/mushclient/TextView.cpp,v
retrieving revision 1.42
diff -c -r1.42 TextView.cpp
*** TextView.cpp	13 Jun 2007 17:57:28 -0000	1.42
--- TextView.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 817,824 ****
     CString strFont = pDoc->m_strFontName;
     if (strFont.IsEmpty ())
       {
!      strFont = MUSHCLIENT_DEFAULT_FONT;
       iCharSet = pDoc->m_iFontCharset;
       }
  
     m_font->CreateFont(lfHeight, // int nHeight, 
--- 817,825 ----
     CString strFont = pDoc->m_strFontName;
     if (strFont.IsEmpty ())
       {
!      strFont = App.m_strFixedPitchFont;
       iCharSet = pDoc->m_iFontCharset;
+      lfHeight = -MulDiv(App.m_iFixedPitchFontSize, dc.GetDeviceCaps(LOGPIXELSY), 72);
       }
  
     m_font->CreateFont(lfHeight, // int nHeight, 
Index: aliasdlg.cpp
===================================================================
RCS file: /cvs/mushclient/aliasdlg.cpp,v
retrieving revision 1.41
diff -c -r1.41 aliasdlg.cpp
*** aliasdlg.cpp	13 Jun 2007 17:57:28 -0000	1.41
--- aliasdlg.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 290,297 ****
    else
      if (App.m_bFixedFontForEditing)
        {     
!       FixFont (m_font, m_ctlAliasName, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
!       FixFont (m_font2, m_ctlAliasContents, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
        }
  
  }
--- 290,297 ----
    else
      if (App.m_bFixedFontForEditing)
        {     
!       FixFont (m_font, m_ctlAliasName, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
!       FixFont (m_font2, m_ctlAliasContents, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
        }
  
  }
Index: doc.h
===================================================================
RCS file: /cvs/mushclient/doc.h,v
retrieving revision 1.223
diff -c -r1.223 doc.h
*** doc.h	22 Jul 2007 02:46:06 -0000	1.223
--- doc.h	25 Jul 2007 04:57:38 -0000
***************
*** 21,28 ****
  
  // New versions - things to change
  
! #define THISVERSION 414                       // Step 1.
! const CString MUSHCLIENT_VERSION = "4.14";    // Step 2.
  // Step 3. Don't forget VERSION resource in Resources tab
  // Step 4. Remember: README.TXT 
  
--- 21,28 ----
  
  // New versions - things to change
  
! #define THISVERSION 415                       // Step 1.
! const CString MUSHCLIENT_VERSION = "4.15";    // Step 2.
  // Step 3. Don't forget VERSION resource in Resources tab
  // Step 4. Remember: README.TXT 
  
Index: globaloptions.cpp
===================================================================
RCS file: /cvs/mushclient/globaloptions.cpp,v
retrieving revision 1.27
diff -c -r1.27 globaloptions.cpp
*** globaloptions.cpp	21 Jul 2007 03:50:55 -0000	1.27
--- globaloptions.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 47,52 ****
--- 47,54 ----
  { "disable_keyboard_menu_activation",   false,           O(m_bDisableKeyboardMenuActivation)},
  { "enable_spell_check",                 false,           O(m_bEnableSpellCheck)},
  { "fixed_font_for_editing",             true,            O(m_bFixedFontForEditing)},
+ { "fixed_pitch_font_size",              9,               O(m_iFixedPitchFontSize)},
+ 
  { "icon_placement",                     ICON_PLACEMENT_TASKBAR,            O(m_iIconPlacement), ICON_PLACEMENT_TASKBAR, ICON_PLACEMENT_BOTH},
  { "notepad_back_colour",                0,               O(m_cNotepadBackColour), 0, 0xFFFFFF, OPT_RGB_COLOUR},
  { "notepad_text_colour",                0,               O(m_cNotepadTextColour), 0, 0xFFFFFF, OPT_RGB_COLOUR},
***************
*** 96,101 ****
--- 98,104 ----
  { "default_timers_file",            "",                      A(m_strDefaultTimersFile)},
  { "default_triggers_file",          "",                      A(m_strDefaultTriggersFile)},
  { "default_world_file_directory",   ".\\worlds\\",           A(m_strDefaultWorldFileDirectory)},
+ { "fixed_pitch_font",               "FixedSys",              A(m_strFixedPitchFont)},
  { "notepad_quote_string",           "> ",                    A(m_strNotepadQuoteString)},
  { "plugins_directory",              ".\\worlds\\plugins\\",  A(m_strPluginsDirectory)},
  { "printer_font",                   "Courier",               A(m_strPrinterFont)},
***************
*** 837,842 ****
--- 840,847 ----
    m_bF1macro                        = GetProfileInt     ("Global prefs", "F1macro",  1);
    m_bAllTypingToCommandWindow       = GetProfileInt     ("Global prefs", "AllTypingToCommandWindow",  0);
    m_strLocale                       = GetProfileString  ("Global prefs", "Locale", localeBuf);
+   m_strFixedPitchFont               = GetProfileString  ("Global prefs", "FixedPitchFont", "FixedSys");
+   m_iFixedPitchFontSize             = GetProfileInt     ("Global prefs", "FixedPitchFontSize", 9);
  
    // defaults
    m_strDefaultColoursFile        = GetProfileString  ("Global prefs", "DefaultColoursFile",   "");      
Index: globalregistryoptions.cpp
===================================================================
RCS file: /cvs/mushclient/globalregistryoptions.cpp,v
retrieving revision 1.15
diff -c -r1.15 globalregistryoptions.cpp
*** globalregistryoptions.cpp	22 Jul 2007 02:46:06 -0000	1.15
--- globalregistryoptions.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 64,69 ****
--- 64,70 ----
  { GLB_OPT (m_nPrinterLinesPerPage           ), "PrinterLinesPerPage",           60 },
  { GLB_OPT (m_nPrinterTopMargin              ), "PrinterTopMargin",              15 },
  { GLB_OPT (m_nTimerInterval                 ), "TimerInterval",                 1 },
+ { GLB_OPT (m_iFixedPitchFontSize            ), "FixedPitchFontSize",            9 },
  
  {NULL}   // end of table marker            
  
***************
*** 81,90 ****
  { GLB_ALPHA_OPT (m_strAsciiArtFont             ), "AsciiArtFont",     "fonts\\standard.flf" },                    
  { GLB_ALPHA_OPT (m_strDefaultAliasesFile       ), "DefaultAliasesFile",   "" },             
  { GLB_ALPHA_OPT (m_strDefaultColoursFile       ), "DefaultColoursFile",   "" },      
! { GLB_ALPHA_OPT (m_strDefaultInputFont         ), "DefaultInputFont",     MUSHCLIENT_DEFAULT_FONT },                   
  { GLB_ALPHA_OPT (m_strDefaultLogFileDirectory  ), "DefaultLogFileDirectory",    ".\\logs\\" },
  { GLB_ALPHA_OPT (m_strDefaultMacrosFile        ), "DefaultMacrosFile",    "" },      
! { GLB_ALPHA_OPT (m_strDefaultOutputFont        ), "DefaultOutputFont ",   MUSHCLIENT_DEFAULT_FONT },              
  { GLB_ALPHA_OPT (m_strDefaultTimersFile        ), "DefaultTimersFile ",   "" },          
  { GLB_ALPHA_OPT (m_strDefaultTriggersFile      ), "DefaultTriggersFile",  "" },          
  { GLB_ALPHA_OPT (m_strDefaultWorldFileDirectory), "DefaultWorldFileDirectory",    ".\\worlds\\" },
--- 82,91 ----
  { GLB_ALPHA_OPT (m_strAsciiArtFont             ), "AsciiArtFont",     "fonts\\standard.flf" },                    
  { GLB_ALPHA_OPT (m_strDefaultAliasesFile       ), "DefaultAliasesFile",   "" },             
  { GLB_ALPHA_OPT (m_strDefaultColoursFile       ), "DefaultColoursFile",   "" },      
! { GLB_ALPHA_OPT (m_strDefaultInputFont         ), "DefaultInputFont",     "FixedSys" },                   
  { GLB_ALPHA_OPT (m_strDefaultLogFileDirectory  ), "DefaultLogFileDirectory",    ".\\logs\\" },
  { GLB_ALPHA_OPT (m_strDefaultMacrosFile        ), "DefaultMacrosFile",    "" },      
! { GLB_ALPHA_OPT (m_strDefaultOutputFont        ), "DefaultOutputFont ",   "FixedSys" },              
  { GLB_ALPHA_OPT (m_strDefaultTimersFile        ), "DefaultTimersFile ",   "" },          
  { GLB_ALPHA_OPT (m_strDefaultTriggersFile      ), "DefaultTriggersFile",  "" },          
  { GLB_ALPHA_OPT (m_strDefaultWorldFileDirectory), "DefaultWorldFileDirectory",    ".\\worlds\\" },
***************
*** 98,103 ****
--- 99,105 ----
  { GLB_ALPHA_OPT (m_strWorldList                ), "WorldList",                  "" },
  { GLB_ALPHA_OPT (m_strLuaScript                ), "LuaScript",                  "" },
  { GLB_ALPHA_OPT (m_strLocale                   ), "Locale",                  "EN" },
+ { GLB_ALPHA_OPT (m_strFixedPitchFont           ), "FixedPitchFont",          "FixedSys" },
  
  {NULL}   // end of table marker            
  
Index: lua_utils.cpp
===================================================================
RCS file: /cvs/mushclient/lua_utils.cpp,v
retrieving revision 1.21
diff -c -r1.21 lua_utils.cpp
*** lua_utils.cpp	21 Jun 2007 05:31:54 -0000	1.21
--- lua_utils.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 696,701 ****
--- 696,703 ----
    MakeTableItem (L, "app_directory", ExtractDirectory (App.m_strMUSHclientFileName));
    MakeTableItem (L, "world_files_directory", App.m_strDefaultWorldFileDirectory);
    MakeTableItem (L, "locale", App.m_strLocale);
+   MakeTableItem (L, "fixed_pitch_font", App.m_strFixedPitchFont);
+   MakeTableItem (L, "fixed_pitch_font_size", App.m_iFixedPitchFontSize);
    MakeTableItem (L, "log_files_directory", App.m_strDefaultLogFileDirectory);
    MakeTableItem (L, "plugins_directory", App.m_strPluginsDirectory);
    MakeTableItem (L, "startup_directory", CString (working_dir));
Index: methods.cpp
===================================================================
RCS file: /cvs/mushclient/methods.cpp,v
retrieving revision 1.200
diff -c -r1.200 methods.cpp
*** methods.cpp	22 Jul 2007 02:46:06 -0000	1.200
--- methods.cpp	25 Jul 2007 04:57:38 -0000
***************
*** 4123,4128 ****
--- 4123,4131 ----
   { 68, "Startup directory" },
   { 69, "Translation file" },
   { 70, "Locale" },
+  { 71, "Fixed Pitch Font" },
+  { 72, "MUSHclient version" },
+  { 73, "MUSHclient compilation date/time" },
   
  // (booleans - calculated at runtime)
   
***************
*** 4186,4191 ****
--- 4189,4195 ----
  { 240, "Average character width in output window" },
  { 241, "Font height in output window" },
  { 242, "Number of lines received with bad UTF-8 in them" },
+ { 243, "Fixed Pitch Font" },
  
  
  // (dates - calculated at runtime)
***************
*** 4321,4326 ****
--- 4325,4333 ----
      case   68: SetUpVariantString (vaResult, working_dir); break;
      case   69: SetUpVariantString (vaResult, App.m_strTranslatorFile); break;
      case   70: SetUpVariantString (vaResult, App.m_strLocale); break;
+     case   71: SetUpVariantString (vaResult, App.m_strFixedPitchFont); break;
+     case   72: SetUpVariantString (vaResult, MUSHCLIENT_VERSION); break;
+     case   73: SetUpVariantString (vaResult, __DATE__ " " __TIME__); break;
  
      case  101: SetUpVariantBool (vaResult, m_bNoEcho); break;
      case  102: SetUpVariantBool (vaResult, m_bDebugIncomingPackets); break;
***************
*** 4557,4562 ****
--- 4564,4573 ----
  
      case 242:
          SetUpVariantLong (vaResult, m_iUTF8ErrorCount);  // errors in UTF-8
+         break;
+ 
+     case 243:
+         SetUpVariantLong (vaResult, App.m_iFixedPitchFontSize);  
          break;
  
      case  301: 
Index: mushclient.hlp
===================================================================
RCS file: /cvs/mushclient/mushclient.hlp,v
retrieving revision 1.83
diff -c -r1.83 mushclient.hlp
Binary files /tmp/cvs0PE3oP and mushclient.hlp differ
Index: scriptingoptions.cpp
===================================================================
RCS file: /cvs/mushclient/scriptingoptions.cpp,v
retrieving revision 1.50
diff -c -r1.50 scriptingoptions.cpp
*** scriptingoptions.cpp	31 Oct 2006 19:58:01 -0000	1.50
--- scriptingoptions.cpp	25 Jul 2007 04:57:39 -0000
***************
*** 201,207 ****
  {"filter_triggers",               "",         A(m_strTriggersFilter), OPT_MULTLINE},
  {"filter_variables",              "",         A(m_strVariablesFilter), OPT_MULTLINE},
  {"id",                            "",         A(m_strWorldID), OPT_WORLD_ID},
! {"input_font_name",               MUSHCLIENT_DEFAULT_FONT, A(m_input_font_name), OPT_UPDATE_VIEWS | OPT_UPDATE_INPUT_FONT},
  {"log_file_postamble",            "",         A(m_strLogFilePostamble), OPT_MULTLINE},
  {"log_file_preamble",             "",         A(m_strLogFilePreamble), OPT_MULTLINE},
  {"log_line_postamble_input",      "",         A(m_strLogLinePostambleInput), OPT_KEEP_SPACES},
--- 201,207 ----
  {"filter_triggers",               "",         A(m_strTriggersFilter), OPT_MULTLINE},
  {"filter_variables",              "",         A(m_strVariablesFilter), OPT_MULTLINE},
  {"id",                            "",         A(m_strWorldID), OPT_WORLD_ID},
! {"input_font_name",               "FixedSys", A(m_input_font_name), OPT_UPDATE_VIEWS | OPT_UPDATE_INPUT_FONT},
  {"log_file_postamble",            "",         A(m_strLogFilePostamble), OPT_MULTLINE},
  {"log_file_preamble",             "",         A(m_strLogFilePreamble), OPT_MULTLINE},
  {"log_line_postamble_input",      "",         A(m_strLogLinePostambleInput), OPT_KEEP_SPACES},
***************
*** 227,233 ****
  {"on_world_get_focus",            "",         A(m_strWorldGetFocus)},
  {"on_world_lose_focus",           "",         A(m_strWorldLoseFocus)},
  {"on_world_open",                 "",         A(m_strWorldOpen)},
! {"output_font_name",              MUSHCLIENT_DEFAULT_FONT, A(m_font_name), OPT_UPDATE_OUTPUT_FONT},
  {"password",                      "",         A(m_password), OPT_PASSWORD | OPT_PLUGIN_CANNOT_RW},
  {"paste_line_postamble",          "",         A(m_pasteline_postamble), OPT_KEEP_SPACES},
  {"paste_line_preamble",           "",         A(m_pasteline_preamble), OPT_KEEP_SPACES},
--- 227,233 ----
  {"on_world_get_focus",            "",         A(m_strWorldGetFocus)},
  {"on_world_lose_focus",           "",         A(m_strWorldLoseFocus)},
  {"on_world_open",                 "",         A(m_strWorldOpen)},
! {"output_font_name",              "FixedSys", A(m_font_name), OPT_UPDATE_OUTPUT_FONT},
  {"password",                      "",         A(m_password), OPT_PASSWORD | OPT_PLUGIN_CANNOT_RW},
  {"paste_line_postamble",          "",         A(m_pasteline_postamble), OPT_KEEP_SPACES},
  {"paste_line_preamble",           "",         A(m_pasteline_preamble), OPT_KEEP_SPACES},
Index: stdafx.h
===================================================================
RCS file: /cvs/mushclient/stdafx.h,v
retrieving revision 1.102
diff -c -r1.102 stdafx.h
*** stdafx.h	21 Jun 2007 05:31:54 -0000	1.102
--- stdafx.h	25 Jul 2007 04:57:39 -0000
***************
*** 760,766 ****
    return func;
    }
  
- #define MUSHCLIENT_DEFAULT_FONT "FixedSys"   
  #define MUSHCLIENT_FONT_CHARSET DEFAULT_CHARSET
  #define MUSHCLIENT_FONT_FAMILY FIXED_PITCH
  
--- 760,765 ----
Index: triggdlg.cpp
===================================================================
RCS file: /cvs/mushclient/triggdlg.cpp,v
retrieving revision 1.42
diff -c -r1.42 triggdlg.cpp
*** triggdlg.cpp	13 Jun 2007 17:57:28 -0000	1.42
--- triggdlg.cpp	25 Jul 2007 04:57:39 -0000
***************
*** 386,393 ****
      {
      if (App.m_bFixedFontForEditing)
        {     
!       FixFont (m_font, m_ctlTrigger, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
!       FixFont (m_font2, m_ctlTriggerContents, MUSHCLIENT_DEFAULT_FONT, 9, FW_NORMAL, DEFAULT_CHARSET);
        }
      }
  
--- 386,393 ----
      {
      if (App.m_bFixedFontForEditing)
        {     
!       FixFont (m_font, m_ctlTrigger, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
!       FixFont (m_font2, m_ctlTriggerContents, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
        }
      }
  
Index: install/readme.txt
===================================================================
RCS file: /cvs/mushclient/install/readme.txt,v
retrieving revision 1.152
diff -c -r1.152 readme.txt
*** install/readme.txt	22 Jul 2007 02:46:14 -0000	1.152
--- install/readme.txt	25 Jul 2007 04:57:40 -0000
***************
*** 1,7 ****
! MUSHclient version 4.14
  =======================
  
! Sunday, 22nd July 2007
  
  Author: Nick Gammon
  Web support: http://www.gammon.com.au/forum/
--- 1,7 ----
! MUSHclient version 4.15
  =======================
  
! Wednesday, 25th July 2007
  
  Author: Nick Gammon
  Web support: http://www.gammon.com.au/forum/