merge from trunk (r11787)

(bzr r11668.1.28)

6 files changed, 315 insertions, 27 deletions

diff --git a/share/Makefile.am b/share/Makefile.am
index abc1608c7..27aaf0d28 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -11,6 +11,7 @@ SUBDIRS = attributes \
           palettes \
           patterns \
           screens \
+          symbols \
           templates \
           tutorials \
           ui
diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py
index f78a59a7c..4ba88c3bb 100755
--- a/share/extensions/inkex.py
+++ b/share/extensions/inkex.py
@@ -59,6 +59,16 @@ def localize():
             trans = gettext.translation(domain, localdir, [current_locale], fallback=True)
         except KeyError:
             trans = gettext.translation(domain, fallback=True)
+    elif sys.platform.startswith('darwin'):
+        try:
+            localdir = os.environ['INKSCAPE_LOCALEDIR'];
+            trans = gettext.translation(domain, localdir, fallback=True)
+        except KeyError:
+            try:
+                localdir = os.environ['PACKAGE_LOCALE_DIR'];
+                trans = gettext.translation(domain, localdir, fallback=True)
+            except KeyError:
+                trans = gettext.translation(domain, fallback=True)
     else:
         try:
             localdir = os.environ['PACKAGE_LOCALE_DIR'];
diff --git a/share/keys/default.xml b/share/keys/default.xml
index e612a117a..74822e6d1 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -122,6 +122,8 @@ override) the bindings in the main default.xml.
   <bind key="m" action="ToolMeasure" />
   <bind key="M" action="ToolMeasure" display="true" />
 
+  <bind action="MeasurePrefs" />
+
   <bind key="F9" modifiers="Shift" action="ToolStar" />
   <bind key="asterisk" modifiers="Shift" action="ToolStar" /> 	 
   <bind key="asterisk" action="ToolStar" /> 	 
@@ -193,7 +195,6 @@ override) the bindings in the main default.xml.
 
   <bind action="SprayPrefs" />
 
-
 <!-- Zoom -->
 
   <bind key="plus" action="ZoomIn" display="true" />
@@ -248,34 +249,45 @@ override) the bindings in the main default.xml.
   <bind key="Tab" modifiers="Ctrl,Shift" action="PrevWindow" display="true" />
   <bind key="ISO_Left_Tab" modifiers="Ctrl,Shift" action="PrevWindow" />
 
+  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
+  <bind key="numbersign" action="ToggleGrid" display="true" />
+  
+  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
+  <bind key="bar" action="ToggleGuides" display="true" />
+
+  <bind key="percent" action="ToggleSnapGlobal" display="true" /> <!-- % -->
+  <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" />
+
+  <bind action="ToggleCommandsToolbar" />
+  <bind action="ToggleSnapToolbar" />
+  <bind action="ToggleToolToolbar" />
+  <bind action="ToggleToolbox" />
+
   <bind key="r" modifiers="Ctrl" action="ToggleRulers" display="true" />
   <bind key="R" modifiers="Ctrl" action="ToggleRulers" />
 
   <bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true" />
   <bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
 
-  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
-  <bind key="bar" action="ToggleGuides" display="true" />
-
-  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
-  <bind key="numbersign" action="ToggleGrid" display="true" />
+  <bind action="TogglePalette" />
+  <bind action="ToggleStatusbar" />
   
-  <bind key="percent" action="ToggleSnapGlobal" display="true" /> <!-- % -->
-  <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" />
-
   <bind action="ViewNew" />
   <bind action="ViewNewPreview" />
   <bind action="ViewIconPreview" />
 
+  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
+  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
+
   <bind action="ViewModeNormal" />
+  <bind action="ViewModeNoFilters" />
   <bind action="ViewModeOutline" />
-  <bind action="ViewColorModeNormal" />
-  <bind action="ViewColorModeGrayscale" />
 
-  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
-  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
   <bind key="KP_5" modifiers="Shift" action="ViewColorModeToggle" display="true" />
 
+  <bind action="ViewColorModeNormal" />
+  <bind action="ViewColorModeGrayscale" />
+
 <!-- Edit -->
 
   <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
@@ -326,9 +338,13 @@ override) the bindings in the main default.xml.
   <bind key="d" modifiers="Alt,Shift" action="EditUnlinkClone" display="true" />
   <bind key="D" modifiers="Alt,Shift" action="EditUnlinkClone" />
 
+  <bind action="EditRelinkClone" />
+
   <bind key="d" modifiers="Shift" action="EditCloneSelectOriginal" display="true" />
   <bind key="D" modifiers="Shift" action="EditCloneSelectOriginal" />
 
+  <bind action="EditCloneOriginalPathLPE" />
+
   <bind key="a" modifiers="Ctrl" action="EditSelectAll" display="true" />
   <bind key="A" modifiers="Ctrl" action="EditSelectAll" />
 
@@ -337,6 +353,11 @@ override) the bindings in the main default.xml.
   <bind key="a" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" display="true" />
   <bind key="A" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" />
 
+  <bind action="EditSelectSameFillStroke" />  
+  <bind action="EditSelectSameFillColor" />  
+  <bind action="EditSelectSameStrokeColor" />  
+  <bind action="EditSelectSameStrokeStyle" />  
+
   <bind key="a" modifiers="Shift,Alt" action="EditSelectSameObjectType" display="true" />
   <bind key="A" modifiers="Shift,Alt" action="EditSelectSameObjectType" />
 
@@ -412,6 +433,10 @@ override) the bindings in the main default.xml.
 
   <bind action="ObjectRemoveTransform" /> 
 
+  <bind action="FitCanvasToSelection" /> 
+  <bind action="FitCanvasToDrawing" /> 
+  <bind action="FitCanvasToSelectionOrDrawing" /> 
+
 <!-- Path -->
 
   <bind key="c" modifiers="Ctrl,Shift" action="ObjectToPath" display="true" />
@@ -530,9 +555,22 @@ override) the bindings in the main default.xml.
   <bind key="Page_Down" modifiers="Shift" action="LayerMoveToPrev" display="true" />
   <bind key="KP_Page_Down" modifiers="Shift" action="LayerMoveToPrev" />
 
+  <bind action="LayerMoveTo" />  
+
   <bind key="l" modifiers="Ctrl,Shift" action="DialogLayers" display="true" />
   <bind key="L" modifiers="Ctrl,Shift" action="DialogLayers" />  
 
+  <bind action="LayerDuplicate" />  
+  <bind action="LayerDelete" />  
+
+  <bind action="LayerHideAll" />  
+  <bind action="LayerSolo" />  
+  <bind action="LayerShowAll" />  
+
+  <bind action="LayerLockAll" />  
+  <bind action="LayerLockOthers" />  
+  <bind action="LayerUnlockAll" />  
+
   <bind action="LayerToggleHide" />  
   <bind action="LayerToggleLock" />  
 
@@ -565,9 +603,14 @@ override) the bindings in the main default.xml.
   <bind key="o" modifiers="Ctrl,Shift" action="DialogObjectProperties" display="true" />
   <bind key="O" modifiers="Ctrl,Shift" action="DialogObjectProperties" />
 
+  <bind action="DialogObjectAttributes" />
+
   <bind key="w" modifiers="Ctrl,Shift" action="DialogSwatches" display="true" />
   <bind key="W" modifiers="Ctrl,Shift" action="DialogSwatches" />
 
+  <bind key="y" modifiers="Ctrl,Shift" action="DialogSymbols" display="true" />
+  <bind key="Y" modifiers="Ctrl,Shift" action="DialogSymbols" />
+
   <bind key="ampersand" modifiers="Ctrl,Shift" action="DialogLivePathEffect" />
   <bind key="7" modifiers="Ctrl,Shift" action="DialogLivePathEffect" display="true" />
 
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index b2cf829e5..74822e6d1 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -122,6 +122,8 @@ override) the bindings in the main default.xml.
   <bind key="m" action="ToolMeasure" />
   <bind key="M" action="ToolMeasure" display="true" />
 
+  <bind action="MeasurePrefs" />
+
   <bind key="F9" modifiers="Shift" action="ToolStar" />
   <bind key="asterisk" modifiers="Shift" action="ToolStar" /> 	 
   <bind key="asterisk" action="ToolStar" /> 	 
@@ -193,7 +195,6 @@ override) the bindings in the main default.xml.
 
   <bind action="SprayPrefs" />
 
-
 <!-- Zoom -->
 
   <bind key="plus" action="ZoomIn" display="true" />
@@ -241,40 +242,52 @@ override) the bindings in the main default.xml.
 
   <bind key="F11" action="FullScreen" display="true" /> 
   <bind key="F11" action="FocusToggle" modifiers="Shift" display="true" /> 
+  <bind key="F11" action="FullScreenFocus" modifiers="Ctrl" display="true" /> 
 
   <bind key="Tab" modifiers="Ctrl" action="NextWindow" display="true" />
   <bind key="ISO_Left_Tab" modifiers="Ctrl" action="NextWindow" />
   <bind key="Tab" modifiers="Ctrl,Shift" action="PrevWindow" display="true" />
   <bind key="ISO_Left_Tab" modifiers="Ctrl,Shift" action="PrevWindow" />
 
+  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
+  <bind key="numbersign" action="ToggleGrid" display="true" />
+  
+  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
+  <bind key="bar" action="ToggleGuides" display="true" />
+
+  <bind key="percent" action="ToggleSnapGlobal" display="true" /> <!-- % -->
+  <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" />
+
+  <bind action="ToggleCommandsToolbar" />
+  <bind action="ToggleSnapToolbar" />
+  <bind action="ToggleToolToolbar" />
+  <bind action="ToggleToolbox" />
+
   <bind key="r" modifiers="Ctrl" action="ToggleRulers" display="true" />
   <bind key="R" modifiers="Ctrl" action="ToggleRulers" />
 
   <bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true" />
   <bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
 
-  <bind key="bar" modifiers="Shift" action="ToggleGuides" /> <!-- | -->
-  <bind key="bar" action="ToggleGuides" display="true" />
-
-  <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
-  <bind key="numbersign" action="ToggleGrid" display="true" />
+  <bind action="TogglePalette" />
+  <bind action="ToggleStatusbar" />
   
-  <bind key="percent" action="ToggleSnapGlobal" display="true" /> <!-- % -->
-  <bind key="percent" modifiers="Shift" action="ToggleSnapGlobal" />
-
   <bind action="ViewNew" />
   <bind action="ViewNewPreview" />
   <bind action="ViewIconPreview" />
 
+  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
+  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
+
   <bind action="ViewModeNormal" />
+  <bind action="ViewModeNoFilters" />
   <bind action="ViewModeOutline" />
-  <bind action="ViewColorModeNormal" />
-  <bind action="ViewColorModeGrayscale" />
 
-  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
-  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
   <bind key="KP_5" modifiers="Shift" action="ViewColorModeToggle" display="true" />
 
+  <bind action="ViewColorModeNormal" />
+  <bind action="ViewColorModeGrayscale" />
+
 <!-- Edit -->
 
   <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
@@ -325,9 +338,13 @@ override) the bindings in the main default.xml.
   <bind key="d" modifiers="Alt,Shift" action="EditUnlinkClone" display="true" />
   <bind key="D" modifiers="Alt,Shift" action="EditUnlinkClone" />
 
+  <bind action="EditRelinkClone" />
+
   <bind key="d" modifiers="Shift" action="EditCloneSelectOriginal" display="true" />
   <bind key="D" modifiers="Shift" action="EditCloneSelectOriginal" />
 
+  <bind action="EditCloneOriginalPathLPE" />
+
   <bind key="a" modifiers="Ctrl" action="EditSelectAll" display="true" />
   <bind key="A" modifiers="Ctrl" action="EditSelectAll" />
 
@@ -336,6 +353,11 @@ override) the bindings in the main default.xml.
   <bind key="a" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" display="true" />
   <bind key="A" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" />
 
+  <bind action="EditSelectSameFillStroke" />  
+  <bind action="EditSelectSameFillColor" />  
+  <bind action="EditSelectSameStrokeColor" />  
+  <bind action="EditSelectSameStrokeStyle" />  
+
   <bind key="a" modifiers="Shift,Alt" action="EditSelectSameObjectType" display="true" />
   <bind key="A" modifiers="Shift,Alt" action="EditSelectSameObjectType" />
 
@@ -411,6 +433,10 @@ override) the bindings in the main default.xml.
 
   <bind action="ObjectRemoveTransform" /> 
 
+  <bind action="FitCanvasToSelection" /> 
+  <bind action="FitCanvasToDrawing" /> 
+  <bind action="FitCanvasToSelectionOrDrawing" /> 
+
 <!-- Path -->
 
   <bind key="c" modifiers="Ctrl,Shift" action="ObjectToPath" display="true" />
@@ -529,9 +555,22 @@ override) the bindings in the main default.xml.
   <bind key="Page_Down" modifiers="Shift" action="LayerMoveToPrev" display="true" />
   <bind key="KP_Page_Down" modifiers="Shift" action="LayerMoveToPrev" />
 
+  <bind action="LayerMoveTo" />  
+
   <bind key="l" modifiers="Ctrl,Shift" action="DialogLayers" display="true" />
   <bind key="L" modifiers="Ctrl,Shift" action="DialogLayers" />  
 
+  <bind action="LayerDuplicate" />  
+  <bind action="LayerDelete" />  
+
+  <bind action="LayerHideAll" />  
+  <bind action="LayerSolo" />  
+  <bind action="LayerShowAll" />  
+
+  <bind action="LayerLockAll" />  
+  <bind action="LayerLockOthers" />  
+  <bind action="LayerUnlockAll" />  
+
   <bind action="LayerToggleHide" />  
   <bind action="LayerToggleLock" />  
 
@@ -564,9 +603,14 @@ override) the bindings in the main default.xml.
   <bind key="o" modifiers="Ctrl,Shift" action="DialogObjectProperties" display="true" />
   <bind key="O" modifiers="Ctrl,Shift" action="DialogObjectProperties" />
 
+  <bind action="DialogObjectAttributes" />
+
   <bind key="w" modifiers="Ctrl,Shift" action="DialogSwatches" display="true" />
   <bind key="W" modifiers="Ctrl,Shift" action="DialogSwatches" />
 
+  <bind key="y" modifiers="Ctrl,Shift" action="DialogSymbols" display="true" />
+  <bind key="Y" modifiers="Ctrl,Shift" action="DialogSymbols" />
+
   <bind key="ampersand" modifiers="Ctrl,Shift" action="DialogLivePathEffect" />
   <bind key="7" modifiers="Ctrl,Shift" action="DialogLivePathEffect" display="true" />
 
@@ -584,6 +628,27 @@ override) the bindings in the main default.xml.
 
   <bind key="F12" action="DialogsToggle" display="true" />
 
+  <bind key="h" modifiers="Ctrl,Alt" action="AlignHorizontalCenter" display="true" />
+  <bind key="H" modifiers="Ctrl,Alt" action="AlignHorizontalCenter" />
+
+  <bind key="t" modifiers="Ctrl,Alt" action="AlignVerticalCenter" display="true" />
+  <bind key="T" modifiers="Ctrl,Alt" action="AlignVerticalCenter" />
+
+  <bind key="KP_2" modifiers="Ctrl,Alt" action="AlignVerticalBottom" display="true" />
+  <bind key="KP_2" modifiers="Ctrl,Alt" action="AlignVerticalBottom" />
+
+  <bind key="KP_4" modifiers="Ctrl,Alt" action="AlignHorizontalLeft" display="true" />
+  <bind key="KP_4" modifiers="Ctrl,Alt" action="AlignHorizontalLeft" />
+
+  <bind key="KP_5" modifiers="Ctrl,Alt" action="AlignVerticalHorizontalCenter" display="true" />
+  <bind key="KP_5" modifiers="Ctrl,Alt" action="AlignVerticalHorizontalCenter" />
+
+  <bind key="KP_6" modifiers="Ctrl,Alt" action="AlignHorizontalRight" display="true" />
+  <bind key="KP_6" modifiers="Ctrl,Alt" action="AlignHorizontalRight" />
+
+  <bind key="KP_8" modifiers="Ctrl,Alt" action="AlignVerticalTop" display="true" />
+  <bind key="KP_8" modifiers="Ctrl,Alt" action="AlignVerticalTop" />
+
 <!-- Help -->
 
   <bind action="HelpAboutExtensions" />
@@ -603,9 +668,11 @@ override) the bindings in the main default.xml.
  <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
  <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
 
+<!-- 
  <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
  <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
-
+ -->
+ 
  <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
  <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
 
diff --git a/share/symbols/LogicSymbols.svg b/share/symbols/LogicSymbols.svg
new file mode 100644
index 000000000..14d25848f
--- /dev/null
+++ b/share/symbols/LogicSymbols.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- Created by Tavmjong Bah -->
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="400"
+   height="300"
+   version="1.1"
+   style="fill:none;stroke:#000000;stroke-width:2">
+  <title>Logic Symbols</title>
+  <defs>
+    <symbol id="Xnor_Gate">
+      <title>Xnor Gate</title>
+      <path
+         d="M 24.65625,70 45,70 C 65,70 75,50 75,50 75,50 70,30 45,30 l -20.34375,0 c 1.789926,3.094188 3.151364,6.453471 4.0625,10 C 29.54012,43.197121 30,46.545819 30,50 30,53.454181 29.54012,56.802879 28.71875,60 27.807614,63.546529 26.446176,66.905812 24.65625,70 Z" />
+      <path
+         d="m 80,50 c 0,1.380712 -1.119288,2.5 -2.5,2.5 C 76.119288,52.5 75,51.380712 75,50 75,48.619288 76.119288,47.5 77.5,47.5 78.880712,47.5 80,48.619288 80,50 Z" />
+      <path
+         d="M 18.65625,70 C 22.629549,64.322431 25,57.455703 25,50 25,42.544297 22.629549,35.677569 18.65625,30" />
+    </symbol>
+    <symbol id="Xor_Gate">
+      <title>Xor Gate</title>
+      <path
+         d="M 24.65625,70 45,70 C 65,70 75,50 75,50 75,50 70,30 45,30 l -20.34375,0 c 1.789926,3.094188 3.151364,6.453471 4.0625,10 C 29.54012,43.197121 30,46.545819 30,50 30,53.454181 29.54012,56.802879 28.71875,60 27.807614,63.546529 26.446176,66.905812 24.65625,70 Z" />
+      <path
+         d="M 18.65625,70 C 22.629549,64.322431 25,57.455703 25,50 25,42.544297 22.629549,35.677569 18.65625,30" />
+    </symbol>
+    <symbol id="Nor_Gate">
+      <title>Nor Gate</title>
+      <path
+         d="M 24.65625,70 45,70 C 65,70 75,50 75,50 75,50 70,30 45,30 l -20.34375,0 c 1.789926,3.094188 3.151364,6.453471 4.0625,10 C 29.54012,43.197121 30,46.545819 30,50 30,53.454181 29.54012,56.802879 28.71875,60 27.807614,63.546529 26.446176,66.905812 24.65625,70 Z" />
+      <path
+         d="m 80,50 c 0,1.380712 -1.119288,2.5 -2.5,2.5 C 76.119288,52.5 75,51.380712 75,50 75,48.619288 76.119288,47.5 77.5,47.5 78.880712,47.5 80,48.619288 80,50 Z" />
+    </symbol>
+    <symbol id="Or_Gate">
+      <title>Or Gate</title>
+      <path
+         d="M 24.65625,70 45,70 C 65,70 75,50 75,50 75,50 70,30 45,30 l -20.34375,0 c 1.789926,3.094188 3.151364,6.453471 4.0625,10 C 29.54012,43.197121 30,46.545819 30,50 30,53.454181 29.54012,56.802879 28.71875,60 27.807614,63.546529 26.446176,66.905812 24.65625,70 Z" />
+    </symbol>
+    <symbol id="Nand_Gate">
+      <title>Nand Gate</title>
+      <path
+         d="m 25,70 0,-10 0,-10 0,-10 0,-10 30,0 C 66.045695,30 75,38.954305 75,50 75,61.045695 66.045695,70 55,70 Z" />
+      <path
+         d="m 80,50 c 0,1.380712 -1.119288,2.5 -2.5,2.5 C 76.119288,52.5 75,51.380712 75,50 75,48.619288 76.119288,47.5 77.5,47.5 78.880712,47.5 80,48.619288 80,50 Z" />
+    </symbol>
+    <symbol id="And_Gate">
+      <title>And Gate</title>
+      <path
+         d="m 25,70 0,-10 0,-10 0,-10 0,-10 30,0 C 66.045695,30 75,38.954305 75,50 75,61.045695 66.045695,70 55,70 Z" />
+    </symbol>
+    <symbol id="Buffer">
+      <title>Buffer</title>
+      <path
+         d="M 25,30 75,50 25,70 25,50 Z" />
+    </symbol>
+    <symbol id="Not_Gate">
+      <title>Not Gate</title>
+      <path
+         style="stroke-miterlimit:2"
+         d="M 25,30 75,50 25,70 25,50 Z" />
+      <path
+         d="m 80,50 c 0,1.380712 -1.119288,2.5 -2.5,2.5 C 76.119288,52.5 75,51.380712 75,50 75,48.619288 76.119288,47.5 77.5,47.5 78.880712,47.5 80,48.619288 80,50 Z" />
+    </symbol>
+    <symbol id="Buffer_Small">
+      <title>Buffer Small</title>
+      <path
+         d="m 37.711573,40 25,10 L 37.711573,60 Z" />
+    </symbol>
+    <symbol id="Not_Gate_Small">
+      <title>Not Gate Small</title>
+      <path
+         d="m 67.5,50 c 0,1.380712 -1.119288,2.5 -2.5,2.5 -1.380712,0 -2.5,-1.119288 -2.5,-2.5 0,-1.380712 1.119288,-2.5 2.5,-2.5 C 66.380712,47.5 67.5,48.619288 67.5,50 Z" />
+      <path
+         d="m 37.711573,40 25,10 L 37.711573,60 Z"
+         style="stroke-miterlimit:2" />
+    </symbol>
+  </defs>
+    <use
+       xlink:href="#And_Gate" />
+    <use
+       xlink:href="#Nand_Gate"
+       transform="translate(0,50)" />
+    <use
+       xlink:href="#Or_Gate"
+       transform="translate(75,0)" />
+    <use
+       xlink:href="#Nor_Gate"
+       transform="translate(75,50)" />
+    <use
+       xlink:href="#Xor_Gate"
+       transform="translate(150,0)" />
+    <use
+       xlink:href="#Xnor_Gate"
+       transform="translate(150,50)" />
+    <use
+       xlink:href="#Buffer"
+       transform="translate(225,0)" />
+    <use
+       xlink:href="#Not_Gate"
+       transform="translate(225,50)" />
+    <use
+       xlink:href="#Buffer_Small"
+       transform="translate(300,0)" />
+    <use
+       xlink:href="#Not_Gate_Small"
+       transform="translate(300,50)" />
+    <g>
+      <use
+	  xlink:href="#Nor_Gate"
+	  transform="translate(25,150)" />
+      <use
+	  xlink:href="#And_Gate"
+	  transform="translate(25,200)" />
+      <use
+	  xlink:href="#Or_Gate"
+	  transform="translate(100,175)" />
+      <path d="m 25,190 c 5,0 28.71875,0 28.71875,0" />
+      <path d="m 25,210 28.71875,0" />
+      <path d="m 25,240 25,0" />
+      <path d="m 25,260 25,0" />
+      <path d="m 105,200 10,0 0,15 13.71875,0" />
+      <path d="m 100,250 15,0 0,-15 13.71875,0" />
+      <path d="m 175,225 25,0" />
+    </g>
+    <g id="flipflop">
+      <use
+	  xlink:href="#Nand_Gate"
+	  transform="translate(250,130)" />
+      <use
+	  transform="translate(250,220)"
+	  xlink:href="#Nand_Gate" />
+      <path d="m 225,170 50,0" />
+      <path d="m 225,280 50,0" />
+      <path d="m 350,180 0,20 -100,40 0,20 25,0" />
+      <path d="m 350,270 0,-20 -100,-40 0,-20 25,0" />
+      <path d="m 330,180 45,0" />
+      <path d="m 330,270 45,0" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:15px;fill:#000000;stroke:none;font-family:DejaVu Sans"
+       x="15"
+       y="20"><tspan
+         id="tspan8972"
+         x="15"
+         y="20"
+         style="">Symbols</tspan></text>
+    <text
+       y="155"
+       x="15"
+       style="font-size:15px;fill:#000000;stroke:none;font-family:DejaVu Sans"
+       xml:space="preserve"><tspan
+         y="155"
+         x="15"
+         style="">Example Use</tspan></text>
+</svg>
diff --git a/share/symbols/Makefile.am b/share/symbols/Makefile.am
new file mode 100644
index 000000000..fa5f0704b
--- /dev/null
+++ b/share/symbols/Makefile.am
@@ -0,0 +1,9 @@
+
+symbolsdir = $(datadir)/inkscape/symbols
+
+symbols_DATA = \
+	LogicSymbols.svg
+
+
+EXTRA_DIST = $(symbols_DATA)
+