sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into harfbuzz

Browse source
This commit is contained in:
Hermann Kraus 2012-06-28 23:01:34 +02:00
commit 1c9babf9e2
2 changed files with 52 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
tests/visual_tests/styles/harfbuzz.xml Normal file
View file

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE Map>
<Map background-color="white" srs="+proj=latlong +datum=WGS84">
<Layer name="layer" srs="+proj=latlong +datum=WGS84">
<StyleName>My Style</StyleName>
<Datasource>
<Parameter name="type">shape</Parameter>
<Parameter name="file">../data/points.shp</Parameter>
</Datasource>
</Layer>
<Style name="My Style">
<Rule>
<PointSymbolizer/>
</Rule>
<Rule>
<!-- This is an easy test to ensure text shaping actually works. Ligatures are rendered when harfbuzz is used, but not with the old text rendering system. -->
<Filter>[nr] = "1"</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="16">"fi"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="-16">"ff"</TextSymbolizer>
</Rule>
<Rule>
<!-- In addition to the problem mentioned in the bug report (which seems to be gone) this the position is calculated incorrectly -->
<Filter>[nr] = "3"</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="16">"نامجو 17"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dy="-16">"#519"</TextSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = "5"</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="-16">"زنقة الملاح"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dy="16">"#1154"</TextSymbolizer>
</Rule>
<Rule>
<!--TODO: Find suitable font! -->
<Filter>[nr] = "7"</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="16">"អក្សរខ្មែរ"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dy="-16">"#1208"</TextSymbolizer>
</Rule>
<Rule>
<Filter>[nr] = "9"</Filter>
<TextSymbolizer face-name="DejaVu Sans Book" size="36" placement="point" dy="-16">"أڭادير"</TextSymbolizer>
<TextSymbolizer face-name="DejaVu Sans Book" size="10" placement="point" dy="16">"#1146"</TextSymbolizer>
</Rule>
</Style>
</Map>

9
tests/visual_tests/test.py
View file

@ -44,7 +44,8 @@ files = [
{'name': "rtl-point", 'sizes': [(200, 200)]},
{'name': "jalign-auto", 'sizes': [(200, 200)]},
{'name': "line-offset", 'sizes':[(900, 250)],
'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)}
'bbox': mapnik.Box2d(-5.192, 50.189, -5.174, 50.195)},
{'name': "harfbuzz"},
]
def render(filename, width, height, bbox, quiet=False):
@ -78,9 +79,11 @@ if __name__ == "__main__":
quiet = False
if len(sys.argv) == 2:
files = [(sys.argv[1], (500, 500))]
files = [{"name": sys.argv[1], "sizes": sizes_few_square}]
elif len(sys.argv) > 2:
files = [sys.argv[1:]]
files = []
for name in argv[1:]:
files.append({"name": name})
for f in files:
config = dict(defaults)