Fix:build/cmake:Fixed setting of medium sized icons

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4779 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/CMakeLists.txt b/navit/navit/CMakeLists.txt
index d00373f..a5cb572 100644 (file)
--- a/navit/navit/CMakeLists.txt
+++ b/navit/navit/CMakeLists.txt
@@ -112,7 +112,8 @@ ADD_CUSTOM_TARGET(
                     -P ${PROJECT_SOURCE_DIR}/cmake/version.cmake
 )
 
-macro(process_xslt SRC_XML DEST_XML XSL_OPTIONS)
+# additional parameter are passed to the stylesheet processor as parameter
+macro(process_xslt SRC_XML DEST_XML)
    set(XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E copy ${SRC_XML} ${DEST_XML}
                      COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/navit/navit.dtd ${CMAKE_CURRENT_BINARY_DIR}/navit.dtd)
    if(XSL_PROCESSING AND XSLTS)
@@ -121,11 +122,11 @@ macro(process_xslt SRC_XML DEST_XML XSL_OPTIONS)
           set (XSLT_FILE "${PROJECT_SOURCE_DIR}/navit/xslt/${tmp}.xslt")
           list(APPEND XSLT_FILES "${XSLT_FILE}")
           list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E echo  Applying ${tmp}.xslt)
-         if(${XSLT_PROCESSOR} MATCHES "xsltproc")
+          if(${XSLT_PROCESSOR} MATCHES "xsltproc")
              list(APPEND XSLT_COMMANDS COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${XSLT_FILE} ${DEST_XML} > ${DEST_XML}.tmp)
           else()
-             list(APPEND XSLT_COMMANDS COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${DEST_XML} ${XSLT_FILE} ${XSL_OPTIONS} > ${DEST_XML}.tmp)
-         endif()
+             list(APPEND XSLT_COMMANDS COMMAND ${XSLT_PROCESSOR} ${XSLT_PROCESSOR_OPTIONS} ${DEST_XML} ${XSLT_FILE} ${ARGN} > ${DEST_XML}.tmp)
+          endif()
           list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename ${DEST_XML}.tmp ${DEST_XML})
        endforeach()
    endif()
@@ -137,9 +138,9 @@ macro(process_xslt SRC_XML DEST_XML XSL_OPTIONS)
 endmacro()
 
 if(ANDROID)
-   process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navithdpi.xml OSD_SIZE=2)
+   process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navithdpi.xml OSD_SIZE=2 ICON_MEDIUM=48)
    process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitmdpi.xml OSD_SIZE=1.33)
-   process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitldpi.xml OSD_SIZE=1 ICON_MEDIUM=48)
+   process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navitldpi.xml OSD_SIZE=1)
    add_custom_target( navit_config_xml ALL DEPENDS navithdpi.xml navitmdpi.xml navitldpi.xml)
 else()
    process_xslt(${CMAKE_CURRENT_SOURCE_DIR}/navit_shipped.xml ${CMAKE_CURRENT_BINARY_DIR}/navit.xml "")

diff --git a/navit/navit/xslt/android.xslt b/navit/navit/xslt/android.xslt
index 3efe668..eae0173 100644 (file)
--- a/navit/navit/xslt/android.xslt
+++ b/navit/navit/xslt/android.xslt
@@ -4,7 +4,7 @@
    <xsl:param name="ICON_SMALL" select="32"/>
    <xsl:param name="ICON_MEDIUM" select="32"/>
    <xsl:param name="ICON_BIG" select="64"/>
-   
+
    <xsl:output method="xml" doctype-system="navit.dtd" cdata-section-elements="gui"/>
    <xsl:include href="default_plugins.xslt"/>
    <xsl:include href="map_sdcard_navitmap_bin.xslt"/>
@@ -26,8 +26,8 @@
       <xsl:copy>
          <xsl:copy-of select="@*[not(name()='font_size')]"/>
          <xsl:attribute name="font_size"><xsl:value-of select="round(185*number($OSD_SIZE))"/></xsl:attribute>
-         <xsl:attribute name="icon_xs"><xsl:value-of select="number($ICON_MEDIUM)"/></xsl:attribute>
-         <xsl:attribute name="icon_s"><xsl:value-of select="number($ICON_SMALL)"/></xsl:attribute>
+         <xsl:attribute name="icon_xs"><xsl:value-of select="number($ICON_SMALL)"/></xsl:attribute>
+         <xsl:attribute name="icon_s"><xsl:value-of select="number($ICON_MEDIUM)"/></xsl:attribute>
          <xsl:attribute name="icon_l"><xsl:value-of select="number($ICON_BIG)"/></xsl:attribute>
          <xsl:attribute name="spacing"><xsl:value-of select="round(2*number($OSD_SIZE))"/></xsl:attribute>
          <xsl:apply-templates/>