[LyX/master] Whitespace only

2014-07-25 Thread Jean-Marc Lasgouttes
commit 5e126d2920df9fd48d24967f7b0a4a04e61aac65 Author: Jean-Marc Lasgouttes Date: Fri Jul 25 22:35:08 2014 +0200 Whitespace only diff --git a/src/BufferView.cpp b/src/BufferView.cpp index bc8162b..faa08f0 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -118,12 +118,12 @@ bool

[LyX/master] Make it compilable under cmake again after the merge from str-metrics

2014-07-25 Thread Kornel Benko
commit 5acc6b3791ac550ed468748333db79bde994c8ad Author: Kornel Benko Date: Fri Jul 25 22:03:59 2014 +0200 Make it compilable under cmake again after the merge from str-metrics diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fdd33e7..44805ed 100644 --- a/src/CMakeLists.txt +++ b/

[LyX/master] Rename rowpainter.* to RowPainter.*

2014-07-25 Thread Jean-Marc Lasgouttes
commit b54deb36839c97886ac9ff607e248cf16b0443c7 Author: Jean-Marc Lasgouttes Date: Fri Jul 25 21:55:08 2014 +0200 Rename rowpainter.* to RowPainter.* This is the convention for files that define classes. diff --git a/src/Makefile.am b/src/Makefile.am index e40a3bc..17bad02 100644

[LyX/master] Add a readme file describing the state of the branch

2014-07-25 Thread Jean-Marc Lasgouttes
commit b044696d592b1602015828eb3db66c54562751c9 Author: Jean-Marc Lasgouttes Date: Tue Jun 18 10:18:32 2013 +0200 Add a readme file describing the state of the branch diff --git a/00README_STR_METRICS_BRANCH b/00README_STR_METRICS_BRANCH new file mode 100644 index 000..b34ba5b --- /dev

[LyX/master] Cleanup TextMetrics::rowBreakPoint.

2014-07-25 Thread Jean-Marc Lasgouttes
commit fe8c3b4348b47099171957ea76daf9ccc019a5d1 Author: Jean-Marc Lasgouttes Date: Fri Jun 14 00:01:49 2013 +0200 Cleanup TextMetrics::rowBreakPoint. Collect properly all strings to compute string metrics Some changes with respect to existing code - end of paragraph f

[LyX/master] Re-implement getColumNearX using row elements

2014-07-25 Thread Jean-Marc Lasgouttes
commit f215bb3b926d8b7d9240f0f08793fc3d731d5398 Author: Jean-Marc Lasgouttes Date: Sun Jul 21 20:22:32 2013 +0200 Re-implement getColumNearX using row elements The code is now so much shorter that it is scary... Expect that further changes will be necessary Cursor boun

[LyX/master] Reintroduce the code related to InsetEnvSeparator

2014-07-25 Thread Jean-Marc Lasgouttes
commit f3924a52b32cdddec0fbcac40d631a3f27761e37 Author: Jean-Marc Lasgouttes Date: Mon Jun 30 11:45:24 2014 +0200 Reintroduce the code related to InsetEnvSeparator This commits (tries to) reintroduce properly the code that was reverted at the beginning of this branch. This had to

[LyX/master] Revert optimization where several words are drawn at the same time

2014-07-25 Thread Jean-Marc Lasgouttes
commit bbe6e9f593fc585ee9f5d69275487bf3ddbcaf47 Author: Jean-Marc Lasgouttes Date: Sun Jul 20 18:54:31 2014 +0200 Revert optimization where several words are drawn at the same time This can only be done where splitting of string is identical in row breaking and display. It will be

[LyX/master] More fixes to cursorX

2014-07-25 Thread Jean-Marc Lasgouttes
commit 79014c7551de71488bb18e58ae8344cdbbde9490 Author: Jean-Marc Lasgouttes Date: Fri Oct 18 17:55:30 2013 +0200 More fixes to cursorX In Row::Element::pos2x, handle the boundaries in a cleaner way. diff --git a/src/Row.cpp b/src/Row.cpp index d074d73..d7940e9 100644 --- a/src/Ro

[LyX/master] Small Inset isXXX methods cleanup

2014-07-25 Thread Jean-Marc Lasgouttes
commit d32f76f7fe1d1ba16ed038ca6e0281a48e8acc2a Author: Jean-Marc Lasgouttes Date: Thu Jul 18 10:55:52 2013 +0200 Small Inset isXXX methods cleanup * rename isStretchableSpace to isHfill * inline a trivial method * remove InsetIPAMacro::isLineSeparator, which has the sam

[LyX/master] Convert cursorX() and computeRowMetrics() to the new scheme

2014-07-25 Thread Jean-Marc Lasgouttes
commit 35d47698c658bef33cf949db3c08cc88be64c14d Author: Jean-Marc Lasgouttes Date: Thu Jul 18 00:25:08 2013 +0200 Convert cursorX() and computeRowMetrics() to the new scheme * convert cursorX to new scheme; old computation is still there for the sake of comparison. * use

[LyX/master] Remove LyXRC option force_paint_single_char

2014-07-25 Thread Jean-Marc Lasgouttes
commit 9d5c9471104cedc4600daab101ef1958f48dab76 Author: Jean-Marc Lasgouttes Date: Tue Jul 8 23:12:09 2014 +0200 Remove LyXRC option force_paint_single_char It was not honored anymore. diff --git a/00README_STR_METRICS_BRANCH b/00README_STR_METRICS_BRANCH index 1292390..7095f9f 10

[LyX/master] Merge remote-tracking branch 'features/str-metrics'

2014-07-25 Thread Jean-Marc
commit 41740ea915ee7a95206d780b6256e660cef39c6e Merge: 1fefbf5 9bfbaed Author: Jean-Marc Date: Fri Jul 25 20:10:55 2014 +0200 Merge remote-tracking branch 'features/str-metrics' This branch implements string-wise metrics computation. The goal is to have both good metrics comput

[LyX/master] Some fixes related to RTL text

2014-07-25 Thread Jean-Marc Lasgouttes
commit 8649ac7fe66ac0efca20918fff2fea051cc88512 Author: Jean-Marc Lasgouttes Date: Wed Mar 19 14:44:53 2014 +0100 Some fixes related to RTL text * fix handling of boundary situations in Row::Elements::x2pos; * fix handling of boundary situations in TextMetrics::getColumn

[LyX/master] Speed-up drawing when text is not justified.

2014-07-25 Thread Jean-Marc Lasgouttes
commit 7734270163ed1e689dc5f7db06a85f876f96f399 Author: Jean-Marc Lasgouttes Date: Fri May 2 15:03:20 2014 +0200 Speed-up drawing when text is not justified. Do not cut strings at separators in RowPainter when text is not justified. This speeds-up painting by reducing the numbe

[LyX/master] Remove obsolete code to handle Hebrew and Arabic characters

2014-07-25 Thread Jean-Marc Lasgouttes
commit d6337a248847aa4c72f8a813d92d349d1035c79f Author: Jean-Marc Lasgouttes Date: Fri Jun 13 16:33:58 2014 +0200 Remove obsolete code to handle Hebrew and Arabic characters This is handled by Qt now. Note that a small optimization (do not draw text that is to the left

[LyX/master] Fix logic error for spacing of RTL rows

2014-07-25 Thread Jean-Marc
commit 6ee39ff90a2fe1f2b846ba71bbf8feb2bcdd58aa Author: Jean-Marc Date: Fri Jul 25 00:10:10 2014 +0200 Fix logic error for spacing of RTL rows The code referred to vpos (the visible position) instead of pos, the logical one. This can lead to using the wrong font when computing

[LyX/master] Fix display of parenthesis in arabic

2014-07-25 Thread Jean-Marc
commit 3599285019a0809c5cea3b899da0e08a54bb0a29 Author: Jean-Marc Date: Mon Jul 21 23:57:10 2014 +0200 Fix display of parenthesis in arabic Actually the workaround that is used to show parenthesis in the right direction is not needed any more, since this is part of the unicode

[LyX/master] Fix bug #9040: In RtL documents end-of-paragraph marker shifts the row display

2014-07-25 Thread Jean-Marc Lasgouttes
commit 7167d90b505f9b98db3de00d081023afed473913 Author: Jean-Marc Lasgouttes Date: Thu Mar 20 11:00:14 2014 +0100 Fix bug #9040: In RtL documents end-of-paragraph marker shifts the row display The fact that the bug was still present in the features/str-metrics branch comes fro

[LyX/master] Better algorithm for forcing bidi drawing

2014-07-25 Thread Jean-Marc
commit f4fc035cf6a0cb08d2d3b34e441c18964d4da84e Author: Jean-Marc Date: Mon Jul 21 00:19:50 2014 +0200 Better algorithm for forcing bidi drawing The use of RLO/LRO overrides to force text orientation was really hackish and the way it was done caused dropped letters in Mac OS X (fo

[LyX/master] Fix breaking of loooong word in RTL languages

2014-07-25 Thread Jean-Marc Lasgouttes
commit e1c4cb7146e0dfd25bb705178618da251bdfde8c Author: Jean-Marc Lasgouttes Date: Mon May 19 11:35:15 2014 +0200 Fix breaking of lng word in RTL languages Moreover, breaks row at insets when there is no suitable separator. Also make the code of Row::shorten_if_needed

[LyX/master] Get rid of rtl_support preference

2014-07-25 Thread Jean-Marc Lasgouttes
commit 45eb314a863a7bc76c2880f2352b7b430eeaf1c0 Author: Jean-Marc Lasgouttes Date: Wed Jul 9 20:12:06 2014 +0200 Get rid of rtl_support preference This variable was introduced to guard against any bad consequence of the then-new right-to-left languages support. Let's be bold a

[LyX/master] Do not split words at selection boundary

2014-07-25 Thread Jean-Marc Lasgouttes
commit ec42b2e4c9daa458df1c5c0454d61fbe4987701c Author: Jean-Marc Lasgouttes Date: Fri May 23 18:59:53 2014 +0200 Do not split words at selection boundary The display of partially-selected word is now done in a new Painter::text method which displays the string twice with diff

[LyX/master] Move some text from the readme file to relevant source files

2014-07-25 Thread Jean-Marc Lasgouttes
commit 4bd5a7e883b76f36d1ebc3ae1c9a6765da5165f6 Author: Jean-Marc Lasgouttes Date: Mon Jun 30 15:55:30 2014 +0200 Move some text from the readme file to relevant source files diff --git a/00README_STR_METRICS_BRANCH b/00README_STR_METRICS_BRANCH index 6668623..1292390 100644 --- a/00README

[LyX/master] remove branch documentation

2014-07-25 Thread Jean-Marc
commit 9bfbaed2b59eff08a259ced673a8f83e0fe2d14f Author: Jean-Marc Date: Fri Jul 25 20:01:04 2014 +0200 remove branch documentation diff --git a/00README_STR_METRICS_BRANCH b/00README_STR_METRICS_BRANCH deleted file mode 100644 index 0416ed4..000 --- a/00README_STR_METRICS_BRANCH +++ /d

[LyX/master] Update description of what has been done in the branch.

2014-07-25 Thread Jean-Marc Lasgouttes
commit 973adaf7d1eb874741ac140c987901367dd9e887 Author: Jean-Marc Lasgouttes Date: Mon May 12 11:02:22 2014 +0200 Update description of what has been done in the branch. diff --git a/00README_STR_METRICS_BRANCH b/00README_STR_METRICS_BRANCH index 73f5ed3..0ab1589 100644 --- a/00README_STR_

[LyX/master] Fix positionning of cursor

2014-07-25 Thread Jean-Marc Lasgouttes
commit 2ff639a0e6d051c6411fe6655cefc36a4e902211 Author: Jean-Marc Lasgouttes Date: Wed May 14 17:46:43 2014 +0200 Fix positionning of cursor The old implementation of Row::Element::pos2x and x2pos did not work correctly with Arabic text, because characters can have shapes that

[LyX/master] Draw right-to-left text string-wise using Qt

2014-07-25 Thread Jean-Marc Lasgouttes
commit ea1a5cb80eaef71bc1cb7021bc3dbf2ef7a793b7 Author: Jean-Marc Lasgouttes Date: Thu Apr 10 16:37:21 2014 +0200 Draw right-to-left text string-wise using Qt We rely on Qt built-in unicode support for handling Arabic and Hebrew compose characters. This allows to avoid to use o

[LyX/master] Fix various selection-related problems

2014-07-25 Thread Jean-Marc Lasgouttes
commit b8170e0e01f486fefb94b19566e24dd391419c12 Author: Jean-Marc Lasgouttes Date: Fri Mar 21 11:56:42 2014 +0100 Fix various selection-related problems All these problems are related to what happens at the extreme points of rows * since VIRTUAL elements have a width but

[LyX/master] Remove debug code from TextMetrics

2014-07-25 Thread Jean-Marc Lasgouttes
commit b0543270a9055dcd43df3d72e2a5584895c77ac4 Author: Jean-Marc Lasgouttes Date: Fri May 2 15:55:10 2014 +0200 Remove debug code from TextMetrics After this, it is possible to remove one parameter to getPosNearX. diff --git a/src/Cursor.cpp b/src/Cursor.cpp index 61e4b60..fe03a3

[LyX/master] Remove support for LyXRC::force_paint_single_char

2014-07-25 Thread Jean-Marc Lasgouttes
commit 4176795e72faf71baf799130f2a26b4f20ac4566 Author: Jean-Marc Lasgouttes Date: Wed May 14 15:36:44 2014 +0200 Remove support for LyXRC::force_paint_single_char This workaround is not necessary anymore, and it complicates the code. The variable itself will be removed af

[LyX/master] Implement a better solution for painting of RTL text

2014-07-25 Thread Jean-Marc Lasgouttes
commit 3013ce3716603e751152e162a5b155cd455c745e Author: Jean-Marc Lasgouttes Date: Wed Apr 30 16:15:31 2014 +0200 Implement a better solution for painting of RTL text Instead of relying on character range (Hebrew or Arabic) or character direction, use RLO unicode character (Rig

[LyX/master] Change getColumnNearX to getPosNearX

2014-07-25 Thread Jean-Marc Lasgouttes
commit f686375eecc92a2658425a6bb93ee184c5049ec1 Author: Jean-Marc Lasgouttes Date: Fri Dec 20 14:02:31 2013 +0100 Change getColumnNearX to getPosNearX The semantics was bad: the old implementation would return pos - row.pos(), and then all user of the function had to re-add row.po

[LyX/master] Update README and do a small code cleanup

2014-07-25 Thread Jean-Marc Lasgouttes
commit 1a4b3201e747c45d12044105d86cfc4a3f11af3c Author: Jean-Marc Lasgouttes Date: Mon Mar 3 15:29:37 2014 +0100 Update README and do a small code cleanup diff --git a/00README_STR_METRICS_BRANCH b/00README_STR_METRICS_BRANCH index 1983dfe..1bb7026 100644 --- a/00README_STR_METRICS_BRANCH

[LyX/master] New reverseRTL implementation

2014-07-25 Thread Jean-Marc Lasgouttes
commit 443a45342743615977b024ebfbaf1ecf1af7ddc8 Author: Jean-Marc Lasgouttes Date: Wed Mar 19 14:44:31 2014 +0100 New reverseRTL implementation The old version was a bit complicated and wrong for RtL paragraphs containing LtR text. THe new one is clearer. diff --git a/src/Row.

[LyX/master] Implement proper handling of RtL in Rows

2014-07-25 Thread Jean-Marc Lasgouttes
commit b2eba66083f41b242faaad45d192abeb7d7480d2 Author: Jean-Marc Lasgouttes Date: Wed Jul 17 00:59:34 2013 +0200 Implement proper handling of RtL in Rows Now the row elements are sorted according to RtL/LtR. Some additional cleanup. diff --git a/00README_STR_METRICS_BRAN

[LyX/master] Fix getColumnNearX for nested insets

2014-07-25 Thread Jean-Marc Lasgouttes
commit 059de2d04c40c63a013896e99a444b65529eb82d Author: Jean-Marc Lasgouttes Date: Fri Oct 11 16:12:20 2013 +0200 Fix getColumnNearX for nested insets The horizontal position of the inset was not taken in account. The rounding is not always the same as with the old code, but th

[LyX/master] Implement real string width computation

2014-07-25 Thread Jean-Marc Lasgouttes
commit 8539f756ed20092fc6ea6273e77299963f6cc7b6 Author: Jean-Marc Lasgouttes Date: Tue Jun 25 08:18:25 2013 +0200 Implement real string width computation Important features: * widths are cached in a map * old behavior is still used when lyxrc.force_paint_single_char is true

[LyX/master] Small fixes to cursor positioning.

2014-07-25 Thread Jean-Marc Lasgouttes
commit 9ba97a85f06c6f0272d43e61a86cceefbec8fa29 Author: Jean-Marc Lasgouttes Date: Fri Dec 20 12:12:27 2013 +0100 Small fixes to cursor positioning. Two small fixed to Row::Element::x2pos: * fix position for elements that are not strings * make rounding match the old code

[LyX/master] Store in the Row object the list of elements it contains

2014-07-25 Thread Jean-Marc Lasgouttes
commit 452fb6035999c88279a72b3e374bd69d39a3d67f Author: Jean-Marc Lasgouttes Date: Tue Jun 25 14:57:09 2013 +0200 Store in the Row object the list of elements it contains * Row now contains a vector of Elements * replace Row::dump by a proper << operator * the width is upda

[LyX/master] Fix line breaking algorithm

2014-07-25 Thread Jean-Marc Lasgouttes
commit 6258cebb77d63928313cae14bbba5d7f092d0a5e Author: Jean-Marc Lasgouttes Date: Tue Jul 23 16:24:01 2013 +0200 Fix line breaking algorithm Break words longer than the screen width. The code is more complicated than I would like, but I have no better idea right now.

[LyX/master] Change TextMetrics::rowHeight to setRowHeight

2014-07-25 Thread Jean-Marc Lasgouttes
commit cf3107793295e5550c67a1bd7e26776309e5dbc7 Author: Jean-Marc Lasgouttes Date: Fri Jun 14 19:24:29 2013 +0200 Change TextMetrics::rowHeight to setRowHeight This new function takes a row as parameter. Also, add direct access to Row::dim_ diff --git a/src/Row.cpp b/src/

[LyX/master] Handle boundary in getColumnNearX (and more)

2014-07-25 Thread Jean-Marc Lasgouttes
commit ff608f46fdb40aa565190aa050e49df16ee96040 Author: Jean-Marc Lasgouttes Date: Sun Jul 21 20:22:32 2013 +0200 Handle boundary in getColumnNearX (and more) Use proper font everywhere for end-of-par marker Fix getColumnNearX for RTL text and for centered/right-justified

[LyX/master] Revert temporarily changes related to InsetSeparator

2014-07-25 Thread Jean-Marc Lasgouttes
commit edcedf33243d549c24a9ed9e37383f9c7d14d1e0 Author: Jean-Marc Lasgouttes Date: Wed Jun 25 12:39:58 2014 +0200 Revert temporarily changes related to InsetSeparator This is to avoid many conflicts with the str-metrics branch. diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cp

[LyX/master] Get rid of ugly font metrics workarounds.

2014-07-25 Thread Jean-Marc Lasgouttes
commit 01c9bcb4328b286a922215c3c1a1583949c33d10 Author: Jean-Marc Lasgouttes Date: Sun Jul 21 12:24:08 2013 +0200 Get rid of ugly font metrics workarounds. Now we have proper ligatures and kerning on screen... diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 2cc0369..0138f61 10064

[LyX/master] Fix bad use of undo kind in Tabular inset.

2014-07-25 Thread Jean-Marc
commit 1fefbf5bdcb9b7c9f163280ed8eeaff2b1271bd5 Author: Jean-Marc Date: Sun Jul 20 00:50:24 2014 +0200 Fix bad use of undo kind in Tabular inset. diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index f7f0d24..8a8c212 100644 --- a/src/insets/InsetTabular.cpp +++ b/src

[LyX features/str-metrics] remove branch documentation

2014-07-25 Thread Jean-Marc
The branch, str-metrics, has been updated. discards de6020f7c3caa649b97635d7607a7c5c77db7927 (commit) discards 9e82eb425b7861b50f9a5f190378a7e543a42e94 (commit) discards 70a018172fb3b1e038e0e5194b40526491aef824 (commit) discards 86c4d53087e99f0c8714cac88ccd950ff581 (commit) This up

[LyX features/str-metrics] Fix logic error for spacing of RTL rows

2014-07-25 Thread Jean-Marc
The branch, str-metrics, has been updated. - Log - commit de6020f7c3caa649b97635d7607a7c5c77db7927 Author: Jean-Marc Date: Fri Jul 25 00:10:10 2014 +0200 Fix logic error for spacing of RTL rows The code referred to v

[LyX GSoC/odt2lyx] Configured Math, extracting metadata from annotation tag for doing the same

2014-07-25 Thread Prannoy Pilligundla
The branch, odt2lyx, has been updated. - Log - commit c93d89c4341b9897c72acf50575c99556d5d3db2 Author: Prannoy Pilligundla Date: Fri Jul 25 21:29:11 2014 +0530 Configured Math, extracting metadata from annotation tag for doin