[PD-cvs] pd/src s_main.c,1.20.2.7,1.20.2.8

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3713

Modified Files:
      Tag: branch-v0-39-2-extended
	s_main.c 
Log Message:
added clearer flags for the font-related settings while keeping the old ones for backwards compatibility

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.20.2.7
retrieving revision 1.20.2.8
diff -C2 -d -r1.20.2.7 -r1.20.2.8
*** s_main.c	19 May 2007 05:29:33 -0000	1.20.2.7
--- s_main.c	19 May 2007 22:12:39 -0000	1.20.2.8
***************
*** 359,383 ****
  
  "\nother flags:\n",
! "-path <path>     -- add to file search path\n",
! "-nostdpath       -- don't search standard (\"extra\") directory\n",
! "-stdpath         -- search standard directory (true by default)\n",
! "-helppath <path> -- add to help file search path\n",
! "-open <file>     -- open file(s) on startup\n",
! "-lib <file>      -- load object library(s)\n",
! "-font <n>        -- specify default font size in points\n",
! "-typeface <name> -- specify default font (default: Bitstream Vera Sans Mono)\n",
! "-weight <name>   -- specify default font weight (normal, bold, etc.)\n",
! "-verbose         -- extra printout on startup and when searching for files\n",
! "-version         -- don't run Pd; just print out which version it is \n",
! "-d <n>           -- specify debug level\n",
! "-noloadbang      -- suppress all loadbangs\n",
! "-stderr          -- send printout to standard error instead of GUI\n",
! "-nogui           -- suppress starting the GUI\n",
! "-guiport <n>     -- connect to pre-existing GUI over port <n>\n",
  "-guicmd \"cmd...\" -- start alternatve GUI program (e.g., remote via ssh)\n",
  "-send \"msg...\"   -- send a message at startup, after patches are loaded\n",
  #ifdef UNISTD
! "-rt or -realtime -- use real-time priority\n",
! "-nrt             -- don't use real-time priority\n",
  #endif
  };
--- 359,383 ----
  
  "\nother flags:\n",
! "-path <path>       -- add to file search path\n",
! "-nostdpath         -- don't search standard (\"extra\") directory\n",
! "-stdpath           -- search standard directory (true by default)\n",
! "-helppath <path>   -- add to help file search path\n",
! "-open <file>       -- open file(s) on startup\n",
! "-lib <file>        -- load object library(s)\n",
! "-font-size <n>     -- specify default font size in points\n",
! "-font-face <name>  -- specify default font (default: Bitstream Vera Sans Mono)\n",
! "-font-weight <name>-- specify default font weight (normal or bold)\n",
! "-verbose           -- extra printout on startup and when searching for files\n",
! "-version           -- don't run Pd; just print out which version it is \n",
! "-d <n>             -- specify debug level\n",
! "-noloadbang        -- suppress all loadbangs\n",
! "-stderr            -- send printout to standard error instead of GUI\n",
! "-nogui             -- suppress starting the GUI\n",
! "-guiport <n>       -- connect to pre-existing GUI over port <n>\n",
  "-guicmd \"cmd...\" -- start alternatve GUI program (e.g., remote via ssh)\n",
  "-send \"msg...\"   -- send a message at startup, after patches are loaded\n",
  #ifdef UNISTD
! "-rt or -realtime   -- use real-time priority\n",
! "-nrt               -- don't use real-time priority\n",
  #endif
  };
***************
*** 720,724 ****
              argc -= 2; argv += 2;
          }
!         else if (!strcmp(*argv, "-font") && argc > 1)
          {
              sys_defaultfont = sys_nearestfontsize(atoi(argv[1]));
--- 720,724 ----
              argc -= 2; argv += 2;
          }
!         else if ( (!strcmp(*argv, "-font-size") || !strcmp(*argv, "-font") ) && argc > 1)
          {
              sys_defaultfont = sys_nearestfontsize(atoi(argv[1]));
***************
*** 727,731 ****
          }
                  /* tb: font name { */
!         else if (!strcmp(*argv, "-typeface") && argc > 1)
          {
                          strcpy(sys_font,*(argv+1));
--- 727,731 ----
          }
                  /* tb: font name { */
!         else if ( (!strcmp(*argv, "-font-face") || !strcmp(*argv, "-typeface") ) && argc > 1)
          {
                          strcpy(sys_font,*(argv+1));
***************
*** 733,737 ****
                          argv += 2;
                  }
!         else if (!strcmp(*argv, "-weight") && argc > 1)
          {
                          strcpy(sys_fontweight,*(argv+1));
--- 733,737 ----
                          argv += 2;
                  }
!         else if (!strcmp(*argv, "-font-weight") && argc > 1)
          {
                          strcpy(sys_fontweight,*(argv+1));