Merge lp:~benm/gnuclad/yearinterval into lp:gnuclad

[Ben Moss]

Merged year label interval branch from Ben Moss.
Merged conf file fixes from Ben Moss.

I am editing a book of memoirs and I used gnuclad to generate a family tree. The family tree spans over two centures, and having a label for every year was wasting too much space on the page.

I added a 'yearLabelInterval' parameter to the .conf file. Setting 'yearLabelInterval = 1' (the default) makes gnuclad behave as it did before, with a label for every year on the ruler. Setting 'yearLabelInterval = 10' makes a year label only once each decade. I also added a second parameter to the .conf file, 'rulerUnlabeledYearWidth'. This parameter sets the width of the line for years that are not labeled, i.e. a year in the middle of a decade.

To test, please run example.conf in the example/ directory (yearLabelInterval = 3):

> gnuclad example.csv example.svg example.conf

I tested this code on the GLDT diagram and the changes do not appear to affect that project.

[Donjan Rodic (bryonak)]

On 19/12/11 02:08, Ben Moss wrote:
> Ben Moss has proposed merging lp:~benm/gnuclad/yearinterval into lp:gnuclad.
>
> Requested reviews:
> Donjan Rodic (bryonak)
>
> For more details, see:
> https://code.launchpad.net/~benm/gnuclad/yearinterval/+merge/86185
>
> I am editing a book of memoirs and I used gnuclad to generate a family tree. The family tree spans over two centures, and having a label for every year was wasting too much space on the page.
>
> I added a 'yearLabelInterval' parameter to the .conf file. Setting 'yearLabelInterval = 1' (the default) makes gnuclad behave as it did before, with a label for every year on the ruler. Setting 'yearLabelInterval = 10' makes a year label only once each decade. I also added a second parameter to the .conf file, 'rulerUnlabeledYearWidth'. This parameter sets the width of the line for years that are not labeled, i.e. a year in the middle of a decade.
>
> To test, please run example.conf in the example/ directory (yearLabelInterval = 3):
>
>> gnuclad example.csv example.svg example.conf
> I tested this code on the GLDT diagram and the changes do not appear to affect that project.

Hey Ben

Thanks for the pull request! I've been busy with lots of other stuff
lately, so gnuclad is not among the top priorities right now, but I'll
merge it within the next few days.

Wish you a happy new year

cheers
Donjan

[Donjan Rodic (bryonak)]

review: Approve

[Donjan Rodic (bryonak)]

Merged with tiny change.
Thanks, also for the conf file fixes!

=== modified file '.bzrignore' (properties changed: -x to +x)
=== modified file 'AUTHORS' (properties changed: -x to +x)
=== modified file 'COPYING' (properties changed: -x to +x)
=== modified file 'ChangeLog' (properties changed: -x to +x)
=== modified file 'INSTALL' (properties changed: -x to +x)
=== modified file 'Makefile.am' (properties changed: -x to +x)
=== modified file 'Makefile.in' (properties changed: -x to +x)
=== modified file 'NEWS' (properties changed: -x to +x)
=== modified file 'README' (properties changed: -x to +x)
=== modified file 'ToDo' (properties changed: -x to +x)
=== modified file 'aclocal.m4' (properties changed: -x to +x)
=== modified file 'build-aux/texinfo.tex' (properties changed: -x to +x)
=== modified file 'config.h.in' (properties changed: -x to +x)
=== modified file 'configure.ac' (properties changed: -x to +x)
=== modified file 'doc/index.html' (properties changed: -x to +x)
=== modified file 'doc/man/gnuclad.1' (properties changed: -x to +x)
=== modified file 'doc/src/Makefile' (properties changed: -x to +x)
=== modified file 'doc/src/Makefile.am' (properties changed: -x to +x)
=== modified file 'doc/src/Makefile.in' (properties changed: -x to +x)
=== modified file 'doc/src/fdl.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-about.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-config.texi' (properties changed: -x to +x)
--- doc/src/gnuclad-config.texi	2010-08-10 15:35:10 +0000
+++ doc/src/gnuclad-config.texi	2011-12-19 01:07:36 +0000
@@ -31,7 +31,7 @@
 @example
 # gnuclad config file
 
-# This configuration file has been generated by gnuclad 0.2.2
+# This configuration file has been generated by gnuclad 0.2.4
 
 # If you comment or delete an option,
 # gnuclad will use the built-in defaults.
@@ -107,7 +107,10 @@
 mainBackground = #fff
 
 # Customise the background lines separating the years and months
+# rulerWidth is the width of a year line when a year label is present (see yearLabelInterval below)
+# rulerUnlabeledYearWidth is the width of a year line without a year label.
 rulerWidth = 2
+rulerUnlabeledYearWidth = 2
 rulerColor = #ddd
 rulerMonthWidth = 1
 rulerMonthColor = #eee
@@ -188,12 +191,15 @@
 yearLineFontSize = 28
 yearLineFontColor = #fff
 
-How many (empty) years to append at the end
+# How many (empty) years to append at the end
 appendYears = 0
 
-How many (empty) years to prepend at the beginning
+# How many (empty) years to prepend at the beginning
 prependYears = 0
 
+# How many years between year labels
+yearLabelInterval = 1
+
 # Remember to adjust your input data after changing these averages.
 daysInMonth = 30
 monthsInYear = 12
@@ -210,9 +216,9 @@
 dir_showDotFiles = 0
 
 # Color of files, directories and links
-dir_colorFile = 0ff
-dir_colorDir = 00f
-dir_colorLink = 0f0
+dir_colorFile = #0ff
+dir_colorDir = #00f
+dir_colorLink = #0f0
 
 # Directories with greater than specified size will get a domain of
 # the given intensity (0-100). Set size = 0 to turn off.

=== modified file 'doc/src/gnuclad-faq.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-programming-classes.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-programming-config.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-programming-generator.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-programming-helpers.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-programming-parser.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-programming.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-tips.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad-usage.texi' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/About.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Classes.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Config-Options.html' (properties changed: -x to +x)
--- doc/src/gnuclad.html/Config-Options.html	2011-04-01 17:59:24 +0000
+++ doc/src/gnuclad.html/Config-Options.html	2011-12-19 01:07:36 +0000
@@ -68,196 +68,203 @@
 
 <h3 class="section">4.3 Detail</h3>
 
-<pre class="example">     # gnuclad config file
-     
-     # This configuration file has been generated by gnuclad 0.2.2
-     
-     # If you comment or delete an option,
-     # gnuclad will use the built-in defaults.
-     # Allowed syntax is:
-     #   option=value
-     #   option = value
-     #   option= 'value'
-     #   option ="value"
-     #   option = three word value
-     #   option = "three word value"
-     #   ...
-     
-     
-     # Show debug information when running gnuclad. (0 = off, 1 = on)
-     debug = 0
-     
-     # Modify the appearance of your info box
-     # To disable the box:
-     # Set both font size parameters to 0, set the width and height to 0
-     infoBoxTitle = Title
-     infoBoxTitleSize = 18
-     infoBoxText = Lorem ipsum dolor sit amet,
-     infoBoxText = consectetuer adipiscing elit
-     infoBoxTextSize = 12
-     infoBoxFont = Liberation Sans, Arial, Helvetica
-     infoBoxFontColor = #000
-     infoBoxColor1 = #51b1f1
-     infoBoxColor2 = #3181f1
-     infoBoxX = 10
-     infoBoxY = 45
-     infoBoxWidth = 166
-     infoBoxHeight = 60
-     
-     # Slice one node name with children, ignore the rest.
-     slice =
-     
-     # Correction factor for font pixel width/height.
-     # It is normalised for Liberation Sans (= Arial) and will
-     # affect the alignment of all text in your output. Since this
-     # one option affects all text instances, it's recommended
-     # to use 'similarly spaced' fonts throughout your settings.
-     fontCorrectionFactor = 1
-     
-     # Orientation of the timeline
-     # 0 = left to right, 1 = top to bottom
-     # 2 = right to left, 3 = bottom to top
-     orientation = 0
-     
-     # The layout of the tree
-     # 0 = branch to both sides
-     # 1 = branch only on lower side
-     # 2 = branch only on lower side, inverse (good for CSV output)
-     treeMode = 0
-     
-     # Chose: 0 = don't presort, 1 = by name, 2 = by date
-     sortKey = 0
-     
-     # Set optimisation between 0 and 99. See manual for details.
-     # First digit: isolated nodes. Second digit: trees.
-     optimise = 99
-     
-     # This guesses if optimisation should overlap in some rare cases
-     # 1 = forbid overlaps, 0 = allow overlaps (better optimisation)
-     strictOverlaps = 0
-     
-     # How much space (in offsets) to add before/after trees
-     treeSpacing = 1
-     
-     # How big (total children) a tree has to be before it gets spaced
-     treeSpacingBiggerThan = 5
-     
-     # Background color in hexadecimal RGB (#abc or #abcdef)
-     mainBackground = #fff
-     
-     # Customise the background lines separating the years and months
-     rulerWidth = 2
-     rulerColor = #ddd
-     rulerMonthWidth = 1
-     rulerMonthColor = #eee
-     
-     # Width of all node lines
-     lineWidth = 2
-     
-     # Number of pixels between node lines (== 1 offset)
-     offsetPX = 20
-     
-     # Set to 0 if you want 'dying' lines to stop abruptly
-     stopFadeOutPX = 30
-     
-     # When optimising, gnuclad will inline nodes if possible. This sets
-     # the minimum time distance between the stop of one node and the
-     # start of another which will allow the latter to get appended.
-     # Format: 'y.m.d' or 'y.m' or 'y' (year, month, day)
-     stopSpacing = 0.2
-     
-     # How many pixels one year should have
-     yearPX = 100
-     
-     # Customise the node labels
-     labelFont = Liberation Sans, Arial, Helvetica
-     labelFontSize = 16
-     labelFontColor = #000
-     
-     # An experimental feature you might want to use with derivType &gt; 1
-     # Opacity takes values between 0 (transparent) and 100 (opaque).
-     # It DOES NOT work flawlessly with SVG 1.1 output.
-     # (hoping for v1.2 or CSS3 ...)
-     labelBGOpacity = 0
-     
-     # This sets the heuristic used for determining label background width
-     # 0 = standard, will sometimes generate suboptimal width values
-     # 1 = improved, but only if the majority of your characters fall into
-     #               the ASCII charset and you use a fairly standard font
-     #               playing around with fontCorrectionFactor might help
-     asciiStrings = 0
-     
-     # Useful if you want to use the renames only as version bumps.
-     # 0 = rename above the dot to the right, like the first name
-     # 1 = rename centered within the dot
-     nameChangeType = 0
-     
-     # Set the way the lines should derive from the parent.
-     # 0 = orthogonal, 1 = from parent's starting point
-     # 2 = diagonal (45 degrees)
-     # 3 = curved (1 year wide curves), 4 = curved (quadratic scaling)
-     # 5 = curved (from parent's starting point)
-     derivType = 0
-     
-     # The size of the node dots
-     dotRadius = 10
-     smallDotRadius = 5
-     
-     # Determines how the dots look.
-     # 0 = full dots, 1 = circles
-     # Circles might be useful together with nameChangeType = 1
-     dotType = 0
-     
-     # Specifies the amount a node's line thickness should increase
-     # relative to the count of it's children. (recommended 0.0 - 1.0)
-     bigParent = 0
-     
-     # Adds small half-circles to connector starting points
-     connectorDots = 1
-     
-     # 1 = connectors have a dashed stroke
-     # 0 = connectors are full lines
-     connectorsDashed = 1
-     
-     # Customise the year line encompassing the cladogram.
-     yearLinePX = 40
-     yearLineColor1 = #037
-     yearLineColor2 = #37d
-     yearLineFont = Liberation Sans, Arial, Helvetica
-     yearLineFontSize = 28
-     yearLineFontColor = #fff
-     
-     How many (empty) years to append at the end
-     appendYears = 0
-     
-     How many (empty) years to prepend at the beginning
-     prependYears = 0
-     
-     # Remember to adjust your input data after changing these averages.
-     daysInMonth = 30
-     monthsInYear = 12
-     
-     # Not setting endOfTime will use the current date.
-     #endOfTime = 2012.12
-     
-     # How the description field should be used.
-     # 0 = ignore
-     # 1 = weblink URL
-     descriptionType = 0
-     
-     # When parsing direcories, show dot (hidden) files (0 = off, 1 = on)
-     dir_showDotFiles = 0
-     
-     # Color of files, directories and links
-     dir_colorFile = 0ff
-     dir_colorDir = 00f
-     dir_colorLink = 0f0
-     
-     # Directories with greater than specified size will get a domain of
-     # the given intensity (0-100). Set size = 0 to turn off.
-     dir_domainSize = 0
-     dir_domainIntensity = 3
-     
+<pre class="example">     
+	# gnuclad config file
+	
+	# This configuration file has been generated by gnuclad 0.2.4
+	
+	# If you comment or delete an option,
+	# gnuclad will use the built-in defaults.
+	# Allowed syntax is:
+	#   option=value
+	#   option = value
+	#   option= 'value'
+	#   option ="value"
+	#   option = three word value
+	#   option = "three word value"
+	#   ...
+
+
+	# Show debug information when running gnuclad. (0 = off, 1 = on)
+	debug = 0
+
+	# Modify the appearance of your info box
+	# To disable the box:
+	# Set both font size parameters to 0, set the width and height to 0
+	infoBoxTitle = Title
+	infoBoxTitleSize = 18
+	infoBoxText = Lorem ipsum dolor sit amet,
+	infoBoxText = consectetuer adipiscing elit
+	infoBoxTextSize = 12
+	infoBoxFont = Liberation Sans, Arial, Helvetica
+	infoBoxFontColor = #000
+	infoBoxColor1 = #51b1f1
+	infoBoxColor2 = #3181f1
+	infoBoxX = 10
+	infoBoxY = 45
+	infoBoxWidth = 166
+	infoBoxHeight = 60
+
+	# Slice one node name with children, ignore the rest.
+	slice = 
+
+	# Correction factor for font pixel width/height.
+	# It is normalised for Liberation Sans (= Arial) and will
+	# affect the alignment of all text in your output. Since this
+	# one option affects all text instances, it's recommended
+	# to use 'similarly spaced' fonts throughout your settings.
+	fontCorrectionFactor = 1
+
+	# Orientation of the timeline
+	# 0 = left to right, 1 = top to bottom
+	# 2 = right to left, 3 = bottom to top
+	orientation = 0
+
+	# The layout of the tree
+	# 0 = branch to both sides
+	# 1 = branch only on lower side
+	# 2 = branch only on lower side, inverse (good for CSV output)
+	treeMode = 0
+
+	# Chose: 0 = don't presort, 1 = by name, 2 = by date
+	sortKey = 0
+
+	# Set optimisation between 0 and 99. See manual for details.
+	# First digit: isolated nodes. Second digit: trees.
+	optimise = 99
+
+	# This guesses if optimisation should overlap in some rare cases
+	# 1 = forbid overlaps, 0 = allow overlaps (better optimisation)
+	strictOverlaps = 0
+
+	# How much space (in offsets) to add before/after trees
+	treeSpacing = 1
+
+	# How big (total children) a tree has to be before it gets spaced
+	treeSpacingBiggerThan = 5
+
+	# Background color in hexadecimal RGB (#abc or #abcdef)
+	mainBackground = #fff
+
+	# Customise the background lines separating the years and months
+	# rulerWidth is the width of a year line when a year label is present (see yearLabelInterval below)
+	# rulerUnlabeledYearWidth is the width of a year line without a year label.
+	rulerWidth = 2
+	rulerUnlabeledYearWidth = 2
+	rulerColor = #ddd
+	rulerMonthWidth = 1
+	rulerMonthColor = #eee
+
+	# Width of all node lines
+	lineWidth = 2
+
+	# Number of pixels between node lines (== 1 offset)
+	offsetPX = 20
+
+	# Set to 0 if you want 'dying' lines to stop abruptly
+	stopFadeOutPX = 30
+
+	# When optimising, gnuclad will inline nodes if possible. This sets
+	# the minimum time distance between the stop of one node and the
+	# start of another which will allow the latter to get appended.
+	# Format: 'y.m.d' or 'y.m' or 'y' (year, month, day)
+	stopSpacing = 0.2
+
+	# How many pixels one year should have
+	yearPX = 100
+
+	# Customise the node labels
+	labelFont = Liberation Sans, Arial, Helvetica
+	labelFontSize = 16
+	labelFontColor = #000
+
+	# An experimental feature you might want to use with derivType > 1
+	# Opacity takes values between 0 (transparent) and 100 (opaque).
+	# It DOES NOT work flawlessly with SVG 1.1 output.
+	# (hoping for v1.2 or CSS3 ...)
+	labelBGOpacity = 0
+
+	# This sets the heuristic used for determining label background width
+	# 0 = standard, will sometimes generate suboptimal width values
+	# 1 = improved, but only if the majority of your characters fall into
+	#               the ASCII charset and you use a fairly standard font
+	#               playing around with fontCorrectionFactor might help
+	asciiStrings = 0
+
+	# Useful if you want to use the renames only as version bumps.
+	# 0 = rename above the dot to the right, like the first name
+	# 1 = rename centered within the dot
+	nameChangeType = 0
+
+	# Set the way the lines should derive from the parent.
+	# 0 = orthogonal, 1 = from parent's starting point
+	# 2 = diagonal (45 degrees)
+	# 3 = curved (1 year wide curves), 4 = curved (quadratic scaling)
+	# 5 = curved (from parent's starting point)
+	derivType = 0
+
+	# The size of the node dots
+	dotRadius = 10
+	smallDotRadius = 5
+
+	# Determines how the dots look.
+	# 0 = full dots, 1 = circles
+	# Circles might be useful together with nameChangeType = 1
+	dotType = 0
+
+	# Specifies the amount a node's line thickness should increase
+	# relative to the count of it's children. (recommended 0.0 - 1.0)
+	bigParent = 0
+
+	# Adds small half-circles to connector starting points
+	connectorDots = 1
+
+	# 1 = connectors have a dashed stroke
+	# 0 = connectors are full lines
+	connectorsDashed = 1
+
+	# Customise the year line encompassing the cladogram.
+	yearLinePX = 40
+	yearLineColor1 = #037
+	yearLineColor2 = #37d
+	yearLineFont = Liberation Sans, Arial, Helvetica
+	yearLineFontSize = 28
+	yearLineFontColor = #fff
+
+	# How many (empty) years to append at the end
+	appendYears = 0
+
+	# How many (empty) years to prepend at the beginning
+	prependYears = 0
+
+	# How many years between year labels
+	yearLabelInterval = 1
+
+	# Remember to adjust your input data after changing these averages.
+	daysInMonth = 30
+	monthsInYear = 12
+
+	# Not setting endOfTime will use the current date.
+	#endOfTime = 2012.12
+
+	# How the description field should be used.
+	# 0 = ignore
+	# 1 = weblink URL
+	descriptionType = 0
+
+	# When parsing direcories, show dot (hidden) files (0 = off, 1 = on)
+	dir_showDotFiles = 0
+
+	# Color of files, directories and links
+	dir_colorFile = #0ff
+	dir_colorDir = #00f
+	dir_colorLink = #0f0
+
+	# Directories with greater than specified size will get a domain of
+	# the given intensity (0-100). Set size = 0 to turn off.
+	dir_domainSize = 0
+	dir_domainIntensity = 3
+	     
 </pre>
 <!-- Part of the gnuclad texinfo manual -->
    </body></html>

=== modified file 'doc/src/gnuclad.html/Configuration-Options.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/FAQ.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/GNU-Free-Documentation-License.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Helpers-and-Utilities.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Index.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Programming.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Usage-Tips.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Usage.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Writing-a-generator.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/Writing-a-parser.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.html/index.html' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.info' (properties changed: -x to +x)
=== modified file 'doc/src/gnuclad.texi' (properties changed: -x to +x)
=== modified file 'doc/src/stamp-vti' (properties changed: -x to +x)
=== modified file 'doc/src/version.texi' (properties changed: -x to +x)
=== modified file 'example/dir.conf' (properties changed: -x to +x)
=== modified file 'example/example.conf' (properties changed: -x to +x)
--- example/example.conf	2010-06-20 22:21:03 +0000
+++ example/example.conf	2011-12-19 01:07:36 +0000
@@ -36,7 +36,8 @@
 treeMode = 0
 
 mainBackground = #fff
-rulerWidth = 2
+rulerWidth = 4
+rulerUnlabeledYearWidth = 2
 rulerColor = #ddd
 rulerMonthWidth = 1
 rulerMonthColor = #eaeaea
@@ -56,4 +57,6 @@
 dotRadius = 10
 smallDotRadius = 5
 
-descriptionType = 1
\ No newline at end of file
+yearLabelInterval = 3
+descriptionType = 1
+

=== modified file 'example/example.csv' (properties changed: -x to +x)
=== modified file 'example/example2.conf' (properties changed: -x to +x)
=== modified file 'example/images/foo.png' (properties changed: -x to +x)
=== modified file 'example/images/foo.svg' (properties changed: -x to +x)
=== modified file 'example/images/icon.png' (properties changed: -x to +x)
=== modified file 'example/images/icon.svg' (properties changed: -x to +x)
=== modified file 'src/.deps/gnuclad-gnuclad-cladogram.Po' (properties changed: -x to +x)
=== modified file 'src/.deps/gnuclad-gnuclad-helpers.Po' (properties changed: -x to +x)
=== modified file 'src/.deps/gnuclad-gnuclad-portability.Po' (properties changed: -x to +x)
=== modified file 'src/.deps/gnuclad-gnuclad.Po' (properties changed: -x to +x)
=== modified file 'src/Makefile.am' (properties changed: -x to +x)
=== modified file 'src/Makefile.in' (properties changed: -x to +x)
=== modified file 'src/generator/.deps/.dirstamp' (properties changed: -x to +x)
=== modified file 'src/generator/.deps/gnuclad-conf.Po' (properties changed: -x to +x)
=== modified file 'src/generator/.deps/gnuclad-csv.Po' (properties changed: -x to +x)
=== modified file 'src/generator/.deps/gnuclad-png.Po' (properties changed: -x to +x)
=== modified file 'src/generator/.deps/gnuclad-svg.Po' (properties changed: -x to +x)
=== modified file 'src/generator/.dirstamp' (properties changed: -x to +x)
=== modified file 'src/generator/conf.cpp' (properties changed: -x to +x)
--- src/generator/conf.cpp	2011-02-13 11:10:21 +0000
+++ src/generator/conf.cpp	2011-12-19 01:07:36 +0000
@@ -111,7 +111,10 @@
     << "\nmainBackground = #" << clad->mainBackground.hex
     << "\n"
     << "\n# Customise the background lines separating the years and months"
+    << "\n# rulerWidth is the width of a year line when a year label is present (see yearLabelInterval below)"
+    << "\n# rulerUnlabeledYearWidth is the width of a year line without a year label."
     << "\nrulerWidth = " << clad->rulerWidth
+    << "\nrulerUnlabeledYearWidth = " << clad->rulerUnlabeledYearWidth
     << "\nrulerColor = #" << clad->rulerColor.hex
     << "\nrulerMonthWidth = " << clad->rulerMonthWidth
     << "\nrulerMonthColor = #" << clad->rulerMonthColor.hex
@@ -198,6 +201,9 @@
     << "\n# How many (empty) years to prepend at the beginning"
     << "\nprependYears = " << clad->prependYears
     << "\n"
+    << "\n# How many years between year labels"
+    << "\nyearLabelInterval = " << clad->yearLabelInterval
+    << "\n"
     << "\n# Remember to adjust your input data after changing these averages."
     << "\ndaysInMonth = " << clad->daysInMonth
     << "\nmonthsInYear = " << clad->monthsInYear

=== modified file 'src/generator/conf.h' (properties changed: -x to +x)
=== modified file 'src/generator/csv.cpp' (properties changed: -x to +x)
=== modified file 'src/generator/csv.h' (properties changed: -x to +x)
=== modified file 'src/generator/png.cpp' (properties changed: -x to +x)
=== modified file 'src/generator/png.h' (properties changed: -x to +x)
=== modified file 'src/generator/svg.cpp' (properties changed: -x to +x)
--- src/generator/svg.cpp	2011-04-01 17:59:24 +0000
+++ src/generator/svg.cpp	2011-12-19 01:07:36 +0000
@@ -221,8 +221,13 @@
   for(int i = 0; i <= years; ++i) {
     int x = i * yrPX + xPX - clad->prependYears*yrPX;
     int xm;
-    f << "  <line x1='" << x << "' y1='" << topOffset - yrlinePX << "' x2='" << x << "' y2='" << height << "'"
-      << " stroke-width='" << clad->rulerWidth << "' stroke='#" <<  clad->rulerColor.hex  << "' />\n";
+        if(i % clad->yearLabelInterval == 0) { //This is a labeled year
+            f << "  <line x1='" << x << "' y1='" << topOffset - yrlinePX << "' x2='" << x << "' y2='" << height << "'"
+              << " stroke-width='" << clad->rulerWidth << "' stroke='#" <<  clad->rulerColor.hex  << "' />\n";
+        }else{ // This is an unlabeled year
+            f << "  <line x1='" << x << "' y1='" << topOffset - yrlinePX << "' x2='" << x << "' y2='" << height << "'"
+              << " stroke-width='" << clad->rulerUnlabeledYearWidth << "' stroke='#" <<  clad->rulerColor.hex  << "' />\n";
+        }
     for(int j = 1; j < clad->monthsInYear && i < years; ++j) {
       xm = x + j * yrPX / clad->monthsInYear;
       f << "    <line x1='" << xm << "' y1='" << topOffset - yrlinePX << "' x2='" << xm << "' y2='" << height << "' />\n";
@@ -537,11 +542,11 @@
     f << "  <rect x='" << xPX - 10 << "' y='" << topOffset - yrlinePX - 3*oPX/2 << "' rx='5' ry='5' width='" << width - xPX + 10<< "' height='" << yrlinePX << "' />\n"
       << "  <rect x='" << xPX - 10 << "' y='" << height - yrlinePX << "' rx='5' ry='5' width='" << width - xPX + 10 << "' height='" << yrlinePX << "' />\n"
       << "  <g style='font-size:" << clad->yearLineFontSize << "px;stroke:none;fill:#" << clad->yearLineFontColor.hex << ";font-family:" << clad->yearLineFont << ";-inkscape-font-specification:" << clad->yearLineFont << ";text-anchor:middle;' >\n";
-    for(int i = 0; i <= clad->endOfTime.year - clad->beginningOfTime.year + clad->prependYears + clad->appendYears; ++i) {
+    for(int i = 0; i <= clad->endOfTime.year - clad->beginningOfTime.year + clad->prependYears + clad->appendYears; i += clad->yearLabelInterval) { //++i) {
       int posX = yrPX * i + yrPX / 2 + xPX;
       int posY = topOffset - 3*oPX/2 - yrlinePX/2 + dirty_hack_ex / 2;
       int yeartext = clad->beginningOfTime.year + i - clad->prependYears;
-      if(clad->orientation == oRL) yeartext = clad->endOfTime.year -i;
+      if(clad->orientation == oRL) yeartext = clad->endOfTime.year - i;
       f << "    <text x='" << posX << "' y='" << posY << "'><tspan>" << yeartext << "</tspan></text>\n"
         << "    <text x='" << posX << "' y='" << height - yrlinePX/2 + dirty_hack_ex/2 << "'><tspan>" << yeartext << "</tspan></text>\n";
     }

=== modified file 'src/generator/svg.h' (properties changed: -x to +x)
=== modified file 'src/gnuclad-cladogram.cpp' (properties changed: -x to +x)
--- src/gnuclad-cladogram.cpp	2011-02-13 11:10:21 +0000
+++ src/gnuclad-cladogram.cpp	2011-12-19 01:07:36 +0000
@@ -65,6 +65,7 @@
 
   mainBackground = Color("#fff");
   rulerWidth = 2;
+  rulerUnlabeledYearWidth = 2;
   rulerColor = Color("#ddd");
   rulerMonthWidth = 1;
   rulerMonthColor = Color("#eee");
@@ -99,6 +100,7 @@
   yearLineFontColor = Color("#fff");
   appendYears = 0;
   prependYears = 0;
+  yearLabelInterval = 1;
 
   daysInMonth = 30;
   monthsInYear = 12;
@@ -197,6 +199,7 @@
       else if(opt == "treeSpacingBiggerThan")treeSpacingBiggerThan=str2int(val);
       else if(opt == "mainBackground") mainBackground = Color(val);
       else if(opt == "rulerWidth") rulerWidth = str2int(val);
+      else if(opt == "rulerUnlabeledYearWidth") rulerUnlabeledYearWidth = str2int(val);
       else if(opt == "rulerColor") rulerColor = Color(val);
       else if(opt == "rulerMonthWidth") rulerMonthWidth = str2int(val);
       else if(opt == "rulerMonthColor") rulerMonthColor = Color(val);
@@ -226,6 +229,7 @@
       else if(opt == "yearLineFontColor") yearLineFontColor = Color(val);
       else if(opt == "appendYears") appendYears = str2int(val);
       else if(opt == "prependYears") prependYears = str2int(val);
+      else if(opt == "yearLabelInterval") yearLabelInterval = str2int(val);
       else if(opt == "daysInMonth") daysInMonth = str2int(val);
       else if(opt == "monthsInYear") monthsInYear = str2int(val);
       else if(opt == "endOfTime") endOfTime = Date(val);

=== modified file 'src/gnuclad-helpers.cpp' (properties changed: -x to +x)
=== modified file 'src/gnuclad-portability.cpp' (properties changed: -x to +x)
=== modified file 'src/gnuclad-portability.h' (properties changed: -x to +x)
=== modified file 'src/gnuclad.cpp' (properties changed: -x to +x)
=== modified file 'src/gnuclad.h' (properties changed: -x to +x)
--- src/gnuclad.h	2011-02-13 11:10:21 +0000
+++ src/gnuclad.h	2011-12-19 01:07:36 +0000
@@ -240,6 +240,7 @@
 
   Color mainBackground;
   int rulerWidth;
+  int rulerUnlabeledYearWidth;
   Color rulerColor;
   int rulerMonthWidth;
   Color rulerMonthColor;
@@ -274,6 +275,7 @@
   Color yearLineFontColor;
   int appendYears;
   int prependYears;
+  int yearLabelInterval;
 
   int monthsInYear;
   int daysInMonth;

=== modified file 'src/parser/.deps/.dirstamp' (properties changed: -x to +x)
=== modified file 'src/parser/.deps/gnuclad-csv.Po' (properties changed: -x to +x)
=== modified file 'src/parser/.deps/gnuclad-dir.Po' (properties changed: -x to +x)
=== modified file 'src/parser/.dirstamp' (properties changed: -x to +x)
=== modified file 'src/parser/csv.cpp' (properties changed: -x to +x)
=== modified file 'src/parser/csv.h' (properties changed: -x to +x)
=== modified file 'src/parser/dir.cpp' (properties changed: -x to +x)
=== modified file 'src/parser/dir.h' (properties changed: -x to +x)