diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-11-08 22:51:43 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-11-08 22:51:43 +0000 |
| commit | 16617cc3f8e4692b2f76e99347a82eb7572bdefa (patch) | |
| tree | 9c97fa99dc5eb5a0255ea03721f413d55d4bfcf4 /share | |
| parent | working on roughen (diff) | |
| parent | merge of branch lp:~inkscape.dev/inkscape/spraytool-no-overlap (diff) | |
| download | inkscape-16617cc3f8e4692b2f76e99347a82eb7572bdefa.tar.gz inkscape-16617cc3f8e4692b2f76e99347a82eb7572bdefa.zip | |
update to trunk
(bzr r14422.3.3)
Diffstat (limited to 'share')
| -rwxr-xr-x | share/extensions/dxf_input.py | 2 | ||||
| -rw-r--r-- | share/extensions/image_attributes.inx | 2 | ||||
| -rw-r--r-- | share/filters/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | share/palettes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | share/patterns/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | share/symbols/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | share/templates/CMakeLists.txt | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py index 362f35be9..acfed0921 100755 --- a/share/extensions/dxf_input.py +++ b/share/extensions/dxf_input.py @@ -35,7 +35,7 @@ def export_MTEXT(): y = vals[groups['20']][0] # optional group codes : (21, 40, 50) (direction, text height mm, text angle) size = 12 # default fontsize in px - if vals[groups['40']]: + if vals[groups['40']] and vals[groups['40']][0]: size = scale*vals[groups['40']][0] attribs = {'x': '%f' % x, 'y': '%f' % y, 'style': 'font-size: %.1fpx; fill: %s; font-family: %s' % (size, color, options.font)} angle = 0 # default angle in degrees diff --git a/share/extensions/image_attributes.inx b/share/extensions/image_attributes.inx index a353d17e5..d9ae9cefb 100644 --- a/share/extensions/image_attributes.inx +++ b/share/extensions/image_attributes.inx @@ -14,7 +14,7 @@ <_param name="basic_desc1" type="description">Render all bitmap images like in older Inskcape versions. Available options:</_param> - <param name="fix_scaling" type="boolean" _gui-text="Support non-unifom scaling">true</param> + <param name="fix_scaling" type="boolean" _gui-text="Support non-uniform scaling">true</param> <param name="fix_rendering" type="boolean" _gui-text="Render images blocky">false</param> </page> diff --git a/share/filters/CMakeLists.txt b/share/filters/CMakeLists.txt index 6b5356e53..7f9708c52 100644 --- a/share/filters/CMakeLists.txt +++ b/share/filters/CMakeLists.txt @@ -1,10 +1,10 @@ add_custom_command( - OUTPUT filters.svg.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ) -add_custom_target(filters.svg.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h) +add_custom_target(filters_svg_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/filters) install(FILES "filters.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/filters) diff --git a/share/palettes/CMakeLists.txt b/share/palettes/CMakeLists.txt index 77b4b2a37..924e35e5a 100644 --- a/share/palettes/CMakeLists.txt +++ b/share/palettes/CMakeLists.txt @@ -6,7 +6,7 @@ add_custom_command( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} ) -add_custom_target(palettes.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/palettes.h) +add_custom_target(palettes_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/palettes.h) file(GLOB _FILES "*.gpl") diff --git a/share/patterns/CMakeLists.txt b/share/patterns/CMakeLists.txt index 98415b225..de4a44797 100644 --- a/share/patterns/CMakeLists.txt +++ b/share/patterns/CMakeLists.txt @@ -4,7 +4,7 @@ add_custom_command( MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ) -add_custom_target(patterns.svg.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h) +add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/patterns) -install(FILES "patterns.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/patterns)
\ No newline at end of file +install(FILES "patterns.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/patterns) diff --git a/share/symbols/CMakeLists.txt b/share/symbols/CMakeLists.txt index ef44c89e4..b578ff851 100644 --- a/share/symbols/CMakeLists.txt +++ b/share/symbols/CMakeLists.txt @@ -6,6 +6,6 @@ add_custom_command( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} ) -add_custom_target(symbols.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/symbols.h) +add_custom_target(symbols_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/symbols.h) install(FILES ${_FILES} "README" ${CMAKE_CURRENT_BINARY_DIR}/symbols.h DESTINATION ${SHARE_INSTALL}/inkscape/symbols) diff --git a/share/templates/CMakeLists.txt b/share/templates/CMakeLists.txt index eee5b4458..af79e2ec5 100644 --- a/share/templates/CMakeLists.txt +++ b/share/templates/CMakeLists.txt @@ -6,6 +6,6 @@ add_custom_command( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} ) -add_custom_target(templates.h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/templates.h) +add_custom_target(templates_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/templates.h) install(FILES ${_FILES} "README" ${CMAKE_CURRENT_BINARY_DIR}/templates.h DESTINATION ${SHARE_INSTALL}/inkscape/templates) |