Commit 1819d7fa authored by Fabian Klötzl's avatar Fabian Klötzl
Browse files

New upstream version 1.4.4

parent 5918ea4d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ out/*
FigTree*
tests/*
examples/*
.DS_Store
+34 −24
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@

    </target>

    <property name="version" value="1.4.3" />
    <property name="version_number" value="1.4.3" />
    <property name="version" value="1.4.4" />
    <property name="version_number" value="1.4.4" />
    <property name="release_dir" value="release" />
    <property name="name" value="FigTree" />

@@ -126,29 +126,25 @@
        <!-- Create the release directory -->
        <mkdir dir="${Windows_package_dir}" />

        <property name="launch4j.dir" location="./launch4j" />

        <property name="launch4j.dir" location="${packaging_tools}/windows/launch4j" />
        <taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask"
                 classpath="${launch4j.dir}/launch4j.jar :${launch4j.dir}/lib/xstream.jar"/>

        <copy file="${dist}/figtree.jar" todir="${Windows_package_dir}/lib"/>
        <!--
        <copy todir="${Windows_package_dir}/lib">
            <fileset dir="${Windows_dir}/lib"/>
        </copy>
        -->

        <copy todir="${Windows_package_dir}">
            <fileset dir="${common_dir}/"/>
        </copy>

        <launch4j configFile="${Windows_dir}/FigTree_launch4j.xml"
                  jar="${dist}/figtree.jar"
                  outfile="${Windows_package_dir}/${name} v${version}.exe"
                  fileVersion="${version_number}.0"
                  txtFileVersion="${version}"
                  productVersion="${version_number}.0"
                  txtProductVersion="${version}"
                />
                  txtProductVersion="${version}"/>

        <zip destfile="${release_dir}/${name} v${version}.zip">
            <zipfileset dir="${Windows_package_dir}" prefix="${name} v${version}"/>
@@ -157,7 +153,7 @@
        <echo message="Windows version release is finished." />
    </target>

    <target name="linux_unix_Release"
    <target name="linux_unix_Release" depends="dist"
            description="release Linux/Unix version of FigTree">
        <delete dir="${Linux_package_dir}" />
        <!-- Create the release directory -->
@@ -185,7 +181,9 @@
        <echo message="Linux/Unix version release is finished." />
    </target>

    <target name="mac_release"
    <property name="AppleSigner" value="Developer ID Application: Andrew Rambaut (9E4WXAQ6SE)" />

    <target name="mac_release" depends="dist"
            description="release Mac version of FigTree">
        <delete dir="${Mac_package_dir}" />
        <!-- Create the release directory -->
@@ -200,7 +198,7 @@
            <fileset dir="${Mac_dir}/QuickLook Plugin"/>
        </copy>

        <taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler"/>
        <taskdef name="jarbundler" classname="com.ultramixer.jarbundler.JarBundler"/>

        <!-- create a jar bundle for the mac -->
        <jarbundler dir="${Mac_package_dir}"
@@ -210,11 +208,12 @@
                    stubfile="${packaging_tools}/mac/universalJavaApplicationStub"
					useJavaXKey="true"
                    jvmversion="1.6+"
                    vmoptions="-Xmx1024M"
                    vmoptions="-Xmx4096M"
                    highresolutioncapable="true"
                    arguments=""
                    version="${version}"
                    build="1"
                    copyright="${name} v${version}, Copyright 2006-2015, Andrew Rambaut"
                    copyright="${name} v${version}, Copyright 2006-2018, Andrew Rambaut"
                    bundleid="figtree" >
            <javaproperty name="apple.laf.useScreenMenuBar" value="true"/>
            <jarfileset dir="${dist}">
@@ -232,17 +231,21 @@
                          role="Editor"/>
        </jarbundler>

        <!-- remove code signing -->
        <!--
        <exec executable="/usr/bin/codesign">
        <!-- code signing -->
        <exec executable="codesign">
            <arg value="--deep"/>
            <arg value="-s"/>
            <arg value="-"/>
            <arg value="- -force"/> remove space from between minus signs
            <arg value="${Mac_dir}/${name} v${version}/${name} v${version}.app"/>
            <arg value="${AppleSigner}"/>
            <arg value="-v"/>
            <arg value="${Mac_package_dir}/${name} v${version}.app"/>
        </exec>
		-->

        <echo message="Building disk image." />
        <!-- checking code signing -->
        <exec executable="spctl">
            <arg value="--assess"/>
            <arg value="--verbose=4"/>
            <arg value="${Mac_package_dir}/${name} v${version}.app"/>
        </exec>

        <!-- create disk image -->
        <exec executable="/usr/bin/hdiutil">
@@ -257,6 +260,13 @@
            <arg value="${release_dir}/${name} v${version}.dmg"/>
        </exec>

        <exec executable="codesign">
            <arg value="-s"/>
            <arg value="${AppleSigner}"/>
            <arg value="-v"/>
            <arg value="${release_dir}/${name} v${version}.dmg"/>
        </exec>

        <echo message="Mac version release is finished." />
    </target>

doc/large_trees.md

0 → 100644
+15 −0
Original line number Diff line number Diff line

If you open a large tree (in this case 1610 tips) you will see a complete mess:
![shot1](https://github.com/rambaut/figtree/blob/master/doc/shot1.png)

This is because the default tip label font size is too large. This means that the labels overlap but also take up most of the horizontal screen space, crushing the tree to the left. To fix this, you can shrink the font size (the minimum at the moment is 2pt):
![shot2](https://github.com/rambaut/figtree/blob/master/doc/shot2.png)

So now zoom the tree in the vertical axis only using the 'Expand' slider until the labels aren't overlapping any more. Essentially this creates a very long tree (that you can scroll up and down).
![shot3](https://github.com/rambaut/figtree/blob/master/doc/shot3.png)

Now export as a PDF and you get a PDF of the same aspect ratio:
![shot5](https://github.com/rambaut/figtree/blob/master/doc/shot5.png)

You can zoom in or create a multi-page print out (or a long poster on a continuous roll printer):
![shot4](https://github.com/rambaut/figtree/blob/master/doc/shot4.png)

doc/shot1.png

0 → 100644
+442 KiB
Loading image diff...

doc/shot2.png

0 → 100644
+546 KiB
Loading image diff...
Loading