roadmap-commit — track CVS commits

[Roadmap-commit] roadmap/doc ChangeLog,1.7,1.8

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23521/doc

Modified Files:
	ChangeLog 
Log Message:
fix date


Index: ChangeLog
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog	8 Feb 2009 22:57:05 -0000	1.7
--- ChangeLog	8 Feb 2009 23:00:37 -0000	1.8
***************
*** 1,7 ****
  RoadMap Changelog
  
- February 2009
  
! Roadmap v1.2.1 (January, 2009)
  
   This list is current as of 2/8/2009, created with the help of
--- 1,6 ----
  RoadMap Changelog
  
  
! Roadmap v1.2.1 (February, 2009)
  
   This list is current as of 2/8/2009, created with the help of

[Roadmap-commit] roadmap/doc ChangeLog,1.6,1.7

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23315/doc

Modified Files:
	ChangeLog 
Log Message:
1.2.1 changes


Index: ChangeLog
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog	4 Feb 2009 04:35:35 -0000	1.6
--- ChangeLog	8 Feb 2009 22:57:05 -0000	1.7
***************
*** 1,13 ****
  RoadMap Changelog
  
! January 2009
  
! Roadmap v1.2.0 (January, 2009)
  
!  This list is current as of 1/27/2009, created with the help of
  ```
!    cvs2cl.pl -l "-d2008/11/29<2009/1/27"
  ```
  
   Items marked (*) originated on Ehud Shabtai's roadmap_editor code branch.
  
--- 1,18 ----
  RoadMap Changelog
  
! February 2009
  
! Roadmap v1.2.1 (January, 2009)
  
!  This list is current as of 2/8/2009, created with the help of
  ```
!    cvs2cl.pl -l "-d2008/11/29<2009/2/8"
  ```
  
+   - Fixed online help access, and added preferences items to allow
+     fetching local or web versions of the help.
+ 
+ Roadmap v1.2.0 (January, 2009)
+ 
   Items marked (*) originated on Ehud Shabtai's roadmap_editor code branch.
  

[Roadmap-commit] roadmap/src roadmap_copyright.h,1.32,1.33

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22754

Modified Files:
	roadmap_copyright.h 
Log Message:
1.2.1


Index: roadmap_copyright.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_copyright.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** roadmap_copyright.h	1 Feb 2009 01:59:46 -0000	1.32
--- roadmap_copyright.h	8 Feb 2009 22:45:33 -0000	1.33
***************
*** 27,31 ****
  #define INCLUDE__ROADMAP_COPYRIGHT__H
  
! #define ROADMAP_VERSION "1.2.0"
  #define ROADMAP_YEAR    "2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009"
  
--- 27,31 ----
  #define INCLUDE__ROADMAP_COPYRIGHT__H
  
! #define ROADMAP_VERSION "1.2.1"
  #define ROADMAP_YEAR    "2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009"
  

[Roadmap-commit] roadmap/doc Configuration,1.3,1.4

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15147/doc

Modified Files:
	Configuration 
Log Message:
add new Help config items to docs.



Index: Configuration
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Configuration,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Configuration	27 Jan 2009 01:42:13 -0000	1.3
--- Configuration	8 Feb 2009 21:27:26 -0000	1.4
***************
*** 569,578 ****
           The browser program used to show the help text.
            - //Format:// a program name, with or without path.
!           - //Default:// dillo
  
!      : Help.Arguments
!          The browser's command line arguments
!           - //Format:// a format string, with one '%s' for the help URL.
!           - //Default:// %s
  
       : Map.Path
--- 569,583 ----
           The browser program used to show the help text.
            - //Format:// a program name, with or without path.
!           - //Default:// firefox
  
!      : Help.Source
!          Whether RoadMap will find Help text on the local machine or the web.
!           - //Format:// "local", "web"
!           - //Default:// "local"
! 
!      : Help.Website
!          If Help.Source is "web", this is the site to access for Help text.
!           - //Format:// string
!           - //Default:// "roadmap.sourceforge.net"
  
       : Map.Path

[Roadmap-commit] roadmap/src roadmap_help.c, 1.6, 1.7 roadmap_help.h, 1.1, 1.2 roadmap_start.c, 1.151, 1.152

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13553

Modified Files:
	roadmap_help.c roadmap_help.h roadmap_start.c 
Log Message:
revise help to match new section headings, and to allow selection
of local vs. web help, and if web, allow selection of site. (defaults
to sourceforge)


Index: roadmap_help.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_help.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_help.c	8 Feb 2009 14:45:21 -0000	1.6
--- roadmap_help.c	8 Feb 2009 21:17:51 -0000	1.7
***************
*** 40,87 ****
  #include "roadmap_help.h"
  
- #define RDM_URLHEAD "file://"
  #define RDM_MANUAL "usermanual.html"
  
  #ifndef ROADMAP_BROWSER
! #define ROADMAP_BROWSER "dillo"
  #endif
  
  static RoadMapConfigDescriptor RoadMapConfigBrowser =
                          ROADMAP_CONFIG_ITEM("Help", "Browser");
  
! static RoadMapConfigDescriptor RoadMapConfigBrowserOptions =
!                         ROADMAP_CONFIG_ITEM("Help", "Arguments");
! 
! static char *RoadMapHelpManual = NULL;
! 
  
! /* -- The help display functions. -------------------------------------- */
  
! static void roadmap_help_make_url (const char *path) {
  
!    int size;
  
-    const char *options = roadmap_config_get(&RoadMapConfigBrowserOptions);
-    char *url;
  
!    size = strlen(options)
!              + strlen(RDM_URLHEAD)
!              + strlen(path)
!              + strlen(RDM_MANUAL)
!              + 8;
  
!    url = malloc (size);
  
!    strcpy(url, RDM_URLHEAD);
!    strcat(url, path);
!    strcat(url, "/" RDM_MANUAL "#%s");
  
!    if (options[0] != 0) {
!       RoadMapHelpManual = malloc(size);
!       sprintf (RoadMapHelpManual, options, url);
!       free (url);
     } else {
!       RoadMapHelpManual = url;
     }
  }
  
--- 40,90 ----
  #include "roadmap_help.h"
  
  #define RDM_MANUAL "usermanual.html"
  
  #ifndef ROADMAP_BROWSER
! #define ROADMAP_BROWSER "firefox"
  #endif
  
+ static int RoadMapHelpSourceLocal;
+ 
  static RoadMapConfigDescriptor RoadMapConfigBrowser =
                          ROADMAP_CONFIG_ITEM("Help", "Browser");
  
! static RoadMapConfigDescriptor RoadMapConfigHelpWebsite =
!                         ROADMAP_CONFIG_ITEM("Help", "Help Website");
  
! static RoadMapConfigDescriptor RoadMapConfigHelpSource =
!                         ROADMAP_CONFIG_ITEM("Help", "Source");
  
! static char *RoadMapHelpManualUrl = NULL;
  
! void roadmap_help_toggle_source (void) {
!     RoadMapHelpSourceLocal = ! RoadMapHelpSourceLocal;
!     if (RoadMapHelpSourceLocal) {
!         roadmap_config_set (&RoadMapConfigHelpSource , "local");
!     } else {
!         roadmap_config_set (&RoadMapConfigHelpSource , "web");
!     }
! }
  
  
! /* -- The help display functions. -------------------------------------- */
  
! static void roadmap_help_make_url (const char *path) {
  
!    if (!RoadMapHelpManualUrl) {
!       RoadMapHelpManualUrl = malloc (1024);
!       roadmap_check_allocated (RoadMapHelpManualUrl);
!    }
  
!    /* leave room for section name in url string (added later) */
!    if (RoadMapHelpSourceLocal) {
!        snprintf(RoadMapHelpManualUrl, 1024 - 30, "file://%s/%s",
!           path, RDM_MANUAL);
     } else {
!        snprintf(RoadMapHelpManualUrl, 1024 - 30, "http://%s/%s",
!           roadmap_config_get(&RoadMapConfigHelpWebsite), RDM_MANUAL);
     }
+ 
  }
  
***************
*** 90,93 ****
--- 93,100 ----
     const char *path;
  
+    if (!RoadMapHelpSourceLocal) {
+       roadmap_help_make_url("");
+       return 1;
+    }
  
     /* First look for the user directory. */
***************
*** 106,110 ****
     {
        if (roadmap_file_exists(path, RDM_MANUAL)) {
- 
           roadmap_help_make_url (path);
           return 1;
--- 113,116 ----
***************
*** 118,145 ****
  static void roadmap_help_show (const char *index) {
  
!     char *arguments;
! 
!     if (RoadMapHelpManual == NULL) {
!        if (! roadmap_help_prepare()) {
            return;
-        }
      }
!     if (index == NULL || index[0] == 0) index = "#id.toc";
  
      roadmap_log(ROADMAP_DEBUG, "activating help %s", index);
  
!     arguments = malloc (strlen(RoadMapHelpManual) + strlen(index) + 1);
!     sprintf (arguments, RoadMapHelpManual, index);
  
!     roadmap_spawn(roadmap_config_get(&RoadMapConfigBrowser), arguments);
!     free(arguments);
  }
  
! static void roadmap_help_install (void) {roadmap_help_show ("directories");}
! static void roadmap_help_options (void) {roadmap_help_show ("options");}
! static void roadmap_help_voice   (void) {roadmap_help_show ("voice");}
! static void roadmap_help_key     (void) {roadmap_help_show ("key");}
! static void roadmap_help_street  (void) {roadmap_help_show ("street");}
! static void roadmap_help_trips   (void) {roadmap_help_show ("trips");}
  
  
--- 124,150 ----
  static void roadmap_help_show (const char *index) {
  
!     if (!roadmap_help_prepare()) {
            return;
      }
! 
!     if (index == NULL || index[0] == 0) index = "#TableOfContents";
  
      roadmap_log(ROADMAP_DEBUG, "activating help %s", index);
  
!     if (index) {
!        strcat (RoadMapHelpManualUrl, index);
!     }
  
!     roadmap_spawn
!         (roadmap_config_get(&RoadMapConfigBrowser), RoadMapHelpManualUrl);
  }
  
! static void roadmap_help_contents(void)     {roadmap_help_show (0);}
! static void roadmap_help_quickstart(void)   {roadmap_help_show ("#Quickstart");}
! static void roadmap_help_installation(void) {roadmap_help_show ("#Installation");}
! static void roadmap_help_using(void)        {roadmap_help_show ("#UsingRoadmap");}
! static void roadmap_help_trips(void)        {roadmap_help_show ("#ManagingTrips");}
! static void roadmap_help_configuration(void){roadmap_help_show ("#Configuration");}
! static void roadmap_help_osm(void)          {roadmap_help_show ("#OpenStreetMap");}
  
  
***************
*** 152,166 ****
  
  static RoadMapHelpList RoadMapHelpTopics[] = {
!    {"Installation directories",  roadmap_help_install},
!    {"Command line options",      roadmap_help_options},
!    {"Voice messages",            roadmap_help_voice},
!    {"Keyboard bindings",         roadmap_help_key},
!    {"Entering street names",     roadmap_help_street},
!    {"Managing trips",            roadmap_help_trips},
     {NULL, NULL}
  };
  static RoadMapHelpList *RoadMapHelpTopicsCursor = NULL;
  
- 
  /* -- The help initialization functions. ------------------------------- */
  
--- 157,171 ----
  
  static RoadMapHelpList RoadMapHelpTopics[] = {
!    {"Table of Contents",            roadmap_help_contents},
!    {"Quickstart",                   roadmap_help_quickstart},
!    {"Installation",                 roadmap_help_installation},
!    {"Using RoadMap",                roadmap_help_using},
!    {"Managing Trips",               roadmap_help_trips},
!    {"Configuration",                roadmap_help_configuration},
!    {"OpenStreetMap",                roadmap_help_osm},
     {NULL, NULL}
  };
  static RoadMapHelpList *RoadMapHelpTopicsCursor = NULL;
  
  /* -- The help initialization functions. ------------------------------- */
  
***************
*** 206,214 ****
  void roadmap_help_initialize (void) {
  
!    roadmap_config_declare
!       ("preferences", &RoadMapConfigBrowserOptions, "%s");
  
     roadmap_config_declare
        ("preferences", &RoadMapConfigBrowser, ROADMAP_BROWSER);
  }
  
--- 211,231 ----
  void roadmap_help_initialize (void) {
  
!    // unsafe.  no longer supported
!    // roadmap_config_declare
!    //    ("preferences", &RoadMapConfigBrowserOptions, "%s");
  
     roadmap_config_declare
        ("preferences", &RoadMapConfigBrowser, ROADMAP_BROWSER);
+ 
+    roadmap_config_declare
+       ("preferences", &RoadMapConfigHelpWebsite, "roadmap.sourceforge.net");
+ 
+    roadmap_config_declare_enumeration
+         ("preferences", &RoadMapConfigHelpSource,
+             "local", "web", NULL);
+ 
+    RoadMapHelpSourceLocal = roadmap_config_match
+                                 (&RoadMapConfigHelpSource , "local");
+ 
  }
  

Index: roadmap_help.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_help.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_help.h	26 May 2004 03:51:42 -0000	1.1
--- roadmap_help.h	8 Feb 2009 21:17:51 -0000	1.2
***************
*** 38,41 ****
--- 38,42 ----
  #include "roadmap.h"
  
+ void roadmap_help_toggle_source (void);
  int roadmap_help_first_topic (const char **label, RoadMapCallback *callback);
  int roadmap_help_next_topic  (const char **label, RoadMapCallback *callback);

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** roadmap_start.c	27 Jan 2009 01:53:41 -0000	1.151
--- roadmap_start.c	8 Feb 2009 21:17:51 -0000	1.152
***************
*** 759,762 ****
--- 759,765 ----
        roadmap_start_mapinfo},
  
+    {"togglehelpsource", "Toggle Help Source", NULL, NULL,
+       "Switch between local/web help", NULL, roadmap_help_toggle_source},
+ 
  #ifdef _WIN32
     {"detectreceiver", "Detect GPS receiver", NULL, NULL,
***************
*** 960,963 ****
--- 963,968 ----
     ROADMAP_MENU "Help",
  
+       "togglehelpsource",
+ 
        RoadMapFactoryHelpTopics,
  

[Roadmap-commit] roadmap/web Makefile,1.17,1.18

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/web
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13472/web

Modified Files:
	Makefile 
Log Message:
expand runtime-help meta-keywords in docs, so roadmap_help can refer to
sections


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile	8 Feb 2009 14:44:31 -0000	1.17
--- Makefile	8 Feb 2009 21:16:28 -0000	1.18
***************
*** 167,171 ****
  	    <!--#include virtual="navbar.html" -->' \
  	    -e 's/<BODY .*>/<body class="roadmap-doc">/' \
! 	    -e 's;http://'$(OUR_SITE_REFERENCE)'/;;' $@ 
  
  favicon.ico: ../src/icons/roadmap-64.png 
--- 167,172 ----
  	    <!--#include virtual="navbar.html" -->' \
  	    -e 's/<BODY .*>/<body class="roadmap-doc">/' \
! 	    -e 's;http://'$(OUR_SITE_REFERENCE)'/;;' \
! 	    -e 's/@@.*runtime-help-link \(.*\) *$$/<a name="\1"><\/a>/' $@
  
  favicon.ico: ../src/icons/roadmap-64.png 

[Roadmap-commit] roadmap/src Makefile,1.133,1.134

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13472/src

Modified Files:
	Makefile 
Log Message:
expand runtime-help meta-keywords in docs, so roadmap_help can refer to
sections


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/Makefile,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** Makefile	27 Jan 2009 02:31:12 -0000	1.133
--- Makefile	8 Feb 2009 21:16:28 -0000	1.134
***************
*** 370,374 ****
           topclean clean strip install uninstall unix gpx
  
! all: runtime build $(TOOLS) icons
  
  
--- 370,374 ----
           topclean clean strip install uninstall unix gpx
  
! all: runtime build $(TOOLS) icons $(MANUAL)
  
  
***************
*** 491,494 ****
--- 491,498 ----
  	(cd ../doc; txt2tags --target html \
  	    --toc --infile - --outfile - ) >$@
+ 	 sed -i \
+ 	    -e 's/@@.*runtime-help-link \([^ ]*\) *$$/<a name="\1"><\/a>/' \
+ 	    -e '/"#toc1"/s/^/<a name="TableOfContents">/' \
+ 	    $@
  
  uninstall:

[Roadmap-commit] roadmap/doc Usage,1.3,1.4

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13144/doc

Modified Files:
	Usage 
Log Message:
add meta-word to denote runtime help link points


Index: Usage
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Usage,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Usage	27 Jan 2009 01:42:13 -0000	1.3
--- Usage	8 Feb 2009 21:14:31 -0000	1.4
***************
*** 570,575 ****
  
  
!   - MANAGING TRIPS
  
       RoadMap can support many trips:  each trip context is saved in a trip
       file.  One trip at a time can be edited or activated.  A saved trip can
--- 570,578 ----
  
  
! @@ runtime-help-link ManagingTrips
! 
  
+   - MANAGING TRIPS
+   
       RoadMap can support many trips:  each trip context is saved in a trip
       file.  One trip at a time can be edited or activated.  A saved trip can

[Roadmap-commit] roadmap README,1.165,1.166

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13144

Modified Files:
	README 
Log Message:
add meta-word to denote runtime help link points


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -d -r1.165 -r1.166
*** README	8 Feb 2009 14:29:10 -0000	1.165
--- README	8 Feb 2009 21:14:31 -0000	1.166
***************
*** 104,111 ****
--- 104,116 ----
  
  % -- CUT HERE --
+ @@ runtime-help-link Quickstart
  %!include: Quickstart
+ @@ runtime-help-link Installation
  %!include: Installation
+ @@ runtime-help-link UsingRoadMap
  %!include: Usage
+ @@ runtime-help-link Configuration
  %!include: Configuration
+ @@ runtime-help-link OpenStreetMap
  %!include: OpenStreetMap
  %!include: Map-Building

[Roadmap-commit] roadmap/web documentation.html,1.11,1.12

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/web
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4614/web

Modified Files:
	documentation.html 
Log Message:
fix all "manual.html" --> "usermanual.html" references


Index: documentation.html
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/documentation.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** documentation.html	27 Jan 2009 01:48:47 -0000	1.11
--- documentation.html	8 Feb 2009 14:45:21 -0000	1.12
***************
*** 12,16 ****
  The following documentation is available:
  <UL>
!    <LI>The <a class="normal" href="manual.html">RoadMap Manual</a>.
     <LI><a class="normal" href="installation.html">Installation notes</a>:
     	Quickstart, and instructions for Familiar Linux.
--- 12,16 ----
  The following documentation is available:
  <UL>
!    <LI>The <a class="normal" href="usermanual.html">RoadMap Manual</a>.
     <LI><a class="normal" href="installation.html">Installation notes</a>:
     	Quickstart, and instructions for Familiar Linux.

[Roadmap-commit] roadmap/src roadmap_help.c,1.5,1.6

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4614/src

Modified Files:
	roadmap_help.c 
Log Message:
fix all "manual.html" --> "usermanual.html" references


Index: roadmap_help.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_help.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_help.c	2 May 2005 06:02:45 -0000	1.5
--- roadmap_help.c	8 Feb 2009 14:45:21 -0000	1.6
***************
*** 41,45 ****
  
  #define RDM_URLHEAD "file://"
! #define RDM_MANUAL "manual.html"
  
  #ifndef ROADMAP_BROWSER
--- 41,45 ----
  
  #define RDM_URLHEAD "file://"
! #define RDM_MANUAL "usermanual.html"
  
  #ifndef ROADMAP_BROWSER
***************
*** 112,116 ****
     }
  
!    roadmap_log(ROADMAP_ERROR, "manual not found");
     return 0;
  }
--- 112,116 ----
     }
  
!    roadmap_log(ROADMAP_ERROR, RDM_MANUAL " not found");
     return 0;
  }

[Roadmap-commit] roadmap/doc Installation, 1.2, 1.3 Quickstart, 1.2, 1.3

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4614/doc

Modified Files:
	Installation Quickstart 
Log Message:
fix all "manual.html" --> "usermanual.html" references


Index: Installation
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Installation,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Installation	27 Jan 2009 01:42:13 -0000	1.2
--- Installation	8 Feb 2009 14:45:21 -0000	1.3
***************
*** 75,79 ****
         RoadMap uses "aptconvert" to format the documentation (see previous
         section) into HTML format.  Since this is an uncommon tool, a
!        pre-converted copy of manual.html is provided in the RoadMap tarball.
  
         RoadMap can use the "convert" program from the ImageMagick package to
--- 75,80 ----
         RoadMap uses "aptconvert" to format the documentation (see previous
         section) into HTML format.  Since this is an uncommon tool, a
!        pre-converted copy of usermanual.html is provided in the RoadMap
!        tarball.
  
         RoadMap can use the "convert" program from the ImageMagick package to

Index: Quickstart
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Quickstart,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Quickstart	27 Jan 2009 01:42:13 -0000	1.2
--- Quickstart	8 Feb 2009 14:45:21 -0000	1.3
***************
*** 42,46 ****
         on-screen controls or the '+' and '-' keys to zoom.  RoadMap's
         help text is available in html format via the Help menu (which
!        reads the installed copy of "manual.html") or in plaintext in
         the README file.  Use the 'q' key or the File->Quit menu
         item to quit.
--- 42,46 ----
         on-screen controls or the '+' and '-' keys to zoom.  RoadMap's
         help text is available in html format via the Help menu (which
!        reads the installed copy of "usermanual.html") or in plaintext in
         the README file.  Use the 'q' key or the File->Quit menu
         item to quit.
***************
*** 64,68 ****
     The README is on the web, here:
  
!          http://roadmap.sourceforge.net/manual.html
  
     Good luck, and have fun!
--- 64,68 ----
     The README is on the web, here:
  
!          http://roadmap.sourceforge.net/usermanual.html
  
     Good luck, and have fun!

[Roadmap-commit] roadmap/web Makefile,1.16,1.17

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/web
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4556/web

Modified Files:
	Makefile 
Log Message:
fix sourceforge website upload hostname


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	4 Feb 2009 04:49:37 -0000	1.16
--- Makefile	8 Feb 2009 14:44:31 -0000	1.17
***************
*** 94,98 ****
  else
  OUR_SITE_REFERENCE = roadmap.sourceforge.net
! OUR_SITE_ACCESS = pgf,ro...@sh...:/home/groups/r/ro/roadmap/htdocs
  endif
  
--- 94,98 ----
  else
  OUR_SITE_REFERENCE = roadmap.sourceforge.net
! OUR_SITE_ACCESS = pgf,ro...@we...:/home/groups/r/ro/roadmap/htdocs
  endif
  

[Roadmap-commit] roadmap README,1.164,1.165

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2123

Modified Files:
	README 
Log Message:
bump date in README, so it's not out of date wrt 1.2.0


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** README	8 Feb 2009 14:21:01 -0000	1.164
--- README	8 Feb 2009 14:29:10 -0000	1.165
***************
*** 1,5 ****
  RoadMap User Manual and README
  
! November 2008
  
  
--- 1,5 ----
  RoadMap User Manual and README
  
! February 2009
  
  

[Roadmap-commit] roadmap README,1.163,1.164

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv1190

Modified Files:
	README 
Log Message:
belated credit to fmiser for the icon design


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** README	27 Jan 2009 01:46:45 -0000	1.163
--- README	8 Feb 2009 14:21:01 -0000	1.164
***************
*** 83,87 ****
     This document, as well as RoadMap as a whole, is primarily the work
     of Pascal Martin.  Other major contributors include Steve Woodbridge,
!    Ehud Shabtai, Paul Fox, and Danny Backx
  
  
--- 83,88 ----
     This document, as well as RoadMap as a whole, is primarily the work
     of Pascal Martin.  Other major contributors include Steve Woodbridge,
!    Ehud Shabtai, Paul Fox, and Danny Backx.  The RoadMap "forked road"
!    icon was designed by fmiser from the RoadMap mailing list.
  
  

[Roadmap-commit] roadmap/web Makefile,1.15,1.16

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/web
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6453

Modified Files:
	Makefile 
Log Message:
fix sourceforge access


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile	27 Jan 2009 23:34:16 -0000	1.15
--- Makefile	4 Feb 2009 04:49:37 -0000	1.16
***************
*** 94,98 ****
  else
  OUR_SITE_REFERENCE = roadmap.sourceforge.net
! OUR_SITE_ACCESS = roadmap.sourceforge.net:/home/groups/r/ro/roadmap/htdocs
  endif
  
--- 94,98 ----
  else
  OUR_SITE_REFERENCE = roadmap.sourceforge.net
! OUR_SITE_ACCESS = pgf,ro...@sh...:/home/groups/r/ro/roadmap/htdocs
  endif
  

[Roadmap-commit] roadmap/doc ChangeLog,1.5,1.6 Status,1.3,1.4

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5990

Modified Files:
	ChangeLog Status 
Log Message:
minor format and text glitches


Index: Status
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Status,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Status	27 Jan 2009 01:42:13 -0000	1.3
--- Status	4 Feb 2009 04:35:35 -0000	1.4
***************
*** 25,28 ****
--- 25,29 ----
      There's more detail in the changelog.
  
+ 
  = Two Branches =
  
***************
*** 41,44 ****
--- 42,46 ----
      (Sadly for many of us, google doesn't yet translate Hebrew.)
  
+ 
  = Help Wanted! =
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChangeLog	27 Jan 2009 23:49:11 -0000	1.5
--- ChangeLog	4 Feb 2009 04:35:35 -0000	1.6
***************
*** 3,9 ****
  January 2009
  
! Roadmap v1.2.0 (??)
  
!  This list is current as of 11/7/2008, created with the help of
  ```
     cvs2cl.pl -l "-d2008/11/29<2009/1/27"
--- 3,9 ----
  January 2009
  
! Roadmap v1.2.0 (January, 2009)
  
!  This list is current as of 1/27/2009, created with the help of
  ```
     cvs2cl.pl -l "-d2008/11/29<2009/1/27"

[Roadmap-commit] roadmap/src roadmap_copyright.h,1.31,1.32

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28731

Modified Files:
	roadmap_copyright.h 
Log Message:
bump to 1.2.0


Index: roadmap_copyright.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_copyright.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** roadmap_copyright.h	27 Jan 2009 01:53:41 -0000	1.31
--- roadmap_copyright.h	1 Feb 2009 01:59:46 -0000	1.32
***************
*** 27,31 ****
  #define INCLUDE__ROADMAP_COPYRIGHT__H
  
! #define ROADMAP_VERSION "1.2.0-pre"
  #define ROADMAP_YEAR    "2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009"
  
--- 27,31 ----
  #define INCLUDE__ROADMAP_COPYRIGHT__H
  
! #define ROADMAP_VERSION "1.2.0"
  #define ROADMAP_YEAR    "2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009"
  

[Roadmap-commit] roadmap/src/win32 Makefile,1.17,1.18

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23756

Modified Files:
	Makefile 
Log Message:
Remove CAB file dependencies


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Makefile	28 Jan 2009 19:57:08 -0000	1.17
--- Makefile	28 Jan 2009 20:59:52 -0000	1.18
***************
*** 49,53 ****
  	wince_input_mon.h
  
! TARGETS = wroadmap.exe wroadmap.cab demomaps.cab
  
  # --- The real targets --------------------------------------------
--- 49,54 ----
  	wince_input_mon.h
  
! TARGETS = wroadmap.exe
! # TARGETS += wroadmap.cab demomaps.cab
  
  # --- The real targets --------------------------------------------

[Roadmap-commit] roadmap/src/php Makefile,1.2,1.3

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src/php
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15128/php

Modified Files:
	Makefile 
Log Message:
make sure Makefile gets referenced by the sourcelist: target


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/php/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	28 Jun 2008 16:49:28 -0000	1.2
--- Makefile	28 Jan 2009 20:14:16 -0000	1.3
***************
*** 14,18 ****
  
  sourcelist:
! 	@echo $(SOURCE)
  
  
--- 14,18 ----
  
  sourcelist:
! 	@echo Makefile $(SOURCE)
  
  

[Roadmap-commit] roadmap/src/win32 Makefile,1.16,1.17

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12658

Modified Files:
	Makefile 
Log Message:
Add dependency on the icon file.


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	26 Jan 2009 19:46:37 -0000	1.16
--- Makefile	28 Jan 2009 19:57:08 -0000	1.17
***************
*** 88,92 ****
  
  WINDRES=$(CROSS)windres
! roadmap.rsc: roadmap.rc
  	$(WINDRES) -D_WIN32_WCE=0x0400 -D_WIN32_IE=0x0400 roadmap.rc roadmap.rsc
  
--- 88,92 ----
  
  WINDRES=$(CROSS)windres
! roadmap.rsc: roadmap.rc roadmap.ico
  	$(WINDRES) -D_WIN32_WCE=0x0400 -D_WIN32_IE=0x0400 roadmap.rc roadmap.rsc
  

[Roadmap-commit] roadmap/src/win32 roadmap.ico,1.1,1.2

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8252/win32

Modified Files:
	roadmap.ico 
Log Message:
This contains the 32x32 and 64x64 versions of fmiser's images, combined
into one .ico file. Windows CE appears to use both depending on
circumstances.


Index: roadmap.ico
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap.ico,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsD5ippW and /tmp/cvsV74ONV differ

[Roadmap-commit] roadmap/doc ChangeLog,1.4,1.5

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18488/doc

Modified Files:
	ChangeLog 
Log Message:
credit to fmiser for new icon


Index: ChangeLog
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog	27 Jan 2009 01:42:13 -0000	1.4
--- ChangeLog	27 Jan 2009 23:49:11 -0000	1.5
***************
*** 12,15 ****
--- 12,18 ----
   Items marked (*) originated on Ehud Shabtai's roadmap_editor code branch.
  
+   - New roadmap icon, designed by fmiser/Philip from the roadmap
+     mailing list.  Thanks Philip!!!
+ 
    - Support for building .rdm data from OpenStreetMap country snapshots,
      in addition to quadtiles.  Preparatory work for allowing navigation

[Roadmap-commit] roadmap/web Makefile,1.14,1.15

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/web
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv16962

Modified Files:
	Makefile 
Log Message:
fix favicon.ico rule



Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/web/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	27 Jan 2009 01:48:47 -0000	1.14
--- Makefile	27 Jan 2009 23:34:16 -0000	1.15
***************
*** 169,173 ****
  	    -e 's;http://'$(OUR_SITE_REFERENCE)'/;;' $@ 
  
! favicon.ico:
  	mkdir -p favicon.tmpdir
  	cd favicon.tmpdir ;\
--- 169,173 ----
  	    -e 's;http://'$(OUR_SITE_REFERENCE)'/;;' $@ 
  
! favicon.ico: ../src/icons/roadmap-64.png 
  	mkdir -p favicon.tmpdir
  	cd favicon.tmpdir ;\
***************
*** 177,181 ****
  	  for color in 16 256 ;\
  	  do \
! 	    pnmscale -xsize $$size -ysize $$size roadmap-32.pnm >favicon-$$size-.ppm ;\
  	    pnmcolormap $$color favicon-$$size-.ppm >favicon--$$color.ppm ;\
  	    pnmremap -mapfile=favicon--$$color.ppm favicon-$$size-.ppm >favicon-$$size-$$color.ppm ;\
--- 177,181 ----
  	  for color in 16 256 ;\
  	  do \
! 	    pnmscale -xsize $$size -ysize $$size roadmap-64.pnm >favicon-$$size-.ppm ;\
  	    pnmcolormap $$color favicon-$$size-.ppm >favicon--$$color.ppm ;\
  	    pnmremap -mapfile=favicon--$$color.ppm favicon-$$size-.ppm >favicon-$$size-$$color.ppm ;\

[Roadmap-commit] roadmap/src/icons Makefile, 1.16, 1.17 roadmap-16.png, 1.1, 1.2 roadmap-32.png, 1.1, 1.2 roadmap-48.png, 1.2, 1.3 roadmap-64.png, 1.2, 1.3 roadmap.png, 1.2, 1.3 roadmap-right.png, 1.2, NONE roadmap-small.png, 1.2, NONE

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src/icons
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9862

Modified Files:
	Makefile roadmap-16.png roadmap-32.png roadmap-48.png 
	roadmap-64.png roadmap.png 
Removed Files:
	roadmap-right.png roadmap-small.png 
Log Message:

switch to fmiser's (philip's) new icons.  should add his SVG
original at some point.

the -16 and -48 were generated from the -64 with:
    pngtopnm roadmap-64.png |
	pnmscale -xsize 16 -ysize 16 |
	pnmtopng >roadmap-16.png

roadmap.png is an exact copy of roadmap-48.png
roadmap-right.png and roadmap-small.png are no longer used, that i know of.



Index: roadmap.png
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/icons/roadmap.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsdw8Jn0 and /tmp/cvs4oqbMG differ

Index: roadmap-64.png
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/icons/roadmap-64.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsHaRz70 and /tmp/cvs4pGSwH differ

Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/icons/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	28 Jun 2008 16:49:28 -0000	1.16
--- Makefile	27 Jan 2009 22:14:40 -0000	1.17
***************
*** 42,47 ****
  	roadmap-48.png \
  	roadmap-64.png \
- 	roadmap-right.png \
- 	roadmap-small.png \
  	roadmap.png
  
--- 42,45 ----

--- roadmap-right.png DELETED ---

Index: roadmap-48.png
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/icons/roadmap-48.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsMktW6R and /tmp/cvsYsK4xy differ

Index: roadmap-16.png
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/icons/roadmap-16.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsdzLkQS and /tmp/cvsIthiiz differ

--- roadmap-small.png DELETED ---

Index: roadmap-32.png
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/icons/roadmap-32.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsLxjHQQ and /tmp/cvsjgCujx differ