moving trunk for module inkscape

(bzr r1)

7 files changed, 553 insertions, 0 deletions

diff --git a/share/ui/.cvsignore b/share/ui/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/share/ui/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/share/ui/Makefile.am b/share/ui/Makefile.am
new file mode 100644
index 000000000..d65668115
--- /dev/null
+++ b/share/ui/Makefile.am
@@ -0,0 +1,11 @@
+
+uidir = $(datadir)/inkscape/ui
+
+ui_DATA =  \
+    keybindings.rc \
+    menus-bars.xml \
+    toolbox.xml \
+    units.txt \
+    units.xml
+
+EXTRA_DIST = $(ui_DATA)
diff --git a/share/ui/keybindings.rc b/share/ui/keybindings.rc
new file mode 100644
index 000000000..968678249
--- /dev/null
+++ b/share/ui/keybindings.rc
@@ -0,0 +1,126 @@
+; inkscape GtkAccelMap rc-file         -*- scheme -*-
+; Simply edit the key bindings you wish to override and restart Inkscape.
+;
+; File menu
+;TODO: VacuumDefs
+(gtk_accel_path "<Actions>//New" "<Control>n")
+(gtk_accel_path "<Actions>//Open" "<Control>o")
+(gtk_accel_path "<Actions>//Revert" "<Shift><Control>r")
+(gtk_accel_path "<Actions>//Save" "<Control>s")
+(gtk_accel_path "<Actions>//SaveAs" "<Shift><Control>s")
+(gtk_accel_path "<Actions>//Import" "<Control>i")
+(gtk_accel_path "<Actions>//Export" "<Shift><Control>e")
+(gtk_accel_path "<Actions>//Print" "<Control>p")
+(gtk_accel_path "<Actions>//PrintPreview" "<Shift><Control>p")
+(gtk_accel_path "<Actions>//DocumentProperties" "<Shift><Control>d")
+(gtk_accel_path "<Actions>//InkscapePreferences" "<Shift><Control>p")
+(gtk_accel_path "<Actions>//Close" "<Control>w")
+(gtk_accel_path "<Actions>//Quit" "<Control>q")
+;
+; Edit menu
+(gtk_accel_path "<Actions>//Undo" "<Control>z")
+(gtk_accel_path "<Actions>//Redo" "<Control>y")
+(gtk_accel_path "<Actions>//Cut" "<Control>x")
+(gtk_accel_path "<Actions>//Copy" "<Control>c")
+(gtk_accel_path "<Actions>//Paste" "<Control>v")
+(gtk_accel_path "<Actions>//PasteInPlace" "<Control><Alt>v")
+(gtk_accel_path "<Actions>//PasteStyle" "<Shift><Control>v")
+(gtk_accel_path "<Actions>//Find" "<Control>f")
+(gtk_accel_path "<Actions>//Duplicate" "<Control>d")
+(gtk_accel_path "<Actions>//Clone" "<Alt>d")
+(gtk_accel_path "<Actions>//CloneUnlink" "<Shift><Alt>d")
+(gtk_accel_path "<Actions>//CloneSelectOrig" "<Shift>d")
+(gtk_accel_path "<Actions>//MakeBitmap" "<Alt>b")
+(gtk_accel_path "<Actions>//Tile" "<Alt>i")
+(gtk_accel_path "<Actions>//Untile" "<Shift><Alt>i")
+(gtk_accel_path "<Actions>//Delete" "Delete")
+(gtk_accel_path "<Actions>//SelectAll" "<Control>a")
+(gtk_accel_path "<Actions>//SelectNone" "<Shift><Control>a")
+(gtk_accel_path "<Actions>//XmlEditor" "<Shift><Control>x")
+;
+; View menu
+;TODO: ShowHide Messages WindowDuplicate
+(gtk_accel_path "<Actions>//ZoomIn" "plus")
+(gtk_accel_path "<Actions>//ZoomOut" "minus")
+(gtk_accel_path "<Actions>//Zoom100" "1")
+(gtk_accel_path "<Actions>//Zoom50" "2")
+(gtk_accel_path "<Actions>//Zoom200" "")
+(gtk_accel_path "<Actions>//ZoomSelection" "3")
+(gtk_accel_path "<Actions>//ZoomDrawing" "4")
+(gtk_accel_path "<Actions>//ZoomPage" "5")
+(gtk_accel_path "<Actions>//ZoomWidth" "6")
+(gtk_accel_path "<Actions>//ZoomPrevious" "grave")
+(gtk_accel_path "<Actions>//ZoomNext" "<Shift>grave")
+(gtk_accel_path "<Actions>//ShowHideDialogs" "F12")
+(gtk_accel_path "<Actions>//Messages" "")
+(gtk_accel_path "<Actions>//Grid" "numbersign")
+(gtk_accel_path "<Actions>//Guides" "bar")
+(gtk_accel_path "<Actions>//Fullscreen" "F11")
+(gtk_accel_path "<Actions>//WindowPrevious" "<Shift><Control>Tab")
+(gtk_accel_path "<Actions>//WindowNext" "<Control>Tab")
+;
+; Layer menu
+;TODO: NewLayer RenameLayer SwitchToNextLayer SwitchToPrevLayer DeleteCurrentLayer
+(gtk_accel_path "<Actions>//RaiseLayer" "<Shift><Control>Page_Up")
+(gtk_accel_path "<Actions>//LowerLayer" "<Shift><Control>Page_Down")
+(gtk_accel_path "<Actions>//LayerToTop" "<Shift><Control>Home")
+(gtk_accel_path "<Actions>//LayerToBottom" "<Shift><Control>End")
+;
+; Object menu
+;TODO: MoveToNewLayer MoveToNextLayer MoveToPrevLayer MoveToTopLayer MoveToBottomLayer
+(gtk_accel_path "<Actions>//FillAndStroke" "<Shift><Control>f")
+(gtk_accel_path "<Actions>//ObjectProperties" "<Shift><Control>o")
+(gtk_accel_path "<Actions>//Group" "<Control>g")
+(gtk_accel_path "<Actions>//Ungroup" "<Control>u")
+(gtk_accel_path "<Actions>//Raise" "Page_Up")
+(gtk_accel_path "<Actions>//Lower" "Page_Down")
+(gtk_accel_path "<Actions>//RaiseToTop" "Home")
+(gtk_accel_path "<Actions>//LowerToBottom" "End")
+(gtk_accel_path "<Actions>//Rotate90CW" "<Shift><Control>Right")
+(gtk_accel_path "<Actions>//Rotate90CCW" "<Shift><Control>Left")
+(gtk_accel_path "<Actions>//FlipHoriz" "h")
+(gtk_accel_path "<Actions>//FlipVert" "v")
+(gtk_accel_path "<Actions>//Transform" "<Shift><Control>m")
+(gtk_accel_path "<Actions>//AlignAndDistribute" "<Shift><Control>a")
+;
+; Path menu
+;TODO: Reverse Cleanup
+(gtk_accel_path "<Actions>//ObjectToPath" "<Shift><Control>c")
+(gtk_accel_path "<Actions>//StrokeToPath" "<Control><Alt>c")
+(gtk_accel_path "<Actions>//Trace" "<Shift><Alt>b")
+(gtk_accel_path "<Actions>//Union" "<Control>plus")
+(gtk_accel_path "<Actions>//Difference" "<Control>minus")
+(gtk_accel_path "<Actions>//Intersection" "<Control>asterisk")
+(gtk_accel_path "<Actions>//Exclusion" "<Control>asciicircum")
+(gtk_accel_path "<Actions>//Division" "<Control>slash")
+(gtk_accel_path "<Actions>//CutPath" "<Control><Alt>slash")
+(gtk_accel_path "<Actions>//Combine" "<Control>k")
+(gtk_accel_path "<Actions>//BreakApart" "<Shift><Control>k")
+(gtk_accel_path "<Actions>//Inset" "<Control>parenleft")
+(gtk_accel_path "<Actions>//Outset" "<Control>parenright")
+(gtk_accel_path "<Actions>//OffsetDynamic" "<Control>j")
+(gtk_accel_path "<Actions>//OffsetLinked" "<Control><Alt>j")
+(gtk_accel_path "<Actions>//Simplify" "<Control>l")
+;
+; Text menu
+;TODO: PutOnPath RemoveFromPath RemoveManualKerns
+(gtk_accel_path "<Actions>//TextProperties" "<Shift><Control>t")
+;
+; About menu
+;TODO: KeysAndMouse Tutorials About
+;
+; Tools toolbox
+(gtk_accel_path "<Actions>//ToolSelect" "F1")
+(gtk_accel_path "<Actions>//ToolNode" "F2")
+(gtk_accel_path "<Actions>//ToolZoom" "F3")
+(gtk_accel_path "<Actions>//ToolRect" "F4")
+(gtk_accel_path "<Actions>//ToolArc" "F5")
+(gtk_accel_path "<Actions>//ToolStar" "asterisk")
+(gtk_accel_path "<Actions>//ToolSpiral" "F9")
+(gtk_accel_path "<Actions>//ToolFreehand" "F6")
+(gtk_accel_path "<Actions>//ToolPen" "<Shift>F6")
+(gtk_accel_path "<Actions>//ToolDynaDraw" "<Control>F6")
+(gtk_accel_path "<Actions>//ToolText" "F8")
+(gtk_accel_path "<Actions>//ToolDropper" "F7")
+;
+;TODO: tool controls and other actions
diff --git a/share/ui/menus-bars.xml b/share/ui/menus-bars.xml
new file mode 100644
index 000000000..ceb9aaa50
--- /dev/null
+++ b/share/ui/menus-bars.xml
@@ -0,0 +1,280 @@
+<ui>
+  <menubar name='MenuBar'>
+    <menu action='MenuFile'>
+      <menuitem action='New'/>
+      <menuitem action='Open'/>
+      <menu action='OpenRecent'>
+        <placeholder name='RecentFiles'/>
+      </menu>
+      <menuitem action='Revert'/>
+      <menuitem action='Save'/>
+      <menuitem action='SaveAs'/>
+      <separator/>
+      <menuitem action='Import'/>
+      <menuitem action='Export'/>
+      <separator/>
+      <menuitem action='Print'/>
+      <menuitem action='PrintPreview'/>
+      <separator/>
+      <menuitem action='VacuumDefs'/>
+      <separator/>
+      <menuitem action='DocumentProperties'/>
+      <menuitem action='InkscapePreferences'/>
+      <separator/>
+      <menuitem action='Close'/>
+      <menuitem action='Quit'/>
+    </menu>
+    <menu action='MenuEdit'>
+      <menuitem action='Undo'/>
+      <menuitem action='Redo'/>
+      <separator/>
+      <menuitem action='Cut'/>
+      <menuitem action='Copy'/>
+      <menuitem action='Paste'/>
+      <menuitem action='PasteInPlace'/>
+      <menuitem action='PasteStyle'/>
+      <separator/>
+      <menuitem action='Find'/>
+      <separator/>
+      <menuitem action='Duplicate'/>
+      <menuitem action='Clone'/>
+      <menuitem action='CloneUnlink'/>
+      <menuitem action='CloneSelectOrig'/>
+      <menuitem action='MakeBitmap'/>
+      <separator/>
+      <menuitem action='Tile'/>
+      <menuitem action='Untile'/>
+      <separator/>
+      <menuitem action='Delete'/>
+      <separator/>
+      <menuitem action='SelectAll'/>
+      <menuitem action='SelectAllInAllLayers'/>
+      <menuitem action='SelectInvert'/>
+      <menuitem action='SelectNone'/>
+      <separator/>
+      <menuitem action='XmlEditor'/>
+    </menu>
+    <menu action='MenuView'>
+      <menu action='Zoom'>
+        <menuitem action='ZoomIn'/>
+        <menuitem action='ZoomOut'/>
+        <separator/>
+        <menuitem action='Zoom100'/>
+        <menuitem action='Zoom50'/>
+        <menuitem action='Zoom200'/>
+        <separator/>
+        <menuitem action='ZoomSelection'/>
+        <menuitem action='ZoomDrawing'/>
+        <menuitem action='ZoomPage'/>
+        <menuitem action='ZoomWidth'/>
+        <separator/>
+        <menuitem action='ZoomPrev'/>
+        <menuitem action='ZoomNext'/>
+      </menu>
+      <separator/>
+      <menu action='ShowHide'>
+        <menuitem action='ShowHideCommandsBar'/>
+        <menuitem action='ShowHideToolControlsBar'/>
+        <menuitem action='ShowHideToolsBar'/>
+        <menuitem action='ShowHideRulers'/>
+        <menuitem action='ShowHideScrollbars'/>
+        <menuitem action='ShowHideStatusbar'/>
+      </menu>
+      <menuitem action='ShowHideDialogs'/>
+      <separator/>
+      <menuitem action='Grid'/>
+      <menuitem action='Guides'/>
+      <separator/>
+      <menuitem action='Fullscreen'/>
+      <separator/>
+      <menuitem action='Messages'/>
+      <menuitem action='Scripts'/>
+      <separator/>
+      <menuitem action='WindowPrev'/>
+      <menuitem action='WindowNext'/>
+      <separator/>
+      <menuitem action='WindowDuplicate'/>
+    </menu>
+    <menu action='MenuLayer'>
+      <menuitem action='LayerNew'/>
+      <menuitem action='LayerRename'/>
+      <menuitem action='LayerDuplicate'/>
+      <menuitem action='LayerAnchor'/>
+      <menuitem action='LayerMergeDown'/>
+      <menuitem action='LayerDelete'/>
+      <separator/>
+      <menuitem action='LayerSelectNext'/>
+      <menuitem action='LayerSelectPrev'/>
+      <menuitem action='LayerSelectTop'/>
+      <menuitem action='LayerSelectBottom'/>
+      <separator/>
+      <menuitem action='LayerRaise'/>
+      <menuitem action='LayerLower'/>
+      <menuitem action='LayerToTop'/>
+      <menuitem action='LayerToBottom'/>
+    </menu>
+    <menu action='MenuObject'>
+      <menuitem action='FillAndStroke'/>
+      <menuitem action='ObjectProperties'/>
+      <separator/>
+      <menuitem action='Group'/>
+      <menuitem action='Ungroup'/>
+      <separator/>
+      <menuitem action='Raise'/>
+      <menuitem action='Lower'/>
+      <menuitem action='RaiseToTop'/>
+      <menuitem action='LowerToBottom'/>
+      <separator/>
+      <menuitem action='MoveToNewLayer'/>
+      <menuitem action='MoveToNextLayer'/>
+      <menuitem action='MoveToPrevLayer'/>
+      <menuitem action='MoveToTopLayer'/>
+      <menuitem action='MoveToBottomLayer'/>
+      <separator/>
+      <menuitem action='Rotate90CW'/>
+      <menuitem action='Rotate90CCW'/>
+      <menuitem action='FlipHoriz'/>
+      <menuitem action='FlipVert'/>
+      <separator/>
+      <menuitem action='Transformation'/>
+      <menuitem action='AlignAndDistribute'/>
+    </menu>
+    <menu action='MenuPath'>
+      <menuitem action='ObjectToPath'/>
+      <menuitem action='StrokeToPath'/>
+      <menuitem action='Trace'/>
+      <separator/>
+      <menuitem action='Union'/>
+      <menuitem action='Difference'/>
+      <menuitem action='Intersection'/>
+      <menuitem action='Exclusion'/>
+      <menuitem action='Division'/>
+      <menuitem action='CutPath'/>
+      <separator/>
+      <menuitem action='Combine'/>
+      <menuitem action='BreakApart'/>
+      <separator/>
+      <menuitem action='Inset'/>
+      <menuitem action='Outset'/>
+      <menuitem action='OffsetDynamic'/>
+      <menuitem action='OffsetLinked'/>
+      <separator/>
+      <menuitem action='Simplify'/>
+      <menuitem action='Reverse'/>
+      <menuitem action='Cleanup'/>
+    </menu>
+    <menu action='MenuText'>
+      <menuitem action='TextProperties'/>
+      <separator/>
+      <menuitem action='RemoveFromPath'/>
+      <menuitem action='PutOnPath'/>
+      <separator/>
+      <menuitem action='RemoveManualKerns'/>
+    </menu>
+	<menu action='MenuWhiteboard'>
+	  <menuitem action='DialogWhiteboardConnect'/>
+	  <separator/>
+	  <menuitem action='DialogWhiteboardShareWithUser'/>
+	  <menuitem action='DialogWhiteboardShareWithChat'/>
+	  <separator/>
+	</menu>
+    <menu action='MenuHelp'>
+      <menuitem action='KeysAndMouse'/>
+      <menu action='Tutorials'>
+        <placeholder name='TutorialFiles'/>
+      </menu>
+      <menuitem action='About'/>
+    </menu>
+  </menubar>
+  <toolbar name='CommandsBar'>
+    <toolitem action='New'/>
+    <toolitem action='Open'/>
+    <toolitem action='Save'/>
+    <toolitem action='Print'/>
+    <separator/>
+    <toolitem action='Import'/>
+    <toolitem action='Export'/>
+    <separator/>
+    <toolitem action='Undo'/>
+    <toolitem action='Redo'/>
+    <separator/>
+    <toolitem action='Copy'/>
+    <toolitem action='Cut'/>
+    <toolitem action='Paste'/>
+    <separator/>
+    <toolitem action='ZoomSelection'/>
+    <toolitem action='ZoomDrawing'/>
+    <toolitem action='ZoomPage'/>
+    <separator/>
+    <toolitem action='Duplicate'/>
+    <toolitem action='Clone'/>
+    <toolitem action='CloneUnlink'/>
+    <separator/>
+    <toolitem action='Group'/>
+    <toolitem action='Ungroup'/>
+    <separator/>
+    <toolitem action='FillAndStroke'/>
+    <toolitem action='TextProperties'/>
+    <toolitem action='XmlEditor'/>
+    <toolitem action='AlignAndDistribute'/>
+    <separator/>
+    <toolitem action='InkscapePreferences'/>
+    <toolitem action='DocumentProperties'/>
+  </toolbar>
+  <toolbar name='ToolsBar'>
+    <toolitem action='ToolSelect'/>
+    <toolitem action='ToolNode'/>
+    <toolitem action='ToolZoom'/>
+    <toolitem action='ToolRect'/>
+    <toolitem action='ToolArc'/>
+    <toolitem action='ToolStar'/>
+    <toolitem action='ToolSpiral'/>
+    <toolitem action='ToolFreehand'/>
+    <toolitem action='ToolPen'/>
+    <toolitem action='ToolDynaDraw'/>
+    <toolitem action='ToolText'/>
+    <toolitem action='ToolDropper'/>
+  </toolbar>
+  <toolbar name='SelectControlsBar'>
+    <toolitem action='Rotate90CCW'/>
+    <toolitem action='Rotate90CW'/>
+    <toolitem action='FlipHoriz'/>
+    <toolitem action='FlipVert'/>
+    <separator/>
+    <toolitem action='LowerToBottom'/>
+    <toolitem action='Lower'/>
+    <toolitem action='Raise'/>
+    <toolitem action='RaiseToTop'/>
+    <separator/>
+    <toolitem action='MoveToBottomLayer'/>
+    <toolitem action='MoveToPrevLayer'/>
+    <toolitem action='MoveToNextLayer'/>
+    <toolitem action='MoveToTopLayer'/>
+    <separator/>
+    <toolitem action='TransformStroke'/>
+    <toolitem action='TransformCorners'/>
+    <toolitem action='TransformGradient'/>
+    <toolitem action='TransformPattern'/>
+  </toolbar>
+  <toolbar name='NodeControlsBar'>
+    <toolitem action='NodeInsert'/>
+    <toolitem action='NodeDelete'/>
+    <separator/>
+    <toolitem action='NodeJoin'/>
+    <toolitem action='NodeJoinSegment'/>
+    <toolitem action='NodeDeleteSegment'/>
+    <toolitem action='NodeBreak'/>
+    <separator/>
+    <toolitem action='NodeCorner'/>
+    <toolitem action='NodeSmooth'/>
+    <toolitem action='NodeSymmetric'/>
+    <separator/>
+    <toolitem action='NodeLine'/>
+    <toolitem action='NodeCurve'/>
+    <separator/>
+    <toolitem action='ObjectToPath'/>
+    <toolitem action='StrokeToPath'/>
+  </toolbar>
+  <toolbar name='SelectControlsBar'>
+  </toolbar>
+</ui>
diff --git a/share/ui/toolbox.xml b/share/ui/toolbox.xml
new file mode 100644
index 000000000..53994651f
--- /dev/null
+++ b/share/ui/toolbox.xml
@@ -0,0 +1,13 @@
+<ui>
+  <popup name='ToolboxMenu'>
+    <menuitem action='Icons'/>
+    <menuitem action='Text'/>
+    <menuitem action='Both'/>
+    <menuitem action='BothHoriz'/>
+    <separator/>
+    <menuitem action='OrientHoriz'/>
+    <menuitem action='OrientVert'/>
+    <separator/>
+    <menuitem action='ShowArrow'/>
+  </popup>
+</ui>
diff --git a/share/ui/units.txt b/share/ui/units.txt
new file mode 100644
index 000000000..a82cec529
--- /dev/null
+++ b/share/ui/units.txt
@@ -0,0 +1,20 @@
+# Simple unit configuration file
+#
+# This is a space-delimited list of unit definitions.
+
+# name        name_plural  abbr type           factor   PRI description
+# ---------------------------------------------------------------------------
+  %           %            %    DIMENSIONLESS  1.00     Y   Percentage
+  pixel       pixels       px   LINEAR         1.00     Y   CSS Pixels (90/inch)
+  point       points       pt   LINEAR         1.25     N   PostScript points (72/inch)
+  pica        picas        pc   LINEAR         15.0     N   12 points
+  inch        inches       in   LINEAR         90.0     N   Inches (90 px/in)
+  millimeter  millimeters  mm   LINEAR         3.543307 N   Millimeters (25.4 mm/in)
+  centimeter  centimeters  cm   LINEAR         35.43307 N   Centimeters (10 mm/cm)
+  meter       meters       m    LINEAR         3543.307 N   Meters (100 cm/m)
+  foot        feet         ft   LINEAR         1080     N   Feet (12 in/ft)
+  degree      degrees      deg  RADIAL         1.00     Y   Degrees
+  radian      radians      rad  RADIAL         57.296   N   Radians (57.296 deg/rad)
+  font-height font-heights em   FONT_HEIGHT    1.00     Y   Font height
+  x-height    x-heights    ex   FONT_HEIGHT    0.50     N   Height of letter 'x'
+  half-em     half-ems     en   FONT_HEIGHT    0.50     N   Half of font height
diff --git a/share/ui/units.xml b/share/ui/units.xml
new file mode 100644
index 000000000..e4a07fe06
--- /dev/null
+++ b/share/ui/units.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<unitdefs>
+<unit type="DIMENSIONLESS" pri="y">
+    <name>%</name>
+    <plural>%</plural>
+    <abbr>%</abbr>
+    <factor>1.00</factor>
+    <description>Percentage</description>
+</unit>
+<unit type="LINEAR" pri="y">
+    <name>pixel</name>
+    <plural>pixels</plural>
+    <abbr>px</abbr>
+    <factor>1.00</factor>
+    <description>CSS Pixels (90/inch)</description>
+</unit>
+<unit type="LINEAR" pri="n">
+    <name>point</name>
+    <plural>points</plural>
+    <abbr>pt</abbr>
+    <factor>1.25</factor>
+    <description>PostScript points (72/inch)</description>
+</unit>
+<unit type="LINEAR" pri="n">
+    <name>pica</name>
+    <plural>picas</plural>
+    <abbr>pc</abbr>
+    <factor>15.0</factor>
+    <description>12 points</description>
+</unit>
+<unit type="LINEAR" pri="n">
+    <name>inch</name>
+    <plural>inches</plural>
+    <abbr>in</abbr>
+    <factor>90.0</factor>
+    <description>Inches (90 px/in)</description>
+</unit>
+<unit type="LINEAR" pri="n">
+    <name>millimeter</name>
+    <plural>millimeters</plural>
+    <abbr>mm</abbr>
+    <factor>3.543307</factor>
+    <description>Millimeters (25.4 mm/in)</description>
+</unit>
+<unit type="LINEAR" pri="n">
+    <name>centimeter</name>
+    <plural>centimeters</plural>
+    <abbr>cm</abbr>
+    <factor>35.43307</factor>
+    <description>Centimeters (10 mm/cm)</description>
+</unit>
+<unit type="LINEAR" pri="n">
+    <name>meter</name>
+    <plural>meters</plural>
+    <abbr>m</abbr>
+    <factor>3543.307</factor>
+    <description>Meters (100 cm/m)</description>
+</unit>
+<unit type="LINEAR" pri="n">
+    <name>foot</name>
+    <plural>feet</plural>
+    <abbr>ft</abbr>
+    <factor>1080</factor>
+    <description>Feet (12 in/ft)</description>
+</unit>
+<unit type="RADIAL" pri="y">
+    <name>degree</name>
+    <plural>degrees</plural>
+    <abbr>deg</abbr>
+    <factor>1.00</factor>
+    <description>Degrees</description>
+</unit>
+<unit type="RADIAL" pri="n">
+    <name>radian</name>
+    <plural>radians</plural>
+    <abbr>rad</abbr>
+    <factor>57.296</factor>
+    <description>Radians (57.296 deg/rad)</description>
+</unit>
+<unit type="FONT_HEIGHT" pri="y">
+    <name>font-height</name>
+    <plural>font-heights</plural>
+    <abbr>em</abbr>
+    <factor>1.00</factor>
+    <description>Font height</description>
+</unit>
+<unit type="FONT_HEIGHT" pri="n">
+    <name>x-height</name>
+    <plural>x-heights</plural>
+    <abbr>ex</abbr>
+    <factor>0.50</factor>
+    <description>Height of letter 'x'</description>
+</unit>
+<unit type="FONT_HEIGHT" pri="n">
+    <name>half-em</name>
+    <plural>half-ems</plural>
+    <abbr>en</abbr>
+    <factor>0.50</factor>
+    <description>Half of font height</description>
+</unit>
+</unitdefs>