diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-06-22 21:45:49 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-06-22 21:45:49 +0000 |
| commit | 0a13821df5315b500ad6f052ac7776995e613adb (patch) | |
| tree | 78dca1a25513137236516f665d8adedb256b7ad8 /src | |
| parent | Fix cross control point (diff) | |
| parent | Doc. keys files update. (diff) | |
| download | inkscape-0a13821df5315b500ad6f052ac7776995e613adb.tar.gz inkscape-0a13821df5315b500ad6f052ac7776995e613adb.zip | |
Merge from trunk
(bzr r9508.1.3)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/latex-text-renderer.cpp | 12 | ||||
| -rw-r--r-- | src/ui/dialog/aboutbox.cpp | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp index c6c597b7a..bebc21f2f 100644 --- a/src/extension/internal/latex-text-renderer.cpp +++ b/src/extension/internal/latex-text-renderer.cpp @@ -184,6 +184,18 @@ static char const preamble[] = "%% \\input{<filename>.tex}\n" "%% instead of\n" "%% \\includegraphics[width=<desired width>]{<filename>.pdf}\n" +"%%\n" +"%% Images with a different path to the parent latex file can\n" +"%% be accessed with the `import' package (which may need to be\n" +"%% installed) using\n" +"%% \\usepackage{import}\n" +"%% in the preamble, and then including the image with\n" +"%% \\import{<path to file>}{<filename>.tex}\n" +"%% Alternatively, one can specify\n" +"%% \\graphicspath{{<path to file>/}}\n" +"%% \n" +"%% For more information, please see info/svg-inkscape on CTAN:\n" +"%% http://tug.ctan.org/tex-archive/info/svg-inkscape\n" "\n" "\\begingroup\n" " \\makeatletter\n" diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 2d40ebb9a..8d467d53f 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -435,6 +435,7 @@ void AboutBox::initStrings() { "Christian Meyer <chrisime@gnome.org>, 2000-2002.\n" "Christian Neumair <chris@gnome-de.org>, 2002, 2003.\n" "Christian Rose <menthos@menthos.com>, 2000, 2001, 2002, 2003.\n" + "Cristian Secară <cristi@secarica.ro>, 2010.\n" "Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2000-2002.\n" "Clytie Siddall <clytie@riverland.net.au>, 2004-2008.\n" "Colin Marquardt <colin@marquardt-home.de>, 2004-2006.\n" @@ -454,7 +455,7 @@ void AboutBox::initStrings() { "Hleb Valoshka <375gnu@gmail.com>, 2008-2009.\n" "Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.\n" "Ilia Penev <lichopicho@gmail.com>, 2006.\n" - "Ivan Masár <helix84@centrum.sk>, 2006, 2007, 2008. \n" + "Ivan Masár <helix84@centrum.sk>, 2006, 2007, 2008, 2009, 2010. \n" "Iñaki Larrañaga <dooteo@euskalgnu.org>, 2006.\n" "Jeffrey Steve Borbón Sanabria <jeff_kerokid@yahoo.com>, 2005.\n" "Joaquim Perez i Noguer <noguer@gmail.com>, 2008-2009.\n" |