~centralelyon2010/inkscape/imagelinks2

« back to all changes in this revision

Viewing changes to src/libnrtype/Layout-TNG-Compute.cpp

Committer: Ted Gould
Date: 2008-11-21 05:24:08 UTC
Revision ID: ted@canonical.com-20081121052408-tilucis2pjrrpzxx

Merge from fe-moved

files added:
Doxyfile

share/extensions/Inkscape.pm

share/extensions/cut-marks.inx

share/extensions/cut-marks.pl

share/extensions/dxf_input.py

share/filters

share/filters/Makefile.am

share/filters/README

share/filters/filters.svg

src/filters

src/filters/Makefile_insert

src/filters/blend-fns.h

src/filters/blend.cpp

src/filters/blend.h

src/filters/colormatrix-fns.h

src/filters/colormatrix.cpp

src/filters/colormatrix.h

src/filters/componenttransfer-fns.h

src/filters/componenttransfer-funcnode.cpp

src/filters/componenttransfer-funcnode.h

src/filters/componenttransfer.cpp

src/filters/componenttransfer.h

src/filters/composite-fns.h

src/filters/composite.cpp

src/filters/composite.h

src/filters/convolvematrix-fns.h

src/filters/convolvematrix.cpp

src/filters/convolvematrix.h

src/filters/diffuselighting-fns.h

src/filters/diffuselighting.cpp

src/filters/diffuselighting.h

src/filters/displacementmap-fns.h

src/filters/displacementmap.cpp

src/filters/displacementmap.h

src/filters/distantlight.cpp

src/filters/distantlight.h

src/filters/flood-fns.h

src/filters/flood.cpp

src/filters/flood.h

src/filters/image-fns.h

src/filters/image.cpp

src/filters/image.h

src/filters/makefile.in

src/filters/merge-fns.h

src/filters/merge.cpp

src/filters/merge.h

src/filters/mergenode.cpp

src/filters/mergenode.h

src/filters/morphology-fns.h

src/filters/morphology.cpp

src/filters/morphology.h

src/filters/offset-fns.h

src/filters/offset.cpp

src/filters/offset.h

src/filters/pointlight.cpp

src/filters/pointlight.h

src/filters/specularlighting-fns.h

src/filters/specularlighting.cpp

src/filters/specularlighting.h

src/filters/spotlight.cpp

src/filters/spotlight.h

src/filters/tile-fns.h

src/filters/tile.cpp

src/filters/tile.h

src/filters/turbulence-fns.h

src/filters/turbulence.cpp

src/filters/turbulence.h

src/live_effects/effect-enum.h

src/live_effects/lpe-hatches.cpp

src/live_effects/lpe-hatches.h

src/live_effects/parameter/array.cpp

src/live_effects/parameter/array.h

src/ui/dialog/debug.cpp

src/ui/dialog/debug.h

src/ui/dialog/tile.cpp

src/ui/dialog/tile.h

files removed:
src/Doxyfile

src/dialogs/debugdialog.cpp

src/dialogs/debugdialog.h

src/dialogs/tiledialog.cpp

src/dialogs/tiledialog.h

src/extension/internal/cairo-pdf-out.cpp

src/extension/internal/cairo-pdf-out.h

src/extension/internal/eps-out.cpp

src/extension/internal/eps-out.h

src/extension/internal/pdf-cairo.cpp

src/extension/internal/pdf-cairo.h

src/extension/internal/ps-out.cpp

src/extension/internal/ps-out.h

src/extension/internal/ps.cpp

src/extension/internal/ps.h

src/live_effects/parameter/pointparam-knotholder.cpp

src/live_effects/parameter/pointparam-knotholder.h

src/sp-feblend-fns.h

src/sp-feblend.cpp

src/sp-feblend.h

src/sp-fecolormatrix-fns.h

src/sp-fecolormatrix.cpp

src/sp-fecolormatrix.h

src/sp-fecomponenttransfer-fns.h

src/sp-fecomponenttransfer-funcnode.cpp

src/sp-fecomponenttransfer-funcnode.h

src/sp-fecomponenttransfer.cpp

src/sp-fecomponenttransfer.h

src/sp-fecomposite-fns.h

src/sp-fecomposite.cpp

src/sp-fecomposite.h

src/sp-feconvolvematrix-fns.h

src/sp-feconvolvematrix.cpp

src/sp-feconvolvematrix.h

src/sp-fediffuselighting-fns.h

src/sp-fediffuselighting.cpp

src/sp-fediffuselighting.h

src/sp-fedisplacementmap-fns.h

src/sp-fedisplacementmap.cpp

src/sp-fedisplacementmap.h

src/sp-fedistantlight.cpp

src/sp-fedistantlight.h

src/sp-feflood-fns.h

src/sp-feflood.cpp

src/sp-feflood.h

src/sp-feimage-fns.h

src/sp-feimage.cpp

src/sp-feimage.h

src/sp-femerge-fns.h

src/sp-femerge.cpp

src/sp-femerge.h

src/sp-femergenode.cpp

src/sp-femergenode.h

src/sp-femorphology-fns.h

src/sp-femorphology.cpp

src/sp-femorphology.h

src/sp-feoffset-fns.h

src/sp-feoffset.cpp

src/sp-feoffset.h

src/sp-fepointlight.cpp

src/sp-fepointlight.h

src/sp-fespecularlighting-fns.h

src/sp-fespecularlighting.cpp

src/sp-fespecularlighting.h

src/sp-fespotlight.cpp

src/sp-fespotlight.h

src/sp-fetile-fns.h

src/sp-fetile.cpp

src/sp-fetile.h

src/sp-feturbulence-fns.h

src/sp-feturbulence.cpp

src/sp-feturbulence.h

src/streams-gzip.cpp

src/streams-gzip.h

src/streams-handles.cpp

src/streams-handles.h

src/streams-jar.cpp

src/streams-jar.h

src/streams-zlib.cpp

src/streams-zlib.h

files modified:
AUTHORS

build-lx.xml

configure.ac

doc/keys.xml

mkinstalldirs

po/POTFILES.in

po/gl.po

po/he.po

po/nl.po

po/ru.po

share/Makefile.am

share/README

share/extensions/Makefile.am

share/extensions/dxf_input.inx

share/extensions/simpletransform.py

share/keys/default.xml

share/keys/inkscape.xml

share/templates/LaTeX_Beamer.svg

share/templates/default.ca.svg

share/templates/default.fi.svg

share/templates/default.svg

share/templates/fontforge_glyph.svg

src/2geom/bezier-curve.h

src/2geom/bezier.h

src/2geom/concepts.h

src/2geom/crossing.h

src/2geom/curve.h

src/2geom/d2-sbasis.cpp

src/2geom/d2-sbasis.h

src/2geom/d2.h

src/2geom/elliptical-arc.cpp

src/2geom/elliptical-arc.h

src/2geom/forward.h

src/2geom/geom.cpp

src/2geom/geom.h

src/2geom/hvlinesegment.h

src/2geom/interval.h

src/2geom/linear.h

src/2geom/nearest-point.cpp

src/2geom/path-intersection.cpp

src/2geom/path.cpp

src/2geom/path.h

src/2geom/pathvector.cpp

src/2geom/pathvector.h

src/2geom/piecewise.h

src/2geom/point.h

src/2geom/rect.h

src/2geom/region.h

src/2geom/sbasis-2d.cpp

src/2geom/sbasis-curve.h

src/2geom/sbasis-geometric.cpp

src/2geom/sbasis-math.cpp

src/2geom/sbasis-math.h

src/2geom/sbasis-roots.cpp

src/2geom/sbasis.cpp

src/2geom/sbasis.h

src/2geom/shape.cpp

src/2geom/svg-elliptical-arc.cpp

src/2geom/svg-elliptical-arc.h

src/2geom/svg-path-parser.cpp

src/2geom/sweep.cpp

src/CMakeLists.txt

src/Makefile.am

src/Makefile_insert

src/application/app-prototype.cpp

src/application/app-prototype.h

src/application/application.cpp

src/application/application.h

src/application/editor.cpp

src/application/editor.h

src/attributes-test.h

src/attributes.cpp

src/attributes.h

src/bind/dobinding.cpp

src/bind/javabind-private.h

src/bind/javabind.cpp

src/bind/javabind.h

src/box3d-side.cpp

src/conn-avoid-ref.cpp

src/connector-context.cpp

src/desktop-style.cpp

src/desktop.cpp

src/dialogs/CMakeLists.txt

src/dialogs/Makefile_insert

src/dialogs/clonetiler.cpp

src/dialogs/clonetiler.h

src/dialogs/dialog-events.cpp

src/dialogs/dialog-events.h

src/dialogs/eek-color-def.cpp

src/dialogs/eek-color-def.h

src/dialogs/eek-preview.cpp

src/dialogs/eek-preview.h

src/dialogs/export.cpp

src/dialogs/export.h

src/dialogs/extensions.cpp

src/dialogs/extensions.h

src/dialogs/fill-style.cpp

src/dialogs/fill-style.h

src/dialogs/find.cpp

src/dialogs/find.h

src/dialogs/guidelinedialog.cpp

src/dialogs/iconpreview.cpp

src/dialogs/iconpreview.h

src/dialogs/in-dt-coordsys.h

src/dialogs/input.cpp

src/dialogs/input.h

src/dialogs/item-properties.cpp

src/dialogs/item-properties.h

src/dialogs/layer-properties.cpp

src/dialogs/layer-properties.h

src/dialogs/layers-panel.h

src/dialogs/object-attributes.cpp

src/dialogs/object-attributes.h

src/dialogs/rdf.cpp

src/dialogs/rdf.h

src/dialogs/sp-attribute-widget.cpp

src/dialogs/sp-attribute-widget.h

src/dialogs/stroke-style.cpp

src/dialogs/stroke-style.h

src/dialogs/swatches.cpp

src/dialogs/swatches.h

src/dialogs/text-edit.cpp

src/dialogs/text-edit.h

src/dialogs/unclump.cpp

src/dialogs/unclump.h

src/dialogs/xml-tree.cpp

src/dialogs/xml-tree.h

src/display/canvas-bpath.cpp

src/display/inkscape-cairo.cpp

src/display/inkscape-cairo.h

src/display/nr-arena-group.cpp

src/display/nr-arena-image.cpp

src/display/nr-arena-item.cpp

src/display/nr-arena-item.h

src/display/nr-arena-shape.cpp

src/display/nr-filter-composite.cpp

src/display/nr-filter-composite.h

src/display/nr-filter-diffuselighting.h

src/display/nr-filter-displacement-map.h

src/display/nr-filter-image.cpp

src/display/nr-filter-merge.cpp

src/display/nr-filter-merge.h

src/display/nr-filter-specularlighting.h

src/display/nr-filter-units.h

src/display/nr-filter.cpp

src/display/nr-light.cpp

src/display/nr-svgfonts.cpp

src/display/snap-indicator.cpp

src/display/sodipodi-ctrl.cpp

src/display/sp-canvas.cpp

src/document.cpp

src/document.h

src/doxygen-main.cpp

src/eraser-context.cpp

src/event-context.cpp

src/extension/init.cpp

src/extension/internal/Makefile_insert

src/extension/internal/cairo-ps-out.cpp

src/extension/internal/cairo-renderer-pdf-out.cpp

src/extension/internal/cairo-renderer.cpp

src/extension/internal/filter/drop-shadow.h

src/extension/internal/filter/filter-all.cpp

src/extension/internal/filter/filter-file.cpp

src/extension/internal/filter/filter.cpp

src/extension/internal/filter/filter.h

src/extension/internal/filter/snow.h

src/extension/internal/grid.cpp

src/extension/internal/javafx-out.cpp

src/extension/internal/odf.cpp

src/extension/output.h

src/extension/system.cpp

src/file.cpp

src/filter-chemistry.cpp

src/filter-enums.h

src/flood-context.cpp

src/gradient-chemistry.cpp

src/gradient-context.cpp

src/gradient-drag.cpp

src/gradient-drag.h

src/graphlayout/graphlayout.cpp

src/helper/Makefile_insert

src/helper/geom.cpp

src/helper/geom.h

src/helper/png-write.cpp

src/helper/png-write.h

src/helper/recthull.h

src/inkscape.cpp

src/interface.cpp

src/libnr/nr-convert2geom.h

src/libnr/nr-rect.cpp

src/libnr/nr-rect.h

src/libnrtype/FontInstance.cpp

src/libnrtype/Layout-TNG-Compute.cpp

src/libnrtype/Layout-TNG-Input.cpp

src/libnrtype/Layout-TNG-OutIter.cpp

src/libnrtype/Layout-TNG-Output.cpp

src/libnrtype/Layout-TNG.h

src/libnrtype/RasterFont.cpp

src/libnrtype/font-instance.h

src/line-snapper.cpp

src/line-snapper.h

src/live_effects/CMakeLists.txt

src/live_effects/Makefile_insert

src/live_effects/effect.cpp

src/live_effects/effect.h

src/live_effects/lpe-circle_with_radius.cpp

src/live_effects/lpe-circle_with_radius.h

src/live_effects/lpe-curvestitch.cpp

src/live_effects/lpe-interpolate.cpp

src/live_effects/lpe-knot.cpp

src/live_effects/lpe-knot.h

src/live_effects/lpe-patternalongpath.cpp

src/live_effects/lpe-patternalongpath.h

src/live_effects/lpe-perspective_path.cpp

src/live_effects/lpe-perspective_path.h

src/live_effects/lpe-skeleton.cpp

src/live_effects/lpe-skeleton.h

src/live_effects/lpe-sketch.cpp

src/live_effects/lpe-sketch.h

src/live_effects/lpegroupbbox.cpp

src/live_effects/parameter/CMakeLists.txt

src/live_effects/parameter/Makefile_insert

src/live_effects/parameter/parameter.h

src/live_effects/parameter/point.cpp

src/live_effects/parameter/point.h

src/live_effects/parameter/vector.cpp

src/live_effects/parameter/vector.h

src/lpe-tool-context.cpp

src/main.cpp

src/node-context.cpp

src/nodepath.cpp

src/nodepath.h

src/object-snapper.cpp

src/object-snapper.h

src/pencil-context.cpp

src/pencil-context.h

src/preferences-skeleton.h

src/removeoverlap/removeoverlap.cpp

src/rubberband.cpp

src/rubberband.h

src/selcue.cpp

src/select-context.cpp

src/selection-chemistry.cpp

src/selection.cpp

src/selection.h

src/seltrans.h

src/shape-editor.cpp

src/snap.cpp

src/snap.h

src/snapper.h

src/sp-conn-end-pair.cpp

src/sp-conn-end.cpp

src/sp-ellipse.cpp

src/sp-flowtext.cpp

src/sp-item-group.cpp

src/sp-item-transform.cpp

src/sp-item-transform.h

src/sp-item.cpp

src/sp-item.h

src/sp-lpe-item.cpp

src/sp-lpe-item.h

src/sp-namedview.cpp

src/sp-namedview.h

src/sp-object-repr.cpp

src/sp-offset.cpp

src/sp-path.cpp

src/sp-pattern.cpp

src/sp-shape.cpp

src/sp-spiral.cpp

src/sp-star.cpp

src/splivarot.cpp

src/svg/svg-affine.cpp

src/svg/svg.h

src/text-context.cpp

src/tweak-context.cpp

src/ui/clipboard.cpp

src/ui/dialog/CMakeLists.txt

src/ui/dialog/Makefile_insert

src/ui/dialog/align-and-distribute.cpp

src/ui/dialog/align-and-distribute.h

src/ui/dialog/dialog-manager.cpp

src/ui/dialog/document-properties.cpp

src/ui/dialog/document-properties.h

src/ui/dialog/filedialogimpl-win32.cpp

src/ui/dialog/filter-effects-dialog.cpp

src/ui/dialog/inkscape-preferences.cpp

src/ui/dialog/inkscape-preferences.h

src/ui/dialog/livepatheffect-editor.cpp

src/ui/dialog/livepatheffect-editor.h

src/ui/dialog/messages.cpp

src/ui/dialog/transformation.cpp

src/ui/view/edit-widget.cpp

src/ui/widget/object-composite-settings.cpp

src/ui/widget/preferences-widget.cpp

src/ui/widget/preferences-widget.h

src/ui/widget/style-subject.cpp

src/ui/widget/style-subject.h

src/verbs.cpp

src/verbs.h

src/widgets/Makefile_insert

src/widgets/calligraphic-profile-rename.cpp *

src/widgets/calligraphic-profile-rename.h *

src/widgets/desktop-widget.cpp

src/widgets/font-selector.cpp

src/widgets/icon.cpp

src/widgets/select-toolbar.cpp

src/widgets/toolbox.cpp

src/zoom-context.cpp

Show diffs side-by-side

added added

removed removed

src/libnrtype/Layout-TNG-Compute.cpp

615

iter_source_text++;

616

char_index_in_unbroken_span++;

617

char_byte = iter_source_text.base() - unbroken_span.input_stream_first_character.base();

618

glyph_rotate = 0.0;

619

618

}

620

619

621

620

advance_width *= direction_sign;

1014

1013

if (text_source->dy.size() > char_index_in_source) new_span.dx = text_source->dy[char_index_in_source];

1015

1014

}

1016

1015

if (text_source->rotate.size() > char_index_in_source) new_span.rotate = text_source->rotate[char_index_in_source];

1016

else if (char_index_in_source == 0) new_span.rotate = 0.f;

1017

if (input_index == 0 && para->unbroken_spans.empty() && !new_span.y._set && _flow._input_wrap_shapes.empty()) {

1018

// if we don't set an explicit y some of the automatic wrapping code takes over and moves the text vertically

1019

// so that the top of the letters is at zero, not the baseline

Older »