From 20f3b828f942f8b6d76fb48fd34f9187532092d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnter=20Milde?= Date: Mon, 1 Jan 2018 22:52:08 +0100 Subject: [PATCH] Documentation fixes: revert conversion of -- to en dash in code. lyx2lyx erroneousely merged -- to en dash in text with logical markup "code". Revealed by recent (but now silenced) ctest fails. Also add space around en dash in examples. --- lib/doc/Additional.lyx | 54 +++++++++++++++++++++++--------- lib/doc/de/Additional.lyx | 52 ++++++++++++++++++++++-------- lib/doc/es/Additional.lyx | 54 +++++++++++++++++++++++--------- lib/doc/fr/Additional.lyx | 66 +++++++++++++++++++++++++++++---------- lib/doc/ja/Additional.lyx | 58 ++++++++++++++++++++++++---------- 5 files changed, 211 insertions(+), 73 deletions(-) diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index 6e96744fc0..5b73408628 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -8127,7 +8127,7 @@ You might want to set status collapsed \begin_layout Plain Layout -okular –unique +okular --unique \end_layout \end_inset @@ -21673,7 +21673,7 @@ svn diff $path status collapsed \begin_layout Plain Layout -svn update –accept mine-full $path +svn update --accept mine-full $path \end_layout \end_inset @@ -22109,7 +22109,7 @@ info \begin_inset space ~ \end_inset -–xml +--xml \begin_inset space ~ \end_inset @@ -22482,7 +22482,7 @@ Get an svn client for windows, as described in the previous sections. status collapsed \begin_layout Plain Layout -svn –version +svn --version \end_layout \end_inset @@ -24771,8 +24771,11 @@ status open \begin_layout Plain Layout \size footnotesize -The youth moved in the best society–had, so far as was known, no enemies - and no particular vices. +The youth moved in the best society +\begin_inset space ~ +\end_inset + +– had, so far as was known, no enemies and no particular vices. He had been engaged to Miss Edith Woodley, of Carstairs, but the engagement had been broken off by mutual consent some months before, and there was no sign that it had left any very profound feeling behind it. @@ -24791,8 +24794,11 @@ The youth moved in the best society–had, so far as was known, no enemies \begin_layout Plain Layout \size footnotesize -Ronald Adair was fond of cards–playing continually, but never for such stakes - as would hurt him. +Ronald Adair was fond of cards +\begin_inset space ~ +\end_inset + +– playing continually, but never for such stakes as would hurt him. He was a member of the Baldwin, the Cavendish, and the Bagatelle card clubs. It was shown that, after dinner on the day of his death, he had played a rubber of whist at the latter club. @@ -24801,9 +24807,17 @@ Ronald Adair was fond of cards–playing continually, but never for such stakes \size default \size footnotesize -The evidence of those who had played with him– Mr. - Murray, Sir John Hardy, and Colonel Moran–showed that the game was whist, - and that there was a fairly equal fall of the cards. +The evidence of those who had played with him +\begin_inset space ~ +\end_inset + +– Mr. + Murray, Sir John Hardy, and Colonel Moran +\begin_inset space ~ +\end_inset + +– showed that the game was whist, and that there was a fairly equal fall + of the cards. Adair might have lost five pounds, but not more. His fortune was a considerable one, and such a loss could not in any way affect him. @@ -25435,7 +25449,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -25705,7 +25723,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -25919,7 +25941,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx index 4bfbf436dd..d6bded3878 100644 --- a/lib/doc/de/Additional.lyx +++ b/lib/doc/de/Additional.lyx @@ -22026,7 +22026,7 @@ svn diff $path status collapsed \begin_layout Plain Layout -svn update –accept mine-full $path +svn update --accept mine-full $path \end_layout \end_inset @@ -22462,7 +22462,7 @@ info \begin_inset space ~ \end_inset -–xml +--xml \begin_inset space ~ \end_inset @@ -22966,7 +22966,7 @@ B. status collapsed \begin_layout Plain Layout -svn –version +svn --version \end_layout \end_inset @@ -25394,8 +25394,11 @@ status open \size footnotesize \lang english -The youth moved in the best society–had, so far as was known, no enemies - and no particular vices. +The youth moved in the best society +\begin_inset space ~ +\end_inset + +– had, so far as was known, no enemies and no particular vices. He had been engaged to Miss Edith Woodley, of Carstairs, but the engagement had been broken off by mutual consent some months before, and there was no sign that it had left any very profound feeling behind it. @@ -25415,8 +25418,11 @@ The youth moved in the best society–had, so far as was known, no enemies \size footnotesize \lang english -Ronald Adair was fond of cards–playing continually, but never for such stakes - as would hurt him. +Ronald Adair was fond of cards +\begin_inset space ~ +\end_inset + +– playing continually, but never for such stakes as would hurt him. He was a member of the Baldwin, the Cavendish, and the Bagatelle card clubs. It was shown that, after dinner on the day of his death, he had played a rubber of whist at the latter club. @@ -25425,9 +25431,17 @@ Ronald Adair was fond of cards–playing continually, but never for such stakes \size default \size footnotesize -The evidence of those who had played with him– Mr. - Murray, Sir John Hardy, and Colonel Moran–showed that the game was whist, - and that there was a fairly equal fall of the cards. +The evidence of those who had played with him +\begin_inset space ~ +\end_inset + +– Mr. + Murray, Sir John Hardy, and Colonel Moran +\begin_inset space ~ +\end_inset + +– showed that the game was whist, and that there was a fairly equal fall + of the cards. Adair might have lost five pounds, but not more. His fortune was a considerable one, and such a loss could not in any way affect him. @@ -26060,7 +26074,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -26336,7 +26354,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -26560,7 +26582,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx index 27d6c74b01..908f3d476e 100644 --- a/lib/doc/es/Additional.lyx +++ b/lib/doc/es/Additional.lyx @@ -8644,7 +8644,7 @@ status collapsed \begin_layout Plain Layout \lang english -okular –unique +okular --unique \end_layout \end_inset @@ -23025,7 +23025,7 @@ svn diff $path status collapsed \begin_layout Plain Layout -svn update –accept mine-full $path +svn update --accept mine-full $path \end_layout \end_inset @@ -23473,7 +23473,7 @@ info \begin_inset space ~ \end_inset -–xml +--xml \begin_inset space ~ \end_inset @@ -23880,7 +23880,7 @@ ej. status collapsed \begin_layout Plain Layout -svn –version +svn --version \end_layout \end_inset @@ -26374,8 +26374,11 @@ status open \size footnotesize \lang english -The youth moved in the best society–had, so far as was known, no enemies - and no particular vices. +The youth moved in the best society +\begin_inset space ~ +\end_inset + +– had, so far as was known, no enemies and no particular vices. He had been engaged to Miss Edith Woodley, of Carstairs, but the engagement had been broken off by mutual consent some months before, and there was no sign that it had left any very profound feeling behind it. @@ -26395,8 +26398,11 @@ The youth moved in the best society–had, so far as was known, no enemies \size footnotesize \lang english -Ronald Adair was fond of cards–playing continually, but never for such stakes - as would hurt him. +Ronald Adair was fond of cards +\begin_inset space ~ +\end_inset + +– playing continually, but never for such stakes as would hurt him. He was a member of the Baldwin, the Cavendish, and the Bagatelle card clubs. It was shown that, after dinner on the day of his death, he had played a rubber of whist at the latter club. @@ -26405,9 +26411,17 @@ Ronald Adair was fond of cards–playing continually, but never for such stakes \size default \size footnotesize -The evidence of those who had played with him– Mr. - Murray, Sir John Hardy, and Colonel Moran–showed that the game was whist, - and that there was a fairly equal fall of the cards. +The evidence of those who had played with him +\begin_inset space ~ +\end_inset + +– Mr. + Murray, Sir John Hardy, and Colonel Moran +\begin_inset space ~ +\end_inset + +– showed that the game was whist, and that there was a fairly equal fall + of the cards. Adair might have lost five pounds, but not more. His fortune was a considerable one, and such a loss could not in any way affect him. @@ -27026,7 +27040,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -27287,7 +27305,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -27497,7 +27519,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index aa0a53d6ae..b649b4064a 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -8031,7 +8031,7 @@ status collapsed \begin_layout Plain Layout \lang english -okular –unique +okular --unique \end_layout \end_inset @@ -18692,7 +18692,11 @@ article . C'est-à-dire que les compteurs (notes de bas de page, figures, tableaux etc.) ne seront pas réinitialisés à chaque nouveau chapitre, les chapitres - ne commenceront pas sur une nouvelle page (mais–contrairement à la + ne commenceront pas sur une nouvelle page (mais – +\begin_inset space ~ +\end_inset + +contrairement à la \begin_inset Quotes cld \end_inset @@ -18704,7 +18708,11 @@ vraie \family sans article \family default -—ils sont encore autorisés), les parties cependant utilisent leur propre + +\begin_inset space ~ +\end_inset + +– ils sont encore autorisés), les parties cependant utilisent leur propre page comme dans \family sans book @@ -23446,7 +23454,7 @@ status collapsed \begin_layout Plain Layout \lang english -svn update –accept mine-full $path +svn update --accept mine-full $path \end_layout \end_inset @@ -23960,7 +23968,7 @@ info \begin_inset space ~ \end_inset -–xml +--xml \begin_inset space ~ \end_inset @@ -24395,7 +24403,7 @@ status collapsed \begin_layout Plain Layout \lang english -svn –version +svn --version \end_layout \end_inset @@ -26950,8 +26958,11 @@ status open \size footnotesize \lang english -The youth moved in the best society–had, so far as was known, no enemies - and no particular vices. +The youth moved in the best society +\begin_inset space ~ +\end_inset + +– had, so far as was known, no enemies and no particular vices. He had been engaged to Miss Edith Woodley, of Carstairs, but the engagement had been broken off by mutual consent some months before, and there was no sign that it had left any very profound feeling behind it. @@ -26971,8 +26982,11 @@ The youth moved in the best society–had, so far as was known, no enemies \size footnotesize \lang english -Ronald Adair was fond of cards–playing continually, but never for such stakes - as would hurt him. +Ronald Adair was fond of cards +\begin_inset space ~ +\end_inset + +– playing continually, but never for such stakes as would hurt him. He was a member of the Baldwin, the Cavendish, and the Bagatelle card clubs. It was shown that, after dinner on the day of his death, he had played a rubber of whist at the latter club. @@ -26981,9 +26995,17 @@ Ronald Adair was fond of cards–playing continually, but never for such stakes \size default \size footnotesize -The evidence of those who had played with him– Mr. - Murray, Sir John Hardy, and Colonel Moran–showed that the game was whist, - and that there was a fairly equal fall of the cards. +The evidence of those who had played with him +\begin_inset space ~ +\end_inset + +– Mr. + Murray, Sir John Hardy, and Colonel Moran +\begin_inset space ~ +\end_inset + +– showed that the game was whist, and that there was a fairly equal fall + of the cards. Adair might have lost five pounds, but not more. His fortune was a considerable one, and such a loss could not in any way affect him. @@ -27611,7 +27633,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -27856,7 +27882,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -28066,7 +28096,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index 43904f663e..2dd8d4fcef 100644 --- a/lib/doc/ja/Additional.lyx +++ b/lib/doc/ja/Additional.lyx @@ -8620,7 +8620,7 @@ status collapsed status collapsed \begin_layout Plain Layout -okular –unique +okular --unique \end_layout \end_inset @@ -19615,7 +19615,7 @@ status collapsed status collapsed \begin_layout Plain Layout -svn update –non-interactive +svn update --non-interactive \begin_inset Quotes qld \end_inset @@ -19856,7 +19856,7 @@ svn diff $path（変更が発見された場合には通知します） \begin_inset Newline newline \end_inset -svn update –accept mine-full $path +svn update --accept mine-full $path \end_layout \end_inset @@ -20372,7 +20372,7 @@ info \begin_inset space ~ \end_inset -–xml +--xml \begin_inset space ~ \end_inset @@ -20601,7 +20601,7 @@ new project status collapsed \begin_layout Plain Layout -svn –help +svn --help \end_layout \end_inset @@ -20762,7 +20762,7 @@ Linuxに較べて，WindowsでSVNクライアントをSSH経由で通信する status collapsed \begin_layout Plain Layout -svn –version +svn --version \end_layout \end_inset @@ -22704,8 +22704,11 @@ status open \begin_layout Plain Layout \size footnotesize -The youth moved in the best society–had, so far as was known, no enemies - and no particular vices. +The youth moved in the best society +\begin_inset space ~ +\end_inset + +– had, so far as was known, no enemies and no particular vices. He had been engaged to Miss Edith Woodley, of Carstairs, but the engagement had been broken off by mutual consent some months before, and there was no sign that it had left any very profound feeling behind it. @@ -22724,8 +22727,11 @@ The youth moved in the best society–had, so far as was known, no enemies \begin_layout Plain Layout \size footnotesize -Ronald Adair was fond of cards–playing continually, but never for such stakes - as would hurt him. +Ronald Adair was fond of cards +\begin_inset space ~ +\end_inset + +– playing continually, but never for such stakes as would hurt him. He was a member of the Baldwin, the Cavendish, and the Bagatelle card clubs. It was shown that, after dinner on the day of his death, he had played a rubber of whist at the latter club. @@ -22734,9 +22740,17 @@ Ronald Adair was fond of cards–playing continually, but never for such stakes \size default \size footnotesize -The evidence of those who had played with him– Mr. - Murray, Sir John Hardy, and Colonel Moran–showed that the game was whist, - and that there was a fairly equal fall of the cards. +The evidence of those who had played with him +\begin_inset space ~ +\end_inset + +– Mr. + Murray, Sir John Hardy, and Colonel Moran +\begin_inset space ~ +\end_inset + +– showed that the game was whist, and that there was a fairly equal fall + of the cards. Adair might have lost five pounds, but not more. His fortune was a considerable one, and such a loss could not in any way affect him. @@ -23323,7 +23337,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -23589,7 +23607,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd @@ -23789,7 +23811,11 @@ Catullus \noun on The Holy War \noun default -–a bargain, every one of them. + +\begin_inset space ~ +\end_inset + +– a bargain, every one of them. With five volumes you could just fill that gap on that second shelf. It looks untidy, does it not, sir? \begin_inset Quotes erd -- 2.39.5