Do not include MetricsInfo.h in MathStream.h

Fixes the FIXME in MathStream.h

diff --git a/src/mathed/InsetMathCancel.cpp b/src/mathed/InsetMathCancel.cpp
index 755470fdd8ea40766ffe5390ced2b9129026d98e..dcda5b63ea67d4739adf468a1ed3efdff542e2f7 100644 (file)
--- a/src/mathed/InsetMathCancel.cpp
+++ b/src/mathed/InsetMathCancel.cpp
@@ -12,9 +12,11 @@
 
 #include "InsetMathCancel.h"
 
-#include "LaTeXFeatures.h"
 #include "MathStream.h"
 
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include "frontends/Painter.h"
 
 #include <ostream>

diff --git a/src/mathed/InsetMathCancelto.cpp b/src/mathed/InsetMathCancelto.cpp
index d6d2233dd25488111b3ffe5d866e79d850661266..6a04cfa246fd4f13b1b91ce4c0be7f82a074b213 100644 (file)
--- a/src/mathed/InsetMathCancelto.cpp
+++ b/src/mathed/InsetMathCancelto.cpp
@@ -12,11 +12,13 @@
 
 #include "InsetMathCancelto.h"
 
-#include "Cursor.h"
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 
+#include "Cursor.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include "frontends/Painter.h"
 
 #include <ostream>

diff --git a/src/mathed/InsetMathDiagram.cpp b/src/mathed/InsetMathDiagram.cpp
index 5c8887c76f80a981d0c22aa09c7ab90e8c398aa7..d5a1b5231aea43b94550bb92db894ac352ef25f6 100644 (file)
--- a/src/mathed/InsetMathDiagram.cpp
+++ b/src/mathed/InsetMathDiagram.cpp
@@ -13,9 +13,11 @@
 
 #include "InsetMathDiagram.h"
 
-#include "LaTeXFeatures.h"
 #include "MathStream.h"
 
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include <ostream>
 
 namespace lyx {

diff --git a/src/mathed/InsetMathEnsureMath.cpp b/src/mathed/InsetMathEnsureMath.cpp
index 1cc9971705415c78d4bafa3424993863677f98a1..5a4252f682cd275dfde70ff6b85e87749681ed8e 100644 (file)
--- a/src/mathed/InsetMathEnsureMath.cpp
+++ b/src/mathed/InsetMathEnsureMath.cpp
@@ -13,11 +13,13 @@
 
 #include "InsetMathEnsureMath.h"
 
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include <ostream>
 
 

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 9cb3eefa39f88e42a03c3bced1e35f7bc83153d6..fbf7208189eac1b8d64f706f27e5dd252f12fab1 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -38,6 +38,7 @@
 #include "MacroTable.h"
 #include "MathMacro.h"
 #include "MathMacroTemplate.h"
+#include "MetricsInfo.h"
 #include "output_xhtml.h"
 #include "Paragraph.h"
 #include "ParIterator.h"

diff --git a/src/mathed/InsetMathKern.cpp b/src/mathed/InsetMathKern.cpp
index 80e3243ae615b9fb047ee9bc1ebd2b080e534f2f..71723b99561f2369340dfee1f35b38c208d944e3 100644 (file)
--- a/src/mathed/InsetMathKern.cpp
+++ b/src/mathed/InsetMathKern.cpp
@@ -11,10 +11,12 @@
 #include <config.h>
 
 #include "InsetMathKern.h"
-#include "MathStream.h"
+
 #include "MathStream.h"
 #include "MathSupport.h"
+
 #include "Dimension.h"
+#include "MetricsInfo.h"
 
 #include "support/docstring.h"
 

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 7357b5f9223b5f65fb82e568f84a4732817850ee..3e3877253f4040aacf23c7a0ed131c322de3ad24 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -50,6 +50,7 @@
 #include "FuncStatus.h"
 #include "LyX.h"
 #include "LyXRC.h"
+#include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "Text.h"
 

diff --git a/src/mathed/InsetMathNumber.cpp b/src/mathed/InsetMathNumber.cpp
index 6a67ce18d75d92840db8f46c808a0834f6bf627d..5237cebab65a95747b5a67c1489950ee0e133ae7 100644 (file)
--- a/src/mathed/InsetMathNumber.cpp
+++ b/src/mathed/InsetMathNumber.cpp
@@ -15,6 +15,8 @@
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "MetricsInfo.h"
+
 using namespace std;
 
 

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index d2044a1bec396f35576075dc11082aa779cc1225..f05bbd7df70e762a86a88b32a5c479fb7c10af60 100644 (file)
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -11,11 +11,13 @@
 #include <config.h>
 
 #include "InsetMathOverset.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 using namespace std;
 

diff --git a/src/mathed/InsetMathPar.cpp b/src/mathed/InsetMathPar.cpp
index 3578399db507c72aaaeac591d354c154f8854d70..e1227ac4af12cb3531b397a4ff7a60c4aec67a02 100644 (file)
--- a/src/mathed/InsetMathPar.cpp
+++ b/src/mathed/InsetMathPar.cpp
@@ -15,6 +15,8 @@
 #include "MathData.h"
 #include "MathStream.h"
 
+#include "MetricsInfo.h"
+
 #include <ostream>
 
 namespace lyx {

diff --git a/src/mathed/InsetMathPhantom.cpp b/src/mathed/InsetMathPhantom.cpp
index 9b1c80ad3287129b00e1a4f24859bf6959bf3eba..4a190ea760f49a29bbece9765ee1c1f1dbca45cf 100644 (file)
--- a/src/mathed/InsetMathPhantom.cpp
+++ b/src/mathed/InsetMathPhantom.cpp
@@ -14,6 +14,9 @@
 
 #include "LaTeXFeatures.h"
 #include "MathStream.h"
+
+#include "MetricsInfo.h"
+
 #include "frontends/Painter.h"
 
 #include <algorithm>

diff --git a/src/mathed/InsetMathRoot.cpp b/src/mathed/InsetMathRoot.cpp
index 38ffb18ff3cecb28134fd6537eab05bed40da1c4..2b4b668b9d5a6235b94983511569acec606d7a88 100644 (file)
--- a/src/mathed/InsetMathRoot.cpp
+++ b/src/mathed/InsetMathRoot.cpp
@@ -13,13 +13,16 @@
 
 #include "InsetMathRoot.h"
 
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
+
 #include "Cursor.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "frontends/Painter.h"
 
+
 using namespace std;
 
 namespace lyx {

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index bfe7d1847f59526d4700e3d094ecbf1a0288d42b..b4cd5909be06cca3c8dfff89a12ad90c948cffb7 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -10,22 +10,24 @@
 
 #include <config.h>
 
+#include "InsetMathScript.h"
+
+#include "InsetMathBrace.h"
+#include "InsetMathSymbol.h"
+#include "MathData.h"
+#include "MathStream.h"
+#include "MathSupport.h"
+
 #include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetMathBrace.h"
-#include "InsetMathScript.h"
-#include "InsetMathSymbol.h"
 #include "LaTeXFeatures.h"
-#include "MathData.h"
-#include "MathStream.h"
-#include "MathSupport.h"
+#include "MetricsInfo.h"
 
 #include "support/debug.h"
 #include "support/gettext.h"
-
 #include "support/lassert.h"
 
 

diff --git a/src/mathed/InsetMathSideset.cpp b/src/mathed/InsetMathSideset.cpp
index 3b364ec0d59d789fc07da0aa4bc031ae3cb087e7..37f437db4f3c2212ef508f0bb50bd328fd0e602b 100644 (file)
--- a/src/mathed/InsetMathSideset.cpp
+++ b/src/mathed/InsetMathSideset.cpp
@@ -11,20 +11,22 @@
 
 #include <config.h>
 
+#include "InsetMathSideset.h"
+
+#include "InsetMathSymbol.h"
+#include "MathData.h"
+#include "MathStream.h"
+#include "MathSupport.h"
+
 #include "BufferView.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetMathSideset.h"
-#include "InsetMathSymbol.h"
 #include "LaTeXFeatures.h"
-#include "MathData.h"
-#include "MathStream.h"
-#include "MathSupport.h"
+#include "MetricsInfo.h"
 
 #include "support/debug.h"
-
 #include "support/lassert.h"
 
 

diff --git a/src/mathed/InsetMathSpace.cpp b/src/mathed/InsetMathSpace.cpp
index c84bc771d82251124497a0c325a7e35abc1d4cfe..e6aa834ea839c4f6ff4792cb67ea728075ec3426 100644 (file)
--- a/src/mathed/InsetMathSpace.cpp
+++ b/src/mathed/InsetMathSpace.cpp
@@ -21,6 +21,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "insets/InsetSpace.h"
 

diff --git a/src/mathed/InsetMathSqrt.cpp b/src/mathed/InsetMathSqrt.cpp
index a8a1122f4993453f64911ae828dac69f7f73a7b8..d04eab3abf302b6dcf7c85613d49962ddde3646e 100644 (file)
--- a/src/mathed/InsetMathSqrt.cpp
+++ b/src/mathed/InsetMathSqrt.cpp
@@ -12,10 +12,13 @@
 
 #include "InsetMathSqrt.h"
 
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
+
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 #include "TextPainter.h"
+
 #include "frontends/Painter.h"
 
 

diff --git a/src/mathed/InsetMathStackrel.cpp b/src/mathed/InsetMathStackrel.cpp
index d43e466964171395f0344bd8a016e6b65ed3e0da..9412d9918245b493b6866c55aa9939d911e287a9 100644 (file)
--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.cpp
@@ -12,11 +12,13 @@
 
 #include "InsetMathStackrel.h"
 
-#include "Cursor.h"
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 
+#include "Cursor.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 using namespace std;
 
 namespace lyx {

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index d38a15e19c4302fb460d3aed196979c050fac258..8aac4f38a8d4f723fa569391887d0fde7decb190 100644 (file)
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@@ -18,6 +18,7 @@
 #include "MathSupport.h"
 
 #include "Encoding.h"
+#include "MetricsInfo.h"
 
 #include "support/debug.h"
 #include "support/gettext.h"

diff --git a/src/mathed/InsetMathSubstack.cpp b/src/mathed/InsetMathSubstack.cpp
index 179d44c3d4c7c7b68a1b07754d61423a1db60ebf..06fd296a98d6a3c1398b6ebffd3578acafbc34cd 100644 (file)
--- a/src/mathed/InsetMathSubstack.cpp
+++ b/src/mathed/InsetMathSubstack.cpp
@@ -12,14 +12,15 @@
 
 #include "InsetMathSubstack.h"
 
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <ostream>

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index bdca11105b0c5d8ecd7ed7f20117d6d0f111e98d..9d923ce76786bdd1de9729bf1b65c5ffda8b4ff9 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -12,13 +12,15 @@
 
 #include "InsetMathSymbol.h"
 
-#include "Dimension.h"
-#include "LaTeXFeatures.h"
 #include "MathAtom.h"
 #include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "Dimension.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/lyxlib.h"

diff --git a/src/mathed/InsetMathTabular.cpp b/src/mathed/InsetMathTabular.cpp
index 40cf58d37c58920627bb4fc20e220c14d61469ec..89a8f262898162fe42740ab5c91ab0d285d912e6 100644 (file)
--- a/src/mathed/InsetMathTabular.cpp
+++ b/src/mathed/InsetMathTabular.cpp
@@ -16,6 +16,8 @@
 #include "MathStream.h"
 #include "MathStream.h"
 
+#include "MetricsInfo.h"
+
 #include "support/lstrings.h"
 
 #include <ostream>

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 3f4d0c49c41841e9ea97c73531fe7988d1a0cd69..46f5277543fe5b7e16c829c475fac6f8d6c38ed9 100644 (file)
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@@ -11,11 +11,14 @@
 #include <config.h>
 
 #include "InsetMathUnderset.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 
 using namespace std;
 

diff --git a/src/mathed/InsetMathUnknown.cpp b/src/mathed/InsetMathUnknown.cpp
index d7e2875521dea2f68f351d678841bda41a55723e..926e7dd5d5ced43f457f79a3585bf8d0c866eae9 100644 (file)
--- a/src/mathed/InsetMathUnknown.cpp
+++ b/src/mathed/InsetMathUnknown.cpp
@@ -11,10 +11,12 @@
 #include <config.h>
 
 #include "InsetMathUnknown.h"
+
 #include "MathSupport.h"
 #include "MathAtom.h"
 #include "MathStream.h"
-#include "MathStream.h"
+
+#include "MetricsInfo.h"
 
 #include "frontends/Painter.h"
 

diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp
index fbdac6922f4e00f1d39e2c3b365a7ad435da3e06..96fdc83aac64474647d9cef0b67784d9a5a100a5 100644 (file)
--- a/src/mathed/InsetMathXArrow.cpp
+++ b/src/mathed/InsetMathXArrow.cpp
@@ -13,12 +13,15 @@
 #include "support/lassert.h"
 
 #include "InsetMathXArrow.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 
 #include <algorithm>
 

diff --git a/src/mathed/InsetMathXYMatrix.cpp b/src/mathed/InsetMathXYMatrix.cpp
index 95941b85ce0cdf9faa719180345e9c66d3f73e00..52043db56ada790cc868db62845c2134f74d0e6b 100644 (file)
--- a/src/mathed/InsetMathXYMatrix.cpp
+++ b/src/mathed/InsetMathXYMatrix.cpp
@@ -12,9 +12,11 @@
 
 #include "InsetMathXYMatrix.h"
 
-#include "LaTeXFeatures.h"
 #include "MathStream.h"
 
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include <ostream>
 
 namespace lyx {

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 80948fd824d755f31f192d4e5df2ab459bf187c5..d745b010091513c624abda72004bc3c303eaca08 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -30,6 +30,7 @@
 #include "LaTeXFeatures.h"
 #include "LyX.h"
 #include "LyXRC.h"
+#include "MetricsInfo.h"
 
 #include "frontends/Painter.h"
 

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 4b68626062e59225208915ce1d90545d4a766bb7..8516c39b0a4e4dbc8f6f3d4e1e81855cdc712fe0 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -13,8 +13,6 @@
 
 #include "MathMacroTemplate.h"
 
-#include "DocIterator.h"
-#include "LaTeXFeatures.h"
 #include "InsetMathBrace.h"
 #include "InsetMathChar.h"
 #include "InsetMathHull.h"
@@ -31,9 +29,12 @@
 #include "Color.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
+#include "DocIterator.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
+#include "MetricsInfo.h"
 #include "TocBackend.h"
 
 #include "frontends/Painter.h"

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 6cfd5855ec5be625e063275804080466a506236a..b8378ef0d9178454d85a1d2233b476d452f2b748 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -15,8 +15,6 @@
 #include "support/strfwd.h"
 
 #include "InsetMath.h"
-// FIXME: Move to individual insets
-#include "MetricsInfo.h"
 #include "texstream.h"
 
 

diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index 7769176e7aad403c6733d86c51bda8f1a4283a38..6a393cb5f5054e8724f41a1333d6621631d9297b 100644 (file)
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -19,6 +19,8 @@
 #include "MathParser.h"
 #include "MathStream.h"
 
+#include "MetricsInfo.h"
+
 #include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"